Merge remote-tracking branch 'local-2.0/stable-2.0'

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

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 6f2f793..df3e9d0 100644 (file)
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -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, 2010, 2011 Free Software Foundation, Inc.
+##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -62,7 +62,7 @@ gen-scmconfig.$(OBJEXT): gen-scmconfig.c
        $(AM_V_GEN) \
        if [ "$(cross_compiling)" = "yes" ]; then \
                $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) -I$(top_builddir) \
-                  -c -o $@ $<; \
+                  -c -o $@ $<; \
        else \
                $(COMPILE) -c -o $@ $<; \
        fi
@@ -105,7 +105,7 @@ guile_filter_doc_snarfage$(EXEEXT): $(guile_filter_doc_snarfage_OBJECTS) $(guile
        if [ "$(cross_compiling)" = "yes" ]; then \
                $(CCLD_FOR_BUILD) -o $@ $(guile_filter_doc_snarfage_OBJECTS); \
        else \
-               $(LINK) $(guile_filter_doc_snarfage_OBJECTS) $(LDADD) $(LIBS); \
+               $(LINK) $(guile_filter_doc_snarfage_OBJECTS) $(LDADD) $(gnulib_library) $(LIBS); \
        fi
 
 
@@ -142,6 +142,7 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =                             \
        extensions.c                            \
        feature.c                               \
        filesys.c                               \
+       finalizers.c                            \
        fluids.c                                \
        foreign.c                               \
        fports.c                                \
@@ -218,7 +219,9 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =                             \
        version.c                               \
        vm.c                                    \
        vports.c                                \
-       weaks.c
+       weak-set.c                              \
+       weak-table.c                            \
+       weak-vector.c
 
 DOT_X_FILES =                                  \
        alist.x                                 \
@@ -314,7 +317,9 @@ DOT_X_FILES =                                       \
        vectors.x                               \
        version.x                               \
        vports.x                                \
-       weaks.x
+       weak-set.x                              \
+       weak-table.x                            \
+       weak-vector.x
 
 # vm-related snarfs
 DOT_X_FILES += frames.x instructions.x objcodes.x programs.x vm.x
@@ -415,7 +420,9 @@ DOT_DOC_FILES =                             \
        vectors.doc                             \
        version.doc                             \
        vports.doc                              \
-       weaks.doc
+       weak-set.doc                            \
+       weak-table.doc                          \
+       weak-vector.doc
 
 EXTRA_DOT_DOC_FILES = @EXTRA_DOT_DOC_FILES@
 
@@ -433,7 +440,7 @@ EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h                \
     dynl.c regex-posix.c                       \
     posix.c net_db.c socket.c                  \
     debug-malloc.c mkstemp.c                   \
-    win32-uname.c win32-dirent.c win32-socket.c        \
+    win32-uname.c win32-socket.c               \
     locale-categories.h
 
 ## delete guile-snarf.awk from the installation bindir, in case it's
@@ -450,7 +457,7 @@ noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c         \
                  ieee-754.h                                    \
                  srfi-14.i.c                                   \
                  quicksort.i.c                                  \
-                 win32-uname.h win32-dirent.h win32-socket.h   \
+                 win32-uname.h win32-socket.h                  \
                 private-gc.h private-options.h
 
 # vm instructions
@@ -530,6 +537,7 @@ modinclude_HEADERS =                                \
        expand.h                                \
        extensions.h                            \
        feature.h                               \
+       finalizers.h                            \
        filesys.h                               \
        fluids.h                                \
        foreign.h                               \
@@ -617,7 +625,9 @@ modinclude_HEADERS =                                \
        vm-expand.h                             \
        vm.h                                    \
        vports.h                                \
-       weaks.h
+       weak-set.h                              \
+       weak-table.h                            \
+       weak-vector.h
 
 nodist_modinclude_HEADERS = version.h scmconfig.h
 
@@ -647,6 +657,7 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @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_SITE_CCACHE_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache"' >> libpath.tmp
        @echo '#define SCM_EFFECTIVE_VERSION "$(GUILE_EFFECTIVE_VERSION)"' >> libpath.tmp
        @echo '#define SCM_BUILD_INFO { \' >> libpath.tmp
        @echo ' { "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp
@@ -698,7 +709,7 @@ posix.x: cpp-SIG.c
 load.x: libpath.h
 
 alldotdocfiles    = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES)
-snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guile-tools snarf-check-and-output-texi
+snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guild snarf-check-and-output-texi
 dotdoc2texi       = cat $(alldotdocfiles) | $(snarf2checkedtexi)
 
 guile.texi: $(alldotdocfiles) guile$(EXEEXT)