Merge branch 'master' into boehm-demers-weiser-gc

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

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 09be878..f000f83 100644 (file)
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -110,9 +110,8 @@ libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c      \
     convert.c debug.c deprecation.c                                    \
     deprecated.c discouraged.c dynwind.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 gettext.c gc-segment-table.c     \
-    goops.c gsubr.c            \
+    futures.c gc.c gc-malloc.c                                         \
+    gdbint.c gettext.c goops.c gsubr.c                                 \
     guardians.c hash.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  \
@@ -139,10 +138,9 @@ libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LDFLAGS = \
 DOT_X_FILES = alist.x arbiters.x async.x backtrace.x boolean.x         \
     bytevectors.x chars.x                                              \
     continuations.x debug.x deprecation.x deprecated.x discouraged.x   \
-    dynl.x dynwind.x eq.x error.x eval.x evalext.x     \
-    extensions.x feature.x fluids.x fports.x futures.x gc.x gc-mark.x  \
-    gc-segment.x gc-malloc.x gc-card.x gettext.x goops.x               \
-    gsubr.x guardians.x gc-segment-table.x                              \
+    dynl.x dynwind.x environments.x eq.x error.x eval.x evalext.x      \
+    extensions.x feature.x fluids.x fports.x futures.x gc.x            \
+    gettext.x goops.x gsubr.x guardians.x                              \
     hash.x hashtab.x hooks.x i18n.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     \
@@ -164,9 +162,8 @@ DOT_DOC_FILES = alist.doc arbiters.doc async.doc backtrace.doc              \
     deprecated.doc discouraged.doc dynl.doc dynwind.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 gettext.doc gc-segment-table.doc          \
-    guardians.doc hash.doc hashtab.doc                                 \
+    gc.doc goops.doc gsubr.doc                                         \
+    gc-malloc.doc gettext.doc guardians.doc hash.doc hashtab.doc       \
     hooks.doc i18n.doc init.doc ioext.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  \
@@ -236,8 +233,8 @@ pkginclude_HEADERS =
 # 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 bytevectors.h chars.h continuations.h convert.h          \
-    debug.h debug-malloc.h                                             \
+    boehm-gc.h bytevectors.h                                           \
+    boolean.h chars.h continuations.h convert.h debug.h debug-malloc.h \
     deprecation.h deprecated.h discouraged.h dynl.h dynwind.h          \
     eq.h error.h eval.h evalext.h extensions.h         \
     feature.h filesys.h fluids.h fports.h futures.h gc.h               \