Use a hand-written Makefile.am part in gettext-tools/gnulib-lib/.

diff --git a/ChangeLog b/ChangeLog
index 33af63d97bcb9db31c7713204cf839144d1c421c..4cb1e7ce3b08d1b4e226ffc609c913ee24ab453b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-21  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh: Pass --makefile-name option to gnulib-tool for
+       gettext-tools/gnulib-lib.
+
 2006-12-19  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (EXTRA_DIST): Add build-aux/moopp.

diff --git a/autogen.sh b/autogen.sh
index e89ba7ed8bf3fff4b385892993ebfa9a9060cadb..9d37b8ce03ca38ed53b3d7d06d639c025afce005 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -170,7 +170,7 @@ if test -n "$GNULIB_TOOL"; then
   gcj
   java
   '
-  $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --libtool --local-dir=gnulib-local --local-symlink \
+  $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
     --import $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_OTHER
   # In gettext-tools/libgettextpo:
   # This is a subset of the GNULIB_MODULES_FOR_SRC.

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index fc40639a07a477a306fcdc0608e1962198e5ba3a..47824090419d4841abfc7c021c7ac5b7986adb25 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-21  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-lib/Makefile.am: New file, partially taken from
+       ../gnulib-local/modules/gettext-tools-misc.
+
 2006-12-21  Bruno Haible  <bruno@clisp.org>
 
        * woe32dll/gettextlib-exports.c: Export styled_ostream_typeinfo.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 5b08cdc18230d23db57e16e5e9f778293ec50c04..bfefbfeb3a029ce2fee0ea461410e24a369faee7 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-21  Bruno Haible  <bruno@clisp.org>
+
+       * modules/gettext-tools-misc (Makefile.am): Move modifications of
+       AUTOMAKE_OPTIONS, AM_CPPFLAGS and settings of gettextsrcdir,
+       gettextsrc_DATA, pkgdatadir to ../gettext-tools/gnulib-lib/Makefile.am.
+
 2006-12-21  Bruno Haible  <bruno@clisp.org>
 
        * build-aux/moopp (func_usage, func_version): New functions.

diff --git a/gnulib-local/modules/gettext-tools-misc b/gnulib-local/modules/gettext-tools-misc
index 9dcd2330294931af1190b1b4b7a1fa58f50a0068..9019addc4c2b8b3c82527abd475aaa97d2e5df94 100644 (file)
--- a/gnulib-local/modules/gettext-tools-misc
+++ b/gnulib-local/modules/gettext-tools-misc
@@ -11,15 +11,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-AUTOMAKE_OPTIONS += no-dependencies
-
-# Hmm... is this still necessary?
-AM_CPPFLAGS += -I$(top_builddir)/intl -I$(top_srcdir)/intl
-# Needed so that config.h and woe32dll/export.h are found.
-AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
-
-# Parametrization of the 'relocatable' module.
-AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1
 
 # Specify that libgettextlib should installed in $(libdir).
 lib_LTLIBRARIES = libgettextlib.la
@@ -44,14 +35,6 @@ install-exec-clean:
          *) rm -f $(DESTDIR)$(libdir)/libgettextlib.a ;; \
        esac
 
-# Extra files to be installed.
-
-gettextsrcdir = $(datadir)/gettext
-gettextsrc_DATA = gettext.h
-
-# Where to install javaversion.class.
-pkgdatadir = $(datadir)/gettext
-
 Include:
 
 License: