*** empty log message ***
[bpt/guile.git] / libguile / Makefile.am
index e914eee..65cd20a 100644 (file)
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##     Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -26,76 +26,121 @@ DEFS = @DEFS@
 ## Check for headers in $(srcdir)/.., so that #include
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
 ## building.
-INCLUDES = -I.. -I$(srcdir)/.. ${INCLTDL}
+INCLUDES = -I.. -I$(top_srcdir) -I$(top_srcdir)/libguile-ltdl
 
 ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \
    --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/'
 
 lib_LTLIBRARIES = libguile.la
-bin_PROGRAMS = guile guile_filter_doc_snarfage
+bin_PROGRAMS = guile
+
+noinst_PROGRAMS = guile_filter_doc_snarfage gen-scmconfig
+
+gen_scmconfig_SOURCES = gen-scmconfig.c
+
+## Override default rule; this should be compiled for BUILD host.
+## For some reason, OBJEXT does not include the dot
+gen-scmconfig.$(OBJEXT): gen-scmconfig.c
+       if [ "$(cross_compiling)" = "yes" ]; then \
+               $(CC_FOR_BUILD) -c -o $@ $<; \
+       else \
+               $(COMPILE) -c -o $@ $<; \
+       fi
+
+scmconfig.h: ${top_builddir}/config.h gen-scmconfig
+       rm -f scmconfig.h.tmp
+       cat $(srcdir)/scmconfig.h.top > scmconfig.h.tmp
+       ./gen-scmconfig >> scmconfig.h.tmp
+       chmod 444 scmconfig.h.tmp
+       rm -f scmconfig.h
+       mv scmconfig.h.tmp scmconfig.h
+
+guile_filter_doc_snarfage_SOURCES = c-tokenize.c
+
+## Override default rule; this should be compiled for BUILD host.
+## For some reason, OBJEXT does not include the dot
+c-tokenize.$(OBJEXT): c-tokenize.c
+       if [ "$(cross_compiling)" = "yes" ]; then \
+               $(CC_FOR_BUILD) -c -o $@ $<; \
+       else \
+               $(COMPILE) -c -o $@ $<; \
+       fi
+
+## Override default rule; this should run on BUILD host.
+guile_filter_doc_snarfage$(EXEEXT): $(guile_filter_doc_snarfage_OBJECTS) $(guile_filter_doc_snarfage_DEPENDENCIES) 
+       @rm -f guile_filter_doc_snarfage$(EXEEXT)
+       if [ "$(cross_compiling)" = "yes" ]; then \
+               $(CCLD_FOR_BUILD) -o $@ $(guile_filter_doc_snarfage_OBJECTS); \
+       else \
+               $(LINK) $(guile_filter_doc_snarfage_OBJECTS) $(LDADD) $(LIBS); \
+       fi
+
 
 guile_SOURCES = guile.c
 guile_LDADD = libguile.la
 guile_LDFLAGS = @DLPREOPEN@
 
-guile_filter_doc_snarfage_SOURCES = c-tokenize.c
-
 libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c     \
-    chars.c continuations.c convert.c debug.c deprecation.c dynl.c         \
-    dynwind.c environments.c eq.c error.c eval.c evalext.c extensions.c     \
-    feature.c fluids.c fports.c                                                    \
-    gc.c gc_os_dep.c gdbint.c gh_data.c gh_eval.c gh_funcs.c gh_init.c     \
+    chars.c continuations.c convert.c debug.c deprecation.c deprecated.c    \
+    dynwind.c environments.c eq.c error.c eval.c evalext.c extensions.c            \
+    feature.c fluids.c fports.c        futures.c                                   \
+    gc.c gc-mark.c gc-segment.c gc-malloc.c gc-card.c gc-freelist.c        \
+       gc_os_dep.c gdbint.c gh_data.c gh_eval.c gh_funcs.c gh_init.c       \
     gh_io.c gh_list.c gh_predicates.c goops.c gsubr.c guardians.c hash.c    \
-    hashtab.c hooks.c init.c inline.c ioext.c iselect.c keywords.c         \
+    hashtab.c hooks.c init.c inline.c ioext.c keywords.c           \
     lang.c list.c                                                          \
     load.c macros.c mallocs.c modules.c numbers.c objects.c objprop.c      \
     options.c pairs.c ports.c print.c procprop.c procs.c properties.c      \
     random.c rdelim.c read.c root.c rw.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 throw.c values.c              \
+    strorder.c strports.c struct.c symbols.c threads.c throw.c values.c            \
     variable.c vectors.c version.c vports.c weaks.c
 
 DOT_X_FILES = alist.x arbiters.x async.x backtrace.x boolean.x chars.x   \
-    continuations.x debug.x deprecation.x dynl.x dynwind.x               \
+    continuations.x debug.x deprecation.x deprecated.x dynl.x dynwind.x   \
     environments.x eq.x                                                          \
     error.x eval.x evalext.x extensions.x feature.x fluids.x fports.x    \
-    gc.x goops.x                                                         \
-    gsubr.x guardians.x hash.x hashtab.x hooks.x init.x ioext.x iselect.x \
+    futures.x                                                            \
+    gc.x  gc-mark.x gc-segment.x gc-malloc.x gc-card.x goops.x           \
+    gsubr.x guardians.x hash.x hashtab.x hooks.x init.x ioext.x           \
     keywords.x lang.x list.x load.x macros.x mallocs.x modules.x         \
     numbers.x objects.x objprop.x options.x pairs.x ports.x print.x      \
     procprop.x procs.x properties.x random.x rdelim.x read.x root.x rw.x  \
     scmsigs.x script.x simpos.x smob.x sort.x srcprop.x                          \
     stackchk.x stacks.x stime.x strings.x strop.x strorder.x strports.x          \
-    struct.x symbols.x throw.x values.x variable.x vectors.x             \
+    struct.x symbols.x threads.x throw.x values.x variable.x vectors.x   \
     version.x vports.x weaks.x
 
 EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES@
 
 DOT_DOC_FILES = alist.doc arbiters.doc async.doc backtrace.doc             \
-    boolean.doc chars.doc continuations.doc debug.doc dynl.doc             \
-    dynwind.doc environments.doc eq.doc error.doc eval.doc evalext.doc     \
-    extensions.doc feature.doc fluids.doc fports.doc gc.doc goops.doc      \
-    gsubr.doc                                                              \
+    boolean.doc chars.doc continuations.doc debug.doc deprecation.doc      \
+    deprecated.doc dynl.doc dynwind.doc environments.doc eq.doc                    \
+    error.doc eval.doc evalext.doc                                         \
+    extensions.doc feature.doc fluids.doc fports.doc futures.doc           \
+    gc.doc goops.doc                                                       \
+    gsubr.doc gc-mark.doc gc-segment.doc gc-malloc.doc gc-card.doc         \
     guardians.doc hash.doc hashtab.doc hooks.doc init.doc ioext.doc        \
-    iselect.doc keywords.doc lang.doc list.doc load.doc macros.doc         \
+    keywords.doc lang.doc list.doc load.doc macros.doc     \
     mallocs.doc modules.doc numbers.doc objects.doc objprop.doc                    \
     options.doc pairs.doc ports.doc print.doc procprop.doc                 \
     procs.doc properties.doc random.doc rdelim.doc read.doc root.doc rw.doc \
     scmsigs.doc script.doc simpos.doc smob.doc sort.doc                            \
     srcprop.doc stackchk.doc stacks.doc stime.doc strings.doc strop.doc            \
-    strorder.doc strports.doc struct.doc symbols.doc throw.doc             \
+    strorder.doc strports.doc struct.doc symbols.doc threads.doc throw.doc  \
     values.doc variable.doc vectors.doc version.doc vports.doc weaks.doc
 
 EXTRA_DOT_DOC_FILES = @EXTRA_DOT_DOC_FILES@
 
-BUILT_SOURCES = cpp_err_symbols.c cpp_sig_symbols.c libpath.h scmconfig.h \
+BUILT_SOURCES = cpp_err_symbols.c cpp_sig_symbols.c libpath.h \
+    version.h scmconfig.h \
     $(DOT_X_FILES) $(EXTRA_DOT_X_FILES) guile.texi
 
 EXTRA_libguile_la_SOURCES = _scm.h                     \
     alloca.c inet_aton.c memmove.c putenv.c strerror.c \
-    threads.c regex-posix.c                            \
+    dynl.c regex-posix.c                               \
     filesys.c posix.c net_db.c socket.c                        \
-    ramap.c unif.c debug-malloc.c mkstemp.c             \
+    ramap.c unif.c debug-malloc.c mkstemp.c            \
     win32-uname.c win32-dirent.c win32-socket.c
 
 ## delete guile-snarf.awk from the installation bindir, in case it's
@@ -108,12 +153,12 @@ install-exec-hook:
 ## compile, since they are #included.  So instead we list them here.
 ## Perhaps we can deal with them normally once the merge seems to be
 ## working.
-noinst_HEADERS = coop-threads.c coop-threads.h coop.c \
-    num2integral.i.c num2float.i.c convert.i.c        \
-    win32-uname.h win32-dirent.h win32-socket.h
+noinst_HEADERS = num2integral.i.c num2float.i.c convert.i.c    \
+                 win32-uname.h win32-dirent.h win32-socket.h   \
+                private-gc.h
 
 libguile_la_DEPENDENCIES = @LIBLOBJS@
-libguile_la_LIBADD = @LIBLOBJS@ $(LIBLTDL) $(THREAD_LIBS_LOCAL)
+libguile_la_LIBADD = @LIBLOBJS@ ../libguile-ltdl/libguile-ltdl.la $(THREAD_LIBS_LOCAL)
 libguile_la_LDFLAGS = -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
 
 # These are headers visible as <guile/mumble.h>
@@ -122,10 +167,12 @@ pkginclude_HEADERS = gh.h
 # These are headers visible as <libguile/mumble.h>.
 modincludedir = $(includedir)/libguile
 modinclude_HEADERS = __scm.h alist.h arbiters.h async.h backtrace.h boolean.h \
-    chars.h continuations.h convert.h coop-defs.h debug.h debug-malloc.h      \
-    deprecation.h dynl.h dynwind.h environments.h eq.h error.h eval.h         \
-    evalext.h extensions.h feature.h filesys.h fluids.h fports.h gc.h        \
-    gdb_interface.h gdbint.h                                                 \
+    chars.h continuations.h convert.h debug.h                                \
+    debug-malloc.h threads-plugin.h null-threads.h pthread-threads.h         \
+    deprecation.h deprecated.h dynl.h dynwind.h environments.h eq.h          \
+    error.h eval.h                                                           \
+    evalext.h extensions.h feature.h filesys.h fluids.h fports.h futures.h    \
+    gc.h gdb_interface.h gdbint.h                                            \
     goops.h gsubr.h guardians.h hash.h hashtab.h hooks.h init.h                      \
     inline.h ioext.h                                                         \
     iselect.h keywords.h lang.h list.h load.h macros.h mallocs.h modules.h    \
@@ -134,34 +181,46 @@ modinclude_HEADERS = __scm.h alist.h arbiters.h async.h backtrace.h boolean.h \
     rdelim.h read.h root.h rw.h scmsigs.h validate.h script.h simpos.h smob.h \
     snarf.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 tags.h threads.h        \
-    throw.h unif.h values.h variable.h vectors.h version.h vports.h weaks.h
+    throw.h unif.h values.h variable.h vectors.h vports.h weaks.h
 
-## This file is generated at configure time.  That is why it is DATA
-## and not a header -- headers are included in the distribution.
-modinclude_DATA = scmconfig.h
+nodist_modinclude_HEADERS = version.h scmconfig.h
 
-bin_SCRIPTS = guile-snarf guile-doc-snarf guile-snarf-docs \
-    guile-func-name-check
+bin_SCRIPTS = guile-snarf
+
+# We can re-enable install for some of these if/when they are documented
+# and people feel like maintaining them.  For now, this is not the case.
+noinst_SCRIPTS = guile-doc-snarf guile-snarf-docs guile-func-name-check
 
 EXTRA_DIST = ChangeLog-gh ChangeLog-scm ChangeLog-threads              \
     ChangeLog-1996-1999 ChangeLog-2000 cpp_signal.c                    \
-    cpp_errno.c cpp_err_symbols.in cpp_sig_symbols.in cpp_cnvt.awk     \
-    c-tokenize.lex
+    cpp_errno.c cpp_err_symbols.in cpp_err_symbols.c           \
+    cpp_sig_symbols.c cpp_sig_symbols.in cpp_cnvt.awk  \
+    c-tokenize.lex threads-plugin.c version.h.in pthread-threads.c \
+    scmconfig.h.top
 #    $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
 #    guile-procedures.txt guile.texi
 
+## We use @-...-@ as the substitution brackets here, instead of the
+## usual @...@, so autoconf doesn't go and substitute the values
+## directly into the left-hand sides of the sed substitutions.  *sigh*
+version.h: version.h.in
+       sed < $< > $@.tmp \
+         -e s:@-GUILE_MAJOR_VERSION-@:${GUILE_MAJOR_VERSION}: \
+         -e s:@-GUILE_MINOR_VERSION-@:${GUILE_MINOR_VERSION}: \
+         -e s:@-GUILE_MICRO_VERSION-@:${GUILE_MICRO_VERSION}:
+       mv $@.tmp $@
+
 ## FIXME: Consider using timestamp file, to avoid unnecessary rebuilds.
 libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @echo "Generating libpath.h..."
        @rm -f libpath.tmp
        @echo '/* generated by Makefile */' > libpath.tmp
        @echo '#define SCM_PKGDATA_DIR "$(pkgdatadir)"' >> libpath.tmp
-       @echo '#define SCM_LIBRARY_DIR "$(pkgdatadir)/$(VERSION)"'>>libpath.tmp
+       @echo '#define SCM_LIBRARY_DIR "$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp
        @echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp
        @echo '#define SCM_BUILD_INFO { \' >> libpath.tmp
        @echo ' { "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp
-       @echo ' { "top_srcdir", "'"`cd @top_srcdir@; pwd`"'" }, \' \
-               >> libpath.tmp
+       @echo ' { "top_srcdir",    "@top_srcdir_absolute@" }, \' >> libpath.tmp
        @echo ' { "prefix",        "@prefix@" }, \' >> libpath.tmp
        @echo ' { "exec_prefix",   "@exec_prefix@" }, \' >> libpath.tmp
        @echo ' { "bindir",        "@bindir@" }, \' >> libpath.tmp
@@ -188,13 +247,14 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @mv libpath.tmp libpath.h
 
 
+snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+
 SUFFIXES = .x .doc
 .c.x:
-       ./guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ \
-       || { rm $@; false; }
+       ./guile-snarf -o $@ $< $(snarfcppopts)
 .c.doc:
        -(test -n "${AWK+set}" || AWK="@AWK@"; ${AWK} -f ./guile-func-name-check $<)
-       (./guile-snarf-docs $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< | \
+       (./guile-snarf-docs $(snarfcppopts) $< | \
        ./guile_filter_doc_snarfage$(EXEEXT) --filter-snarfage) > $@ || { rm $@; false; }
 
 $(DOT_X_FILES) $(EXTRA_DOT_DOC_FILES): snarf.h guile-snarf.in
@@ -205,10 +265,10 @@ error.x: cpp_err_symbols.c
 posix.x: cpp_sig_symbols.c
 load.x: libpath.h
 
-include $(top_srcdir)/pre-inst-guile.am
+include $(top_srcdir)/am/pre-inst-guile
 
 alldotdocfiles    = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES)
-snarf2checkedtexi = $(preinstguiletool)/snarf-check-and-output-texi
+snarf2checkedtexi = GUILE="$(GUILE_FOR_BUILD)" $(top_srcdir)/scripts/snarf-check-and-output-texi
 dotdoc2texi       = cat $(alldotdocfiles) | $(snarf2checkedtexi)
 
 guile.texi: $(alldotdocfiles) guile
@@ -221,19 +281,19 @@ if HAVE_MAKEINFO
 
 guile-procedures.txt: guile-procedures.texi
        rm -f $@
-       makeinfo --force -o $@ $< || test -f $@
+       makeinfo --force -o $@ guile-procedures.texi || test -f $@
 
 else
 
 guile-procedures.txt: guile-procedures.texi
-       cp $< $@
+       cp guile-procedures.texi $@
 
 endif
 
 c-tokenize.c: c-tokenize.lex
-       flex -t $< > $@ || { rm $@; false; }
+       flex -t $(srcdir)/c-tokenize.lex > $@ || { rm $@; false; }
 
-schemelibdir = $(pkgdatadir)/$(VERSION)
+schemelibdir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)
 schemelib_DATA = guile-procedures.txt
 
 ## Add -MG to make the .x magic work with auto-dep code.
@@ -282,7 +342,9 @@ check_errnos:
 
 MOSTLYCLEANFILES = \
        cpp_err_symbols_here cpp_err_symbols_diff cpp_err_symbols_new \
-       cpp_sig_symbols_here cpp_sig_symbols_diff cpp_sig_symbols_new
+       cpp_sig_symbols_here cpp_sig_symbols_diff cpp_sig_symbols_new \
+       version.h version.h.tmp \
+       scmconfig.h scmconfig.h.tmp
 
 CLEANFILES = libpath.h *.x *.doc guile-procedures.txt guile-procedures.texi guile.texi