summaryrefslogtreecommitdiffstats
path: root/gnulib-local
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2010-10-10 14:15:11 +0200
committerBruno Haible <bruno@clisp.org>2010-10-10 14:15:11 +0200
commiteade51378d01552217fd73454bbb93c88edcda30 (patch)
tree6cbe0613785d5a185379aa790ddce1d560e15459 /gnulib-local
parent36e482964bd274437bf91c0ee48c92fee81c6271 (diff)
downloadexternal_gettext-eade51378d01552217fd73454bbb93c88edcda30.zip
external_gettext-eade51378d01552217fd73454bbb93c88edcda30.tar.gz
external_gettext-eade51378d01552217fd73454bbb93c88edcda30.tar.bz2
Update after gnulib changed.
Diffstat (limited to 'gnulib-local')
-rw-r--r--gnulib-local/ChangeLog5
-rw-r--r--gnulib-local/modules/gettext-tools-misc5
2 files changed, 9 insertions, 1 deletions
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index dd8f404..60c9d87 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-10 Bruno Haible <bruno@clisp.org>
+
+ * modules/gettext-tools-misc (Makefile.am): Remove flags from
+ libgettextlib_la_LDFLAGS that are now generated by gnulib-tool.
+
2010-08-29 Bruno Haible <bruno@clisp.org>
* modules/regex.diff: Update after gnulib changed.
diff --git a/gnulib-local/modules/gettext-tools-misc b/gnulib-local/modules/gettext-tools-misc
index b281049..d908847 100644
--- a/gnulib-local/modules/gettext-tools-misc
+++ b/gnulib-local/modules/gettext-tools-misc
@@ -19,10 +19,13 @@ lib_LTLIBRARIES = libgettextlib.la
# Need @LTLIBINTL@ because many source files use gettext().
# Need @LTLIBICONV@ because linebreak.c and striconv.c use iconv().
# Need @LIB_ACL@ because copy-file.c uses acl.h.
+# As of 2010-10-04, these are all added by gnulib-tool automatically.
+#lib_LDFLAGS += $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@
+
# Need @LTLIBC@ for -no-undefined to work on many platforms.
lib_LDFLAGS += \
-release @VERSION@ \
- $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@ @LTLIBC@ @LTNOUNDEF@
+ @LTLIBC@ @LTNOUNDEF@
# Tell the mingw or Cygwin linker which symbols to export.
if WOE32DLL