*** empty log message ***

[bpt/guile.git] / libguile / Makefile.am

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index dbd08db..85b401f 100644 (file)
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -26,7 +26,8 @@ AUTOMAKE_OPTIONS = foreign
 ## building.
 INCLUDES = -I.. -I$(srcdir)/.. ${THREAD_CPPFLAGS}
 
-ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/'
+ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \
+   --regex='/[ \t]*GUILE_[G]?PROC1?[ \t]*(\([^,]*\),[^,]*/\1/'
 
 lib_LTLIBRARIES = libguile.la
 bin_PROGRAMS = guile
@@ -37,15 +38,15 @@ guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL}
 libguile_la_SOURCES = \
     alist.c arbiters.c async.c backtrace.c boolean.c chars.c           \
     continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c       \
-    evalext.c feature.c filesys.c fluids.c fports.c gc.c gdbint.c      \
+    evalext.c feature.c fluids.c fports.c gc.c gdbint.c        \
     gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c         \
     gh_predicates.c gsubr.c guardians.c hash.c hashtab.c init.c                \
     ioext.c keywords.c lang.c list.c load.c macros.c mallocs.c         \
-    modules.c net_db.c numbers.c objects.c objprop.c options.c pairs.c \
-    ports.c posix.c print.c procprop.c procs.c ramap.c random.c read.c \
-    root.c scmsigs.c script.c simpos.c smob.c socket.c sort.c          \
+    modules.c numbers.c objects.c objprop.c options.c pairs.c  \
+    ports.c print.c procprop.c procs.c random.c read.c \
+    root.c scmsigs.c script.c simpos.c smob.c sort.c           \
     srcprop.c stackchk.c stacks.c stime.c strings.c strop.c strorder.c \
-    strports.c struct.c symbols.c tag.c throw.c unif.c variable.c      \
+    strports.c struct.c symbols.c tag.c throw.c variable.c     \
     vectors.c version.c vports.c weaks.c
 
 BUILT_SOURCES = \
@@ -62,10 +63,11 @@ BUILT_SOURCES = \
     strports.x struct.x symbols.x tag.x threads.x throw.x unif.x       \
     variable.x vectors.x version.x vports.x weaks.x
 
-EXTRA_libguile_la_SOURCES = _scm.h \
-    strerror.c inet_aton.c putenv.c \
-    threads.c alloca.c \
-    regex-posix.c iselect.c
+EXTRA_libguile_la_SOURCES = _scm.h             \
+    alloca.c inet_aton.c memmove.c putenv.c strerror.c \
+    threads.c regex-posix.c iselect.c \
+    filesys.c posix.c net_db.c socket.c \
+    ramap.c unif.c
 
 ## This is kind of nasty... there are ".c" files that we don't want to
 ## compile, since they are #included in threads.c.  So instead we list
@@ -75,7 +77,7 @@ noinst_HEADERS = coop-threads.c coop-threads.h coop.c
 
 libguile_la_DEPENDENCIES = @LIBLOBJS@
 libguile_la_LIBADD = @LIBLOBJS@
-libguile_la_LDFLAGS = -version-info 6:0 -export-dynamic
+libguile_la_LDFLAGS = -version-info 7:0 -export-dynamic
 
 include_HEADERS = libguile.h
 
@@ -92,7 +94,7 @@ modinclude_HEADERS = \
     ioext.h keywords.h kw.h lang.h list.h load.h macros.h mallocs.h    \
     modules.h net_db.h numbers.h objects.h objprop.h options.h pairs.h \
     ports.h posix.h regex-posix.h print.h procprop.h procs.h random.h  \
-    ramap.h read.h root.h scmsigs.h script.h simpos.h smob.h socket.h  \
+    ramap.h read.h root.h scmsigs.h scm_validate.h script.h simpos.h smob.h socket.h   \
     sort.h srcprop.h stackchk.h stacks.h stime.h strings.h strop.h     \
     strorder.h strports.h struct.h symbols.h tag.h tags.h throw.h      \
     unif.h variable.h vectors.h version.h vports.h weaks.h snarf.h     \
@@ -102,7 +104,7 @@ modinclude_HEADERS = \
 ## and not a header -- headers are included in the distribution.
 modinclude_DATA = scmconfig.h
 
-bin_SCRIPTS = guile-snarf
+bin_SCRIPTS = guile-snarf guile-doc-snarf guile-snarf.awk
 
 check_ldadd = libguile.la ${THREAD_LIBS_LOCAL}
 check_PROGRAMS = gh_test_c gh_test_repl
@@ -153,10 +155,22 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @echo '}' >> libpath.tmp
        @mv libpath.tmp libpath.h
 
-SUFFIXES = .x
+
+#      ./guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ 
+
+SUFFIXES = .x .doc
 .c.x:
-       ./guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ \
+       ./guile-doc-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ \
        || { rm $@; false; }
+.c.doc:
+       ./guile-doc-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< \
+        || { rm $@; false; }
+
+## GJB:FIXME:: this is ugly;  generate the *.doc files from the *.x file list, above
+guile-procedures.txt: *.doc
+       cat *.doc > $@
+
+pkgdata_DATA = guile-procedures.txt
 
 ## Add -MG to make the .x magic work with auto-dep code.
 MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)