summaryrefslogtreecommitdiffstats
path: root/gnulib-local
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2006-12-22 12:12:07 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:14:33 +0200
commit9801c6a83c7807d37f99d83d9f2e11fd1604a354 (patch)
tree2fecb30bbb052b16fb071143e59f62479e91db13 /gnulib-local
parent12cb539e4d2869aab44dd8a03c61534f9d0f5e3f (diff)
downloadexternal_gettext-9801c6a83c7807d37f99d83d9f2e11fd1604a354.zip
external_gettext-9801c6a83c7807d37f99d83d9f2e11fd1604a354.tar.gz
external_gettext-9801c6a83c7807d37f99d83d9f2e11fd1604a354.tar.bz2
Use a hand-written Makefile.am part in gettext-tools/gnulib-lib/.
Diffstat (limited to 'gnulib-local')
-rw-r--r--gnulib-local/ChangeLog6
-rw-r--r--gnulib-local/modules/gettext-tools-misc17
2 files changed, 6 insertions, 17 deletions
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 5b08cdc..bfefbfe 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,5 +1,11 @@
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.
(dllexports): New variable.
Parse command-line options.
diff --git a/gnulib-local/modules/gettext-tools-misc b/gnulib-local/modules/gettext-tools-misc
index 9dcd233..9019add 100644
--- 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: