add printers for prompts and with-fluids objects
[bpt/guile.git] / libguile / Makefile.am
index 6166e72..5ffb6f6 100644 (file)
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -33,7 +33,7 @@ DEFAULT_INCLUDES =
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
 ## building.  Also look for Gnulib headers in `lib'.
 AM_CPPFLAGS = -DBUILDING_LIBGUILE=1 -I$(top_srcdir) -I$(top_builddir) \
-             -I$(top_srcdir)/lib -I$(top_builddir)/lib
+             -I$(top_srcdir)/lib -I$(top_builddir)/lib $(LIBFFI_CFLAGS)
 
 AM_CFLAGS = $(GCC_CFLAGS) $(CFLAG_VISIBILITY)
 
@@ -43,8 +43,7 @@ gnulib_library = $(top_builddir)/lib/libgnu.la
 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                                          \
-                 libguile-i18n-v-@LIBGUILE_I18N_MAJOR@.la
+lib_LTLIBRARIES = libguile.la
 bin_PROGRAMS = guile
 
 noinst_PROGRAMS = guile_filter_doc_snarfage gen-scmconfig
@@ -85,7 +84,7 @@ c-tokenize.$(OBJEXT): c-tokenize.c
        if [ "$(cross_compiling)" = "yes" ]; then \
                $(CC_FOR_BUILD) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<; \
        else \
-               $(filter-out -Werror,$(COMPILE)) -c -o $@ $<; \
+               $(COMPILE) -c -o $@ $<; \
        fi
 
 ## Override default rule; this should run on BUILD host.
@@ -108,12 +107,16 @@ libguile_la_CFLAGS = $(GUILE_CFLAGS) $(AM_CFLAGS)
 libguile_la_SOURCES =                          \
        alist.c                                 \
        arbiters.c                              \
+       array-handle.c                          \
        array-map.c                             \
+       arrays.c                                \
        async.c                                 \
        backtrace.c                             \
        boolean.c                               \
+       bitvectors.c                            \
        bytevectors.c                           \
        chars.c                                 \
+       control.c                               \
        continuations.c                         \
        debug.c                                 \
        deprecated.c                            \
@@ -127,25 +130,22 @@ libguile_la_SOURCES =                             \
        extensions.c                            \
        feature.c                               \
        fluids.c                                \
+       foreign.c                               \
        fports.c                                \
        frames.c                                \
-       futures.c                               \
-       gc-card.c                               \
-       gc-freelist.c                           \
        gc-malloc.c                             \
-       gc-mark.c                               \
-       gc-segment-table.c                      \
-       gc-segment.c                            \
        gc.c                                    \
-       gc_os_dep.c                             \
        gdbint.c                                \
        gettext.c                               \
+       generalized-arrays.c                    \
+       generalized-vectors.c                   \
        goops.c                                 \
        gsubr.c                                 \
        guardians.c                             \
        hash.c                                  \
        hashtab.c                               \
        hooks.c                                 \
+       i18n.c                                  \
        init.c                                  \
        inline.c                                \
        instructions.c                          \
@@ -156,11 +156,11 @@ libguile_la_SOURCES =                             \
        load.c                                  \
        macros.c                                \
        mallocs.c                               \
+       memoize.c                               \
        modules.c                               \
        null-threads.c                          \
        numbers.c                               \
        objcodes.c                              \
-       objects.c                               \
        objprop.c                               \
        options.c                               \
        pairs.c                                 \
@@ -169,6 +169,7 @@ libguile_la_SOURCES =                               \
        procprop.c                              \
        procs.c                                 \
        programs.c                              \
+       promises.c                              \
        properties.c                            \
        r6rs-ports.c                            \
        random.c                                \
@@ -195,7 +196,8 @@ libguile_la_SOURCES =                               \
        symbols.c                               \
        threads.c                               \
        throw.c                                 \
-       unif.c                                  \
+       trees.c                                 \
+       uniform.c                               \
        values.c                                \
        variable.c                              \
        vectors.c                               \
@@ -204,24 +206,19 @@ libguile_la_SOURCES =                             \
        vports.c                                \
        weaks.c
 
-libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_SOURCES = i18n.c
-libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_CFLAGS =      \
-   $(libguile_la_CFLAGS)
-libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LIBADD =      \
-   libguile.la $(gnulib_library)
-libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LDFLAGS =     \
-   -module -L$(builddir) -lguile                               \
-   -version-info @LIBGUILE_I18N_INTERFACE@
-
 DOT_X_FILES =                                  \
        alist.x                                 \
        arbiters.x                              \
+       array-handle.x                          \
        array-map.x                             \
+       arrays.x                                \
        async.x                                 \
        backtrace.x                             \
        boolean.x                               \
+       bitvectors.x                            \
        bytevectors.x                           \
        chars.x                                 \
+       control.x                               \
        continuations.x                         \
        debug.x                                 \
        deprecated.x                            \
@@ -236,15 +233,13 @@ DOT_X_FILES =                                     \
        extensions.x                            \
        feature.x                               \
        fluids.x                                \
+       foreign.x                               \
        fports.x                                \
-       futures.x                               \
-       gc-card.x                               \
        gc-malloc.x                             \
-       gc-mark.x                               \
-       gc-segment-table.x                      \
-       gc-segment.x                            \
        gc.x                                    \
        gettext.x                               \
+       generalized-arrays.x                    \
+       generalized-vectors.x                   \
        goops.x                                 \
        gsubr.x                                 \
        guardians.x                             \
@@ -260,9 +255,9 @@ DOT_X_FILES =                                       \
        load.x                                  \
        macros.x                                \
        mallocs.x                               \
+       memoize.x                               \
        modules.x                               \
        numbers.x                               \
-       objects.x                               \
        objprop.x                               \
        options.x                               \
        pairs.x                                 \
@@ -270,6 +265,7 @@ DOT_X_FILES =                                       \
        print.x                                 \
        procprop.x                              \
        procs.x                                 \
+       promises.x                              \
        properties.x                            \
        r6rs-ports.x                            \
        random.x                                \
@@ -296,7 +292,8 @@ DOT_X_FILES =                                       \
        symbols.x                               \
        threads.x                               \
        throw.x                                 \
-       unif.x                                  \
+       trees.x                                 \
+       uniform.x                               \
        values.x                                \
        variable.x                              \
        vectors.x                               \
@@ -312,12 +309,16 @@ EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES@
 DOT_DOC_FILES =                                \
        alist.doc                               \
        arbiters.doc                            \
+       array-handle.doc                        \
        array-map.doc                           \
+       arrays.doc                              \
        async.doc                               \
        backtrace.doc                           \
        boolean.doc                             \
+       bitvectors.doc                          \
        bytevectors.doc                         \
        chars.doc                               \
+       control.doc                             \
        continuations.doc                       \
        debug.doc                               \
        deprecated.doc                          \
@@ -332,15 +333,13 @@ DOT_DOC_FILES =                           \
        extensions.doc                          \
        feature.doc                             \
        fluids.doc                              \
+       foreign.doc                             \
        fports.doc                              \
-       futures.doc                             \
-       gc-card.doc                             \
        gc-malloc.doc                           \
-       gc-mark.doc                             \
-       gc-segment-table.doc                    \
-       gc-segment.doc                          \
        gc.doc                                  \
        gettext.doc                             \
+       generalized-arrays.doc                  \
+       generalized-vectors.doc                 \
        goops.doc                               \
        gsubr.doc                               \
        guardians.doc                           \
@@ -356,9 +355,9 @@ DOT_DOC_FILES =                             \
        load.doc                                \
        macros.doc                              \
        mallocs.doc                             \
+       memoize.doc                             \
        modules.doc                             \
        numbers.doc                             \
-       objects.doc                             \
        objprop.doc                             \
        options.doc                             \
        pairs.doc                               \
@@ -366,6 +365,7 @@ DOT_DOC_FILES =                             \
        print.doc                               \
        procprop.doc                            \
        procs.doc                               \
+       promises.doc                            \
        properties.doc                          \
        r6rs-ports.doc                          \
        random.doc                              \
@@ -392,7 +392,8 @@ DOT_DOC_FILES =                             \
        symbols.doc                             \
        threads.doc                             \
        throw.doc                               \
-       unif.doc                                \
+       trees.doc                               \
+       uniform.doc                             \
        values.doc                              \
        variable.doc                            \
        vectors.doc                             \
@@ -405,14 +406,14 @@ EXTRA_DOT_DOC_FILES = @EXTRA_DOT_DOC_FILES@
 DOT_I_FILES = vm-i-system.i vm-i-scheme.i vm-i-loader.i
 
 .c.i:
-       grep '^VM_DEFINE' $< > $@
+       $(GREP) '^VM_DEFINE' $< > $@
 
 BUILT_SOURCES = cpp_err_symbols.c cpp_sig_symbols.c libpath.h \
     version.h scmconfig.h \
     $(DOT_I_FILES) $(DOT_X_FILES) $(EXTRA_DOT_X_FILES)
 
 EXTRA_libguile_la_SOURCES = _scm.h             \
-    inet_aton.c memmove.c putenv.c strerror.c  \
+    memmove.c strerror.c                       \
     dynl.c regex-posix.c                       \
     filesys.c posix.c net_db.c socket.c                \
     debug-malloc.c mkstemp.c                   \
@@ -430,18 +431,32 @@ install-exec-hook:
 ## Perhaps we can deal with them normally once the merge seems to be
 ## working.
 noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c            \
-                 eval.i.c ieee-754.h                           \
-                 srfi-4.i.c                                    \
+                 ieee-754.h                                    \
+                 srfi-14.i.c                                   \
                  quicksort.i.c                                  \
                  win32-uname.h win32-dirent.h win32-socket.h   \
-                private-gc.h private-options.h
+                private-gc.h private-options.h
 
 # vm instructions
 noinst_HEADERS += vm-engine.c vm-i-system.c vm-i-scheme.c vm-i-loader.c
 
 libguile_la_DEPENDENCIES = @LIBLOBJS@
-libguile_la_LIBADD = @LIBLOBJS@ $(gnulib_library)
-libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
+libguile_la_LIBADD =                           \
+  @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP)     \
+  $(LTLIBUNISTRING) $(LTLIBICONV) $(LTLIBINTL)
+libguile_la_LDFLAGS =                                                                                  \
+  @LTLIBINTL@ $(LIBFFI_LIBS) $(INET_NTOP_LIB) $(INET_PTON_LIB)                                         \
+  $(GETADDRINFO_LIB) $(HOSTENT_LIB) $(SERVENT_LIB)                                                     \
+  -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@    \
+  -export-dynamic -no-undefined                                                                                \
+  $(GNU_LD_FLAGS)
+
+if HAVE_LD_VERSION_SCRIPT
+
+libguile_la_LDFLAGS += -Wl,--version-script="$(srcdir)/libguile.map"
+
+endif HAVE_LD_VERSION_SCRIPT
+
 
 # These are headers visible as <guile/mumble.h>
 pkginclude_HEADERS = 
@@ -452,12 +467,17 @@ modinclude_HEADERS =                              \
        __scm.h                                 \
        alist.h                                 \
        arbiters.h                              \
+       array-handle.h                          \
        array-map.h                             \
+       arrays.h                                \
        async.h                                 \
        backtrace.h                             \
+       bdw-gc.h                                \
        boolean.h                               \
+       bitvectors.h                            \
        bytevectors.h                           \
        chars.h                                 \
+       control.h                               \
        continuations.h                         \
        debug-malloc.h                          \
        debug.h                                 \
@@ -474,13 +494,15 @@ modinclude_HEADERS =                              \
        feature.h                               \
        filesys.h                               \
        fluids.h                                \
+       foreign.h                               \
        fports.h                                \
        frames.h                                \
-       futures.h                               \
        gc.h                                    \
        gdb_interface.h                         \
        gdbint.h                                \
        gettext.h                               \
+       generalized-arrays.h                    \
+       generalized-vectors.h                   \
        goops.h                                 \
        gsubr.h                                 \
        guardians.h                             \
@@ -499,12 +521,12 @@ modinclude_HEADERS =                              \
        load.h                                  \
        macros.h                                \
        mallocs.h                               \
+       memoize.h                               \
        modules.h                               \
        net_db.h                                \
        null-threads.h                          \
        numbers.h                               \
        objcodes.h                              \
-       objects.h                               \
        objprop.h                               \
        options.h                               \
        pairs.h                                 \
@@ -514,6 +536,7 @@ modinclude_HEADERS =                                \
        procprop.h                              \
        procs.h                                 \
        programs.h                              \
+       promises.h                              \
        properties.h                            \
        pthread-threads.h                       \
        r6rs-ports.h                            \
@@ -545,12 +568,12 @@ modinclude_HEADERS =                              \
        tags.h                                  \
        threads.h                               \
        throw.h                                 \
-       unif.h                                  \
+       trees.h                                 \
        validate.h                              \
+       uniform.h                               \
        values.h                                \
        variable.h                              \
        vectors.h                               \
-       vm-bootstrap.h                          \
        vm-engine.h                             \
        vm-expand.h                             \
        vm.h                                    \
@@ -570,14 +593,14 @@ EXTRA_DIST = ChangeLog-scm ChangeLog-threads              \
     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 version.h.in                                                \
-    scmconfig.h.top libgettext.h
+    scmconfig.h.top libgettext.h unidata_to_charset.pl libguile.map
 #    $(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
+version.h: version.h.in $(top_builddir)/config.status
        sed < $(srcdir)/version.h.in > $@.tmp \
          -e s:@-GUILE_MAJOR_VERSION-@:${GUILE_MAJOR_VERSION}: \
          -e s:@-GUILE_MINOR_VERSION-@:${GUILE_MINOR_VERSION}: \
@@ -592,6 +615,8 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @echo '#define SCM_PKGDATA_DIR "$(pkgdatadir)"' >> 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_LIB_DIR "$(libdir)"' >> libpath.tmp
+       @echo '#define SCM_EXTENSIONS_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions"' >> libpath.tmp
        @echo '#define SCM_CCACHE_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/ccache"' >> libpath.tmp
        @echo '#define SCM_EFFECTIVE_VERSION "$(GUILE_EFFECTIVE_VERSION)"' >> libpath.tmp
        @echo '#define SCM_BUILD_INFO { \' >> libpath.tmp
@@ -611,10 +636,11 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @echo ' { "infodir",       "@infodir@" }, \' >> libpath.tmp
        @echo ' { "mandir",        "@mandir@" }, \' >> libpath.tmp
        @echo ' { "includedir",    "@includedir@" }, \' >> libpath.tmp
-       @echo ' { "pkgdatadir",    "@pkgdatadir@" }, \' >> libpath.tmp
-       @echo ' { "pkglibdir",     "@pkglibdir@" }, \' >> libpath.tmp
-       @echo ' { "pkgincludedir", "@pkgincludedir@" }, \' \
+       @echo ' { "pkgdatadir",    "$(pkgdatadir)" }, \' >> libpath.tmp
+       @echo ' { "pkglibdir",     "$(pkglibdir)" }, \' >> libpath.tmp
+       @echo ' { "pkgincludedir", "$(pkgincludedir)" }, \' \
                >> libpath.tmp
+       @echo ' { "extensionsdir", "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions" }, \' >> libpath.tmp
        @echo ' { "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp
        @echo ' { "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \
                >> libpath.tmp
@@ -688,10 +714,10 @@ cpp_sig_symbols.c: cpp_sig_symbols.in cpp_cnvt.awk
 ## Create a new version of the cpp_sig_symbols.in file, including all SIGXXX
 ## macros defined on this platform.
 check_signals:
-       gcc -undef -dM -E $(srcdir)/cpp_signal.c | egrep ' SIG[A-Z]+' \
+       gcc -undef -dM -E $(srcdir)/cpp_signal.c | $(EGREP) ' SIG[A-Z]+' \
          | cut -f2 -d' ' | sort > cpp_sig_symbols_here
        diff -u $(srcdir)/cpp_sig_symbols.in cpp_sig_symbols_here \
-          | egrep '^\+S' \
+          | $(EGREP) '^\+S' \
          | cut -c2- > cpp_sig_symbols_diff
        if test -s cpp_sig_symbols_diff ; then \
          cat $(srcdir)/cpp_sig_symbols.in cpp_sig_symbols_diff \
@@ -703,10 +729,10 @@ check_signals:
 
 ## Likewise for cpp_err_symbols.in.
 check_errnos:
-       gcc -undef -dM -E $(srcdir)/cpp_errno.c | egrep ' E.+' \
+       gcc -undef -dM -E $(srcdir)/cpp_errno.c | $(EGREP) ' E.+' \
          | cut -f2 -d' ' | sort > cpp_err_symbols_here
        diff -u $(srcdir)/cpp_err_symbols.in cpp_err_symbols_here \
-          | egrep '^\+E' \
+          | $(EGREP) '^\+E' \
          | cut -c2- > cpp_err_symbols_diff
        if test -s cpp_err_symbols_diff ; then \
          cat $(srcdir)/cpp_err_symbols.in cpp_err_symbols_diff \