Merge commit 'f30e1bdf97ae8b2b2918da585f887a4d3a23a347' into boehm-demers-weiser-gc

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

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 34b7473..6e1fa86 100644 (file)
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -31,7 +31,8 @@ INCLUDES = -I.. -I$(top_srcdir)
 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
+lib_LTLIBRARIES = libguile.la                                          \
+                 libguile-i18n-v-@LIBGUILE_I18N_MAJOR@.la
 bin_PROGRAMS = guile
 
 noinst_PROGRAMS = guile_filter_doc_snarfage gen-scmconfig
@@ -94,12 +95,12 @@ libguile_la_CFLAGS = $(GUILE_CFLAGS)
 
 libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c \
     chars.c continuations.c convert.c debug.c deprecation.c            \
-    deprecated.c discouraged.c dynwind.c environments.c eq.c error.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-malloc.c                                         \
-    gdbint.c gh_data.c gh_eval.c gh_funcs.c                            \
+    gdbint.c gettext.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 i18n.c init.c inline.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  \
     print.c procprop.c procs.c properties.c random.c rdelim.c read.c   \
@@ -109,11 +110,20 @@ libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c    \
     throw.c values.c variable.c vectors.c version.c vports.c weaks.c   \
     ramap.c unif.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
+libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LDFLAGS =     \
+   -module -L$(builddir) -lguile                               \
+   -version-info @LIBGUILE_I18N_INTERFACE@
+
 DOT_X_FILES = alist.x arbiters.x async.x backtrace.x boolean.x chars.x \
     continuations.x debug.x deprecation.x deprecated.x discouraged.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            \
-    goops.x gsubr.x guardians.x                                                \
+    gettext.c 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     \
@@ -128,10 +138,10 @@ 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 deprecation.doc  \
     deprecated.doc discouraged.doc dynl.doc dynwind.doc                        \
-    environments.doc eq.doc error.doc eval.doc evalext.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-malloc.doc guardians.doc hash.doc hashtab.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  \
@@ -154,7 +164,8 @@ EXTRA_libguile_la_SOURCES = _scm.h          \
     dynl.c regex-posix.c                       \
     filesys.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-dirent.c win32-socket.c        \
+    locale-categories.h
 
 ## delete guile-snarf.awk from the installation bindir, in case it's
 ## lingering there due to an earlier guile version not having been
@@ -186,9 +197,10 @@ modinclude_HEADERS = __scm.h alist.h arbiters.h async.h backtrace.h        \
     boehm-gc.h                                                         \
     boolean.h chars.h continuations.h convert.h debug.h debug-malloc.h \
     deprecation.h deprecated.h discouraged.h dynl.h dynwind.h          \
-    environments.h eq.h error.h eval.h evalext.h extensions.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                \
+    gdb_interface.h gdbint.h gettext.h goops.h                         \
+    gsubr.h guardians.h hash.h                                         \
     hashtab.h hooks.h i18n.h init.h inline.h ioext.h iselect.h         \
     keywords.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   \
@@ -213,7 +225,7 @@ EXTRA_DIST = ChangeLog-gh 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 gettext.h
+    scmconfig.h.top libgettext.h
 #    $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
 #    guile-procedures.txt guile.texi
 
@@ -221,7 +233,7 @@ EXTRA_DIST = ChangeLog-gh ChangeLog-scm ChangeLog-threads           \
 ## 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 \
+       sed < $(srcdir)/version.h.in > $@.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}: