From: Bruno Haible Date: Mon, 29 Oct 2001 09:51:22 +0000 (+0000) Subject: Create a libgettextlib shared library. X-Git-Tag: v0.11~380 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=317466122641705fc93b74dd42d126ac28a1a231;p=thirdparty%2Fgettext.git Create a libgettextlib shared library. --- diff --git a/ChangeLog b/ChangeLog index 548e9961c..bca26f76d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-10-21 Bruno Haible + + * configure.in: Define LTLIBOBJS and LTALLOCA based on LIBOBJS, ALLOCA. + 2001-10-19 Bruno Haible * configure.in: Remove check for texi2html. diff --git a/configure.in b/configure.in index c3499e30b..833b35aa6 100644 --- a/configure.in +++ b/configure.in @@ -120,6 +120,17 @@ $RELEASE_DATE GNU EOF +dnl These can be removed when we drop support for autoconf-2.13 and switch +dnl to autoconf-2.52. +changequote(,)dnl +LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` +changequote([, ])dnl +AC_SUBST(LTLIBOBJS) +changequote(,)dnl +LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` +changequote([, ])dnl +AC_SUBST(LTALLOCA) + AC_OUTPUT([Makefile \ lib/Makefile lib/javacomp.sh lib/javaexec.sh \ intl/Makefile intl-java/Makefile \ diff --git a/lib/ChangeLog b/lib/ChangeLog index cfa07325e..910d0c847 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,13 @@ +2001-10-21 Bruno Haible + + Create a libgettextlib shared library. + * Makefile.am (noinst_LIBRARIES): Remove variable. + (lib_LTLIBRARIES): New variable. + (libgettextlib_la_SOURCES): Renamed from libnlsut_a_SOURCES. + (libgettextlib_la_HEADER): Renamed from libnlsut_a_HEADER. + (libgettextlib_la_LIBADD): Renamed from libnlsut_a_LIBADD. + (libgettextlib_la_LDFLAGS): New variable. + 2001-10-21 Bruno Haible * mkdtemp.c: Include if it exists. Needed on platforms diff --git a/lib/Makefile.am b/lib/Makefile.am index ed213bd04..e37664da0 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -19,21 +19,22 @@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies -noinst_LIBRARIES = libnlsut.a +lib_LTLIBRARIES = libgettextlib.la # Sources that are compiled on all platforms. -libnlsut_a_SOURCES = addext.c argmatch.c backupfile.c basename.c c-ctype.c \ -concatpath.c copy-file.c execute.c findprog.c fstrcmp.c full-write.c gcd.c \ -getopt.c getopt1.c hash.c javacomp.c javaexec.c linebreak.c localcharset.c \ -mbswidth.c obstack.c pipe-bidi.c pipe-in.c pipe-out.c progname.c safe-read.c \ -sh-quote.c tmpdir.c wait-process.c xerror.c xgetcwd.c xmalloc.c xstrdup.c +libgettextlib_la_SOURCES = addext.c argmatch.c backupfile.c basename.c \ +c-ctype.c concatpath.c copy-file.c execute.c findprog.c fstrcmp.c \ +full-write.c gcd.c getopt.c getopt1.c hash.c javacomp.c javaexec.c \ +linebreak.c localcharset.c mbswidth.c obstack.c pipe-bidi.c pipe-in.c \ +pipe-out.c progname.c safe-read.c sh-quote.c tmpdir.c wait-process.c xerror.c \ +xgetcwd.c xmalloc.c xstrdup.c -libnlsut_a_HEADER = argmatch.h backupfile.h basename.h c-ctype.h copy-file.h \ -execute.h findprog.h fstrcmp.h full-write.h gcd.h getopt.h hash.h javacomp.h \ -javaexec.h lbrkprop.h linebreak.h mbswidth.h obstack.h pathmax.h pipe.h \ -progname.h safe-read.h sh-quote.h system.h tmpdir.h utf8-ucs4.h utf16-ucs4.h \ -wait-process.h xerror.h xmalloc.h +libgettextlib_la_HEADER = argmatch.h backupfile.h basename.h c-ctype.h \ +copy-file.h execute.h findprog.h fstrcmp.h full-write.h gcd.h getopt.h hash.h \ +javacomp.h javaexec.h lbrkprop.h linebreak.h mbswidth.h obstack.h pathmax.h \ +pipe.h progname.h safe-read.h sh-quote.h system.h tmpdir.h utf8-ucs4.h \ +utf16-ucs4.h wait-process.h xerror.h xmalloc.h # Sources that are compiled only on platforms that lack the functions. @@ -49,11 +50,19 @@ UNUSED_SOURCE = memmove.c UNUSED_HEADER = -libnlsut_a_LIBADD = @ALLOCA@ @LIBOBJS@ +# How to build libgettextlib.la. + +libgettextlib_la_LIBADD = @LTALLOCA@ @LTLIBOBJS@ + +# Need @INTLLIBS@ because many source files use gettext(). +# Need @LIBICONV@ because linebreak.c uses iconv(). +libgettextlib_la_LDFLAGS = \ + -release @VERSION@ \ + @INTLLIBS@ @LIBICONV@ -no-undefined # List of files to be distributed. -noinst_HEADERS = $(libnlsut_a_HEADER) $(LIBADD_HEADER) $(UNUSED_HEADER) +noinst_HEADERS = $(libgettextlib_la_HEADER) $(LIBADD_HEADER) $(UNUSED_HEADER) EXTRA_DIST = classpath.c config.charset ref-add.sin ref-del.sin \ $(LIBADD_SOURCE) $(UNUSED_SOURCE) \ diff --git a/src/ChangeLog b/src/ChangeLog index b1b39b07c..128327262 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-10-21 Bruno Haible + + * Makefile.am (LDADD): Replace libnlsut.a with libgettextlib.la. + (*_LDADD): Likewise. + 2001-10-26 Bruno Haible * x-c.h (EXTENSIONS_C): Add ".hxx". diff --git a/src/Makefile.am b/src/Makefile.am index ce0cf5b55..5905c915e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,7 +41,7 @@ INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl \ -I$(top_srcdir)/intl DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \ -DLIBDIR=\"$(libdir)\" -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@ -LDADD = ../lib/libnlsut.a @INTLLIBS@ +LDADD = ../lib/libgettextlib.la @INTLLIBS@ SED = sed YACC = @YACC@ -d @@ -88,21 +88,21 @@ urlget_SOURCES = urlget.c # Link dependencies. # po-lex.c and po.c may need -liconv. # write-po.c pulls in linebreak.c which may need -liconv. -msgcmp_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgfmt_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgmerge_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgunfmt_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -xgettext_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgattrib_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgcat_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgcomm_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgconv_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgen_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgexec_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msggrep_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ +msgcmp_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +msgfmt_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +msgmerge_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +msgunfmt_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +xgettext_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +msgattrib_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +msgcat_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +msgcomm_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +msgconv_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +msgen_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +msgexec_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +msggrep_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ msginit_LDADD = ../intl/localealias.$(OBJEXT) ../intl/localename.$(OBJEXT) \ - ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msguniq_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ + ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ +msguniq_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ # Special rules for bison and flex generated files. diff --git a/src/format-c.c b/src/format-c.c index dd67c3b34..733335afc 100644 --- a/src/format-c.c +++ b/src/format-c.c @@ -713,7 +713,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-c.c ../lib/libnlsut.a" + * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-c.c ../lib/libgettextlib.la" * End: */ diff --git a/src/format-java.c b/src/format-java.c index 1000d2597..6dd99843a 100644 --- a/src/format-java.c +++ b/src/format-java.c @@ -773,7 +773,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-java.c ../lib/libnlsut.a" + * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-java.c ../lib/libgettextlib.la" * End: */ diff --git a/src/format-lisp.c b/src/format-lisp.c index 267fb5e5d..cc082947d 100644 --- a/src/format-lisp.c +++ b/src/format-lisp.c @@ -3534,7 +3534,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-lisp.c ../lib/libnlsut.a" + * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-lisp.c ../lib/libgettextlib.la" * End: */ diff --git a/src/format-pascal.c b/src/format-pascal.c index b7ece5768..38243d136 100644 --- a/src/format-pascal.c +++ b/src/format-pascal.c @@ -523,7 +523,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-pascal.c ../lib/libnlsut.a" + * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-pascal.c ../lib/libgettextlib.la" * End: */ diff --git a/src/format-python.c b/src/format-python.c index a19a751b0..09bcb7eb2 100644 --- a/src/format-python.c +++ b/src/format-python.c @@ -604,7 +604,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-python.c ../lib/libnlsut.a" + * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-python.c ../lib/libgettextlib.la" * End: */ diff --git a/src/format-ycp.c b/src/format-ycp.c index 80066ffa3..2d79c186e 100644 --- a/src/format-ycp.c +++ b/src/format-ycp.c @@ -214,7 +214,7 @@ main () /* * For Emacs M-x compile * Local Variables: - * compile-command: "gcc -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-ycp.c ../lib/libnlsut.a" + * compile-command: "/bin/sh ../libtool --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../lib -I../intl -DHAVE_CONFIG_H -DTEST format-ycp.c ../lib/libgettextlib.la" * End: */ diff --git a/tests/ChangeLog b/tests/ChangeLog index f1a00318d..f25b3c150 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2001-10-21 Bruno Haible + + * Makefile.am (tstgettext_LDADD, tstngettext_LDADD): Replace + libnlsut.a with libgettextlib.la. + 2001-09-25 Bruno Haible Upgrade to automake-1.5. diff --git a/tests/Makefile.am b/tests/Makefile.am index f2b9bf8de..e28db07bd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -73,7 +73,7 @@ LDADD_yes = ../intl/libintl.la LDADD_no = ../intl/libgnuintl.la @INTLLIBS@ noinst_PROGRAMS = tstgettext tstngettext cake tstgettext_SOURCES = tstgettext.c setlocale.c -tstgettext_LDADD = ../lib/libnlsut.a $(LDADD) +tstgettext_LDADD = ../lib/libgettextlib.la $(LDADD) tstngettext_SOURCES = tstngettext.c setlocale.c -tstngettext_LDADD = ../lib/libnlsut.a $(LDADD) +tstngettext_LDADD = ../lib/libgettextlib.la $(LDADD) cake_SOURCES = plural-1-prg.c setlocale.c