Minor flexibility change in gettext/0.11.5

bug-gnu-utils

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Minor flexibility change in gettext/0.11.5

From:	David Kaelbling
Subject:	Minor flexibility change in gettext/0.11.5
Date:	Sat, 23 Nov 2002 10:31:00 -0500

Building gettext/0.11.5 there are a couple places where the Makefiles
use explicit expansions when they could have used a local variable. 
(For example using "@LTLIBICONV@" in libgettextlib_la_LDFLAGS instead of
"$(LTLIBICONV)").  While this doesn't make any difference for normal
builds, it does make customizing the builds a bit harder since you can't
simply override 'LTLIBICONV="-all -liconv -notall"' in a wrapper
Makefile.

I've attached a patch that uses make variables when possible.

        Thanks,
        David

-- 
David KAELBLING <address@hidden>            Silicon Graphics Computer Systems
1 Cabot Rd, suite 250; Hudson, MA 01749     781.839.2157, fax ...2357

--- ./lib/Makefile.am   Wed Jul 17 06:28:06 2002
+++ ../gettext-0.11.5/./lib/Makefile.am Fri Nov 22 14:51:19 2002
@@ -91,11 +91,11 @@
 
 libgettextlib_la_LIBADD = @LTALLOCA@ @LTLIBOBJS@
 
-# Need @LTLIBINTL@ because many source files use gettext().
-# Need @LTLIBICONV@ because linebreak.c uses iconv().
+# Need $(LTLIBINTL) because many source files use gettext().
+# Need $(LTLIBICONV) because linebreak.c uses iconv().
 libgettextlib_la_LDFLAGS = \
-  -release @VERSION@ \
-  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+  -release $(VERSION) \
+  $(LTLIBINTL) $(LTLIBICONV) -lc -no-undefined
 
 # No need to install libgettextlib.a.
 install-exec-am: install-exec-clean
--- ./lib/Makefile.in   Tue Aug  6 09:58:14 2002
+++ ../gettext-0.11.5/./lib/Makefile.in Fri Nov 22 14:51:21 2002
@@ -223,12 +223,12 @@
 # How to build libgettextlib.la.
 libgettextlib_la_LIBADD = @LTALLOCA@ @LTLIBOBJS@
 
-# Need @LTLIBINTL@ because many source files use gettext().
-# Need @LTLIBICONV@ because linebreak.c uses iconv().
+# Need $(LTLIBINTL) because many source files use gettext().
+# Need $(LTLIBICONV) because linebreak.c uses iconv().
 libgettextlib_la_LDFLAGS = \
-  -release @VERSION@ \
-  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+  -release $(VERSION) \
+  $(LTLIBINTL) $(LTLIBICONV) -lc -no-undefined
 
 
 
--- ./src/Makefile.am   Wed Jul 17 06:28:06 2002
+++ ../gettext-0.11.5/./src/Makefile.am Fri Nov 22 14:51:36 2002
@@ -50,7 +50,7 @@
 -DGETTEXTJEXEDIR=\"$(pkglibdir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
 -DLIBDIR=\"$(libdir)\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
 -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
-LDADD = ../lib/libgettextlib.la @LTLIBINTL@
+LDADD = ../lib/libgettextlib.la $(LTLIBINTL)
 
 SED = sed
 YACC = @YACC@ -d
@@ -110,12 +110,12 @@
 
 # How to build libgettextsrc.la.
 # Need ../lib/libgettextlib.la.
-# Need @LTLIBINTL@ because many source files use gettext().
-# Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
+# Need $(LTLIBINTL) because many source files use gettext().
+# Need $(LTLIBICONV) because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
 # use iconv().
 libgettextsrc_la_LDFLAGS = \
-  -release @VERSION@ \
-  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+  -release $(VERSION) \
+  ../lib/libgettextlib.la $(LTLIBINTL) $(LTLIBICONV) -lc -no-undefined
 
 # No need to install libgettextsrc.a.
 install-exec-am: install-exec-clean
@@ -123,8 +123,8 @@
        $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a
 
 # Link dependencies.
-gettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo 
../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
-ngettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo 
../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
+gettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo 
../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo $(LTLIBINTL)
+ngettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo 
../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo $(LTLIBINTL)
 msgcmp_LDADD = libgettextsrc.la
 msgfmt_LDADD = libgettextsrc.la
 msgmerge_LDADD = libgettextsrc.la
--- ./src/Makefile.in   Tue Aug  6 09:59:06 2002
+++ ../gettext-0.11.5/./src/Makefile.in Fri Nov 22 14:51:49 2002
@@ -184,7 +184,7 @@
 -DLIBDIR=\"$(libdir)\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
 -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
 
-LDADD = ../lib/libgettextlib.la @LTLIBINTL@
+LDADD = ../lib/libgettextlib.la $(LTLIBINTL)
 
 SED = sed
 JAVACOMP = $(SHELL) ../lib/javacomp.sh
@@ -243,17 +243,17 @@
 
 # How to build libgettextsrc.la.
 # Need ../lib/libgettextlib.la.
-# Need @LTLIBINTL@ because many source files use gettext().
-# Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
+# Need $(LTLIBINTL) because many source files use gettext().
+# Need $(LTLIBICONV) because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
 # use iconv().
 libgettextsrc_la_LDFLAGS = \
-  -release @VERSION@ \
-  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+  -release $(VERSION) \
+  ../lib/libgettextlib.la $(LTLIBINTL) $(LTLIBICONV) -lc -no-undefined
 
 
 # Link dependencies.
-gettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo 
../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
-ngettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo 
../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
+gettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo 
../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo $(LTLIBINTL)
+ngettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo 
../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo $(LTLIBINTL)
 msgcmp_LDADD = libgettextsrc.la
 msgfmt_LDADD = libgettextsrc.la
 msgmerge_LDADD = libgettextsrc.la
--- ./intl/Makefile.in  Thu Jul 25 08:49:57 2002
+++ ../gettext-0.11.5/./intl/Makefile.in        Fri Nov 22 15:31:36 2002
@@ -79,6 +79,8 @@
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
 COPYING.LIB-2 gettext.h libgettext.h plural-eval.c
 
+LTLIBICONV = @LTLIBICONV@
+
 # Libtool's library version information for libintl.
 # Before making a gettext release, the gettext maintainer must change this
 # according to the libtool documentation, section "Library interface versions".
@@ -85,7 +87,7 @@
 # Maintainers of other packages that include the intl directory must *not*
 # change these values.
 LTV_CURRENT=4
-LTV_REVISION=0
+LTV_REVISION=1
 LTV_AGE=2
 
 .SUFFIXES:
@@ -119,8 +115,8 @@
 libintl.la libgnuintl.la: $(OBJECTS)
        $(LIBTOOL) --mode=link \
          $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-         $(OBJECTS) @LTLIBICONV@ -lc \
+         $(OBJECTS) $(LTLIBICONV) -lc \
          -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
          -rpath $(libdir) \
          -no-undefined
--- ./tests/Makefile.am Tue Jul 23 08:27:59 2002
+++ ../gettext-0.11.5/./tests/Makefile.am       Fri Nov 22 00:31:17 2002
@@ -118,7 +118,7 @@
                    CC='@CC@' CFLAGS='@CFLAGS@' \
                    CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' \
                    CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
-                   LTLIBINTL='@LTLIBINTL@' \
+                   LTLIBINTL='$(LTLIBINTL)' \
                    TESTJAVA='@TESTJAVA@' \
                    CONFIG_SHELL='$(SHELL)' \
                    $(SHELL)
@@ -135,7 +135,7 @@
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = $(address@hidden@)
 LDADD_yes = ../intl/libintl.la
-LDADD_no = ../intl/libgnuintl.la @LTLIBINTL@
+LDADD_no = ../intl/libgnuintl.la $(LTLIBINTL)
 noinst_PROGRAMS = tstgettext tstngettext cake fc3 fc4
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_LDADD = ../lib/libgettextlib.la $(LDADD)
--- ./tests/Makefile.in Tue Aug  6 10:01:03 2002
+++ ../gettext-0.11.5/./tests/Makefile.in       Fri Nov 22 14:58:17 2002
@@ -249,7 +249,7 @@
                    CC='@CC@' CFLAGS='@CFLAGS@' \
                    CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' \
                    CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
-                   LTLIBINTL='@LTLIBINTL@' \
+                   LTLIBINTL='$(LTLIBINTL)' \
                    TESTJAVA='@TESTJAVA@' \
                    CONFIG_SHELL='$(SHELL)' \
                    $(SHELL)
@@ -260,7 +260,7 @@
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = $(address@hidden@)
 LDADD_yes = ../intl/libintl.la
-LDADD_no = ../intl/libgnuintl.la @LTLIBINTL@
+LDADD_no = ../intl/libgnuintl.la $(LTLIBINTL)
 noinst_PROGRAMS = tstgettext tstngettext cake fc3 fc4
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_LDADD = ../lib/libgettextlib.la $(LDADD)
--- ./ltmain.sh Wed Feb  6 07:11:25 2002
+++ ../gettext-0.11.5/./ltmain.sh       Fri Nov 22 00:31:17 2002
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"

[Prev in Thread]

Current Thread

[Next in Thread]

Minor flexibility change in gettext/0.11.5, David Kaelbling <=
- Minor flexibility change in gettext/0.11.5, David Kaelbling, 2002/11/23

Prev by Date: necessary correction to binutils/strings.c
Next by Date: Minor flexibility change in gettext/0.11.5
Previous by thread: necessary correction to binutils/strings.c
Next by thread: Minor flexibility change in gettext/0.11.5
Index(es):
- Date
- Thread