diff options
author | Bruno Haible <bruno@clisp.org> | 2009-03-26 00:24:31 +0000 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:16:03 +0200 |
commit | bf17ccbd142dbd776d57a7d41702990af236b513 (patch) | |
tree | 900122db5873cd2ee5ccd7f8bca7ce975c48f076 /gettext-tools/libgettextpo | |
parent | 5360d328c20da4a3867bc819602f6eb8dfd2deef (diff) | |
download | external_gettext-bf17ccbd142dbd776d57a7d41702990af236b513.zip external_gettext-bf17ccbd142dbd776d57a7d41702990af236b513.tar.gz external_gettext-bf17ccbd142dbd776d57a7d41702990af236b513.tar.bz2 |
Fix the handling of Windows resources in shared libraries.
Diffstat (limited to 'gettext-tools/libgettextpo')
-rw-r--r-- | gettext-tools/libgettextpo/ChangeLog | 8 | ||||
-rw-r--r-- | gettext-tools/libgettextpo/Makefile.am | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog index ae11e5f..248f898 100644 --- a/gettext-tools/libgettextpo/ChangeLog +++ b/gettext-tools/libgettextpo/ChangeLog @@ -1,3 +1,11 @@ +2009-03-25 Bruno Haible <bruno@clisp.org> + + Fix the handling of Windows resources in shared libraries. + * Makefile.am (WOE32_LIBADD): Renamed from WOE32_LDADD. Use + libgettextpo.res.lo instead of libgettextpo.res. + (libgettextpo.res.lo): Renamed from libgettextpo.res. Use libtool + --tag=RC. + 2009-01-18 Bruno Haible <bruno@clisp.org> * gettext-po.c (po_message_comments, po_message_extracted_comments): diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am index a83d9dc..aab9722 100644 --- a/gettext-tools/libgettextpo/Makefile.am +++ b/gettext-tools/libgettextpo/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/libgettextpo subdirectory of GNU gettext -## Copyright (C) 1995-1998, 2000-2008 Free Software Foundation, Inc. +## Copyright (C) 1995-1998, 2000-2009 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -95,7 +95,7 @@ LTV_AGE=4 # How to build libgettextpo.la. # Don't make it depend on libgettextsrc.la or libgettextlib.la, since they # define an uncontrolled amount of symbols. -libgettextpo_la_LIBADD = libgnu.la $(WOE32_LDADD) +libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) libgettextpo_la_LDFLAGS = \ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ -rpath $(libdir) \ @@ -110,12 +110,12 @@ endif # Version information according to Woe32 conventions. EXTRA_DIST += libgettextpo.rc if WOE32 -WOE32_LDADD = libgettextpo.res -libgettextpo.res : $(srcdir)/libgettextpo.rc - $(WINDRES) `$(SHELL) $(top_srcdir)/../windows/windres-options --escape $(VERSION)` -i $(srcdir)/libgettextpo.rc -o libgettextpo.res --output-format=coff +WOE32_LIBADD = libgettextpo.res.lo +libgettextpo.res.lo : $(srcdir)/libgettextpo.rc + $(LIBTOOL) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) `$(SHELL) $(top_srcdir)/../windows/windres-options --escape $(VERSION)` -i $(srcdir)/libgettextpo.rc -o libgettextpo.res.lo --output-format=coff MOSTLYCLEANFILES += libgettextpo.res else -WOE32_LDADD = +WOE32_LIBADD = endif # Hide symbols that are defined by libgettextpo_la_AUXSOURCES or libgnu.la |