From: Bruno Haible Date: Mon, 28 May 2007 12:15:21 +0000 (+0000) Subject: Support for Windows resource file. X-Git-Tag: v0.17~367 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=593fbc8c2d8fc9774c5062abd123eb14a4480af1;p=thirdparty%2Fgettext.git Support for Windows resource file. --- diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog index 887e21752..45ce242a3 100644 --- a/gettext-runtime/src/ChangeLog +++ b/gettext-runtime/src/ChangeLog @@ -1,3 +1,9 @@ +2007-05-28 Bruno Haible + + * Makefile.am (MOSTLYCLEANFILES, CLEANFILES): New variables. + (WOE32_LDADD): New variable. + (LDADD): Include it. + 2007-03-27 Bruno Haible * envsubst.c (usage): Ask translators to specify a translation bug diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am index 4180d0ea9..2650f82d2 100644 --- a/gettext-runtime/src/Makefile.am +++ b/gettext-runtime/src/Makefile.am @@ -19,6 +19,8 @@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies EXTRA_DIST = +MOSTLYCLEANFILES = core *.stackdump +CLEANFILES = DISTCLEANFILES = RM = rm -f @@ -39,7 +41,7 @@ envsubst_SOURCES = envsubst.c # Link dependencies. # Need @LTLIBICONV@ because striconv.c uses iconv(). -LDADD = ../gnulib-lib/libgrt.a @LTLIBINTL@ @LTLIBICONV@ +LDADD = ../gnulib-lib/libgrt.a @LTLIBINTL@ @LTLIBICONV@ $(WOE32_LDADD) # Specify installation directory, for --enable-relocatable. gettext_CFLAGS = -DINSTALLDIR=\"$(bindir)\" @@ -60,3 +62,13 @@ RELOCATABLE_LIBRARY_PATH = $(libdir) RELOCATABLE_SRC_DIR = $(top_srcdir)/gnulib-lib RELOCATABLE_BUILD_DIR = ../gnulib-lib RELOCATABLE_CONFIG_H_DIR = .. + +# Version information according to Woe32 conventions. +if WOE32 +WOE32_LDADD = gettext.res +gettext.res : $(top_srcdir)/../windows/gettext.rc + $(WINDRES) `$(SHELL) $(top_srcdir)/../windows/windres-options --escape $(VERSION)` -i $(top_srcdir)/../windows/gettext.rc -o gettext.res --output-format=coff +MOSTLYCLEANFILES += gettext.res +else +WOE32_LDADD = +endif diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 75aa1dcde..acebf8031 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,14 @@ +2007-05-28 Bruno Haible + + * Makefile.am (WOE32_LDADD): New variable. + (LDADD, msgcmp_LDADD, msgfmt_LDADD, msgmerge_LDADD, msgunfmt_LDADD, + xgettext_LDADD, msgattrib_LDADD, msgcat_LDADD, msgcomm_LDADD, + msgconv_LDADD, msgen_LDADD, msgexec_LDADD, msgfilter_LDADD, + msggrep_LDADD, msginit_LDADD, msguniq_LDADD, recode_sr_latin_LDADD): + Include it. + (gettext.res): New rule. + (MOSTLYCLEANFILES): Add gettext.res. + 2007-05-27 Bruno Haible Avoid link error; u16_mbtouc_aux is no longer a public API. @@ -5272,4 +5283,4 @@ * user-email.in: Use 'gettext' instead of @PACKAGE@. -See ChangeLog.0 for earlier changes. +See ChangeLog.0 for earlier changes. \ No newline at end of file diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index c1f79b567..4dc8bf97a 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -80,7 +80,7 @@ DEFS = \ -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@ # Ensure that defines SIZE_MAX in C++ mode, like it does in C mode. AM_CXXFLAGS = -D__STDC_LIMIT_MACROS -LDADD = ../gnulib-lib/libgettextlib.la @LTLIBINTL@ +LDADD = ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD) SED = sed YACC = @YACC@ -d @@ -240,23 +240,23 @@ msgmerge_CXXFLAGS = $(AM_CXXFLAGS) $(OPENMP_CFLAGS) # INTL_MACOSX_LIBS is needed because the programs depend on libintl.la # but libtool doesn't put -Wl,-framework options into .la files. # For msginit, it is also needed because of localename.c. -msgcmp_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -msgfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -msgmerge_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(OPENMP_CFLAGS) -msgunfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -xgettext_LDADD = $(LIBUNINAME) libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ -msgattrib_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -msgcat_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -msgcomm_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -msgconv_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -msgen_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -msgexec_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -msgfilter_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -msggrep_LDADD = $(LIBGREP) libgettextsrc.la @INTL_MACOSX_LIBS@ +msgcmp_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +msgfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +msgmerge_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD) $(OPENMP_CFLAGS) +msgunfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +xgettext_LDADD = $(LIBUNINAME) libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ $(WOE32_LDADD) +msgattrib_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +msgcat_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +msgcomm_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +msgconv_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +msgen_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +msgexec_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +msgfilter_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +msggrep_LDADD = $(LIBGREP) libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) msginit_LDADD = ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ - libgettextsrc.la @INTL_MACOSX_LIBS@ -msguniq_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -recode_sr_latin_LDADD = ../gnulib-lib/libgettextlib.la @INTL_MACOSX_LIBS@ + libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +msguniq_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) +recode_sr_latin_LDADD = ../gnulib-lib/libgettextlib.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) # Specify installation directory, for --enable-relocatable. msgcmp_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\" @@ -547,3 +547,13 @@ RELOCATABLE_LIBRARY_PATH = $(libdir) RELOCATABLE_SRC_DIR = $(top_srcdir)/gnulib-lib RELOCATABLE_BUILD_DIR = ../gnulib-lib RELOCATABLE_CONFIG_H_DIR = .. + +# Version information according to Woe32 conventions. +if WOE32 +WOE32_LDADD = gettext.res +gettext.res : $(top_srcdir)/../windows/gettext.rc + $(WINDRES) `$(SHELL) $(top_srcdir)/../windows/windres-options --escape $(VERSION)` -i $(top_srcdir)/../windows/gettext.rc -o gettext.res --output-format=coff +MOSTLYCLEANFILES += gettext.res +else +WOE32_LDADD = +endif