diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-04-12 17:07:19 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-04-12 17:08:06 +0300 |
commit | 391b9afdd48db47f95567dbf1c3c9d2cc1029415 (patch) | |
tree | 2e156976196bf69a5c3576eb6ef2895186c0f5e4 /src/Makefile.am | |
parent | 0f24a2b0845a519e011b58e2d92a2752c2e73e5e (diff) | |
download | gamma-391b9afdd48db47f95567dbf1c3c9d2cc1029415.tar.gz gamma-391b9afdd48db47f95567dbf1c3c9d2cc1029415.tar.bz2 |
Migrate Guile support to GINT.
* Makefile.am, configure.ac, src/Makefile.am: Migrate to GINT.
* modules/expat: Remove dependency on *.inc
* modules/sql: Likewise.
* modules/syslog: Likewise.
* scripts/bootstrap (reconfig-command): Add calls to
`git submodule'.
* src/documentation.sci: New file.
* src/expat.sci: Use module (gamma documentation).
Remove inclusion of *.inc files.
* src/sql.sci: Likewise.
* src/syslog.sci: Likewise.
* src/gamma-expat.c: Use SCM_DEFINE_PUBLIC to define
public interfaces.
* src/gsql_conn.c: Likewise.
* src/syslog-port.c: Likewise.
* src/syslog.c: Likewise.
* am/guile.m4: Remove.
* scripts/guile-doc-snarf.awk: Remove.
* scripts/guile-doc-snarf: Remove.
* scripts/Makefile.am (EXTRA_DIST): Remove
guile-doc-snarf.awk and guile-doc-snarf.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 43 |
1 files changed, 10 insertions, 33 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 65954b1..7ae8351 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Gamma. If not, see <http://www.gnu.org/licenses/>. -INCLUDES =-I$(top_builddir) -I$(srcdir) -I. @GUILE_INCLUDES@ @INCLUDEPATH@ +INCLUDES =-I$(top_builddir) -I$(srcdir) -I. @INCLUDEPATH@ EXTRA_DIST= EXTRA_LTLIBRARIES= @@ -22,46 +22,23 @@ lib_LTLIBRARIES=@GAMMA_LIB_LIST@ install-data-hook: @GAMMA_INSTALL_HOOKS@ include modules.mk -EXTRA_DIST += modules.mk +EXTRA_DIST += modules.mk documentation.sci + +sitedir=$(GUILE_SITE)/$(PACKAGE) +site_DATA=$(GAMMA_BUILT_DATA_FILES) documentation.scm .sci.scm: $(AM_V_GEN)m4 -DVERSION=$(VERSION) -DLIBDIR=$(libdir) \ - -DBUILDDIR="`pwd`" $< > $@ + -DBUILDDIR="`pwd`" -DSITEDIR='$(sitedir)' $< > $@ -guiledir=$(GUILE_SITE)/$(PACKAGE) -guile_DATA=guile-procedures.txt $(GAMMA_BUILT_DATA_FILES) DOT_X_FILES=$(GAMMA_X_FILES) DOT_DOC_FILES=$(DOT_X_FILES:.x=.doc) -CLEANFILES=*.inc *.x *.doc - -BUILT_SOURCES=$(DOT_X_FILES) $(DOT_DOC_FILES) -DISTCLEANFILES=$(BUILT_SOURCES) guile-procedures.txt $(GAMMA_BUILT_DATA_FILES) +DISTCLEANFILES=$(site_DATA) AM_CPPFLAGS=-DDATADIR=\"$(guiledir)\" -ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \ - --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/' - -GUILE_DOC_SNARF=$(top_srcdir)/scripts/guile-doc-snarf -SUFFIXES=.x .doc .inc .sci .scm - -.c.x: - $(AM_V_GEN)AWK=$(AWK) \ - $(GUILE_SNARF) -o $@ \ - $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) - -.c.doc: - $(AM_V_GEN)AWK=$(AWK) \ - $(GUILE_DOC_SNARF) -d -o $@ \ - $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) - -.c.inc: - $(AM_V_GEN)sed -n 's/SCM_DEFINE *(.[^,]*, *\"\([^"][^"]*\)\".*/[(export \1)]/p;s/^[ ]*GAMMA_CONST *(\(.[^)]*\)).*/[(export \1])/p;s/.*GAMMA_EXPORT *("\(.*\)").*/[(export \1)]/p' $< > $@ - -guile-procedures.txt: $(DOT_DOC_FILES) - $(AM_V_GEN)cat $(DOT_DOC_FILES) > $@ - -## Add -MG to make the .x magic work with auto-dep code. -MKDEP = $(CC) -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +SUFFIXES= +CLEANFILES= +include ../gint/gint.mk |