Create a libgettextsrc shared library.

diff --git a/src/ChangeLog b/src/ChangeLog
index 128327262fe62f2b4e332862152ef6a51a4f484b..166b257bc539bbcff7aaf0609123ad733fe42521 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2001-10-28  Bruno Haible  <haible@clisp.cons.org>
+
+       Create a libgettextsrc shared library.
+       * Makefile.am (lib_LTLIBRARIES): New variable.
+       (libgettextsrc_la_SOURCES): New variable.
+       (msgcmp_SOURCES, msgfmt_SOURCES, msgmerge_SOURCES, msgunfmt_SOURCES,
+       xgettext_SOURCES, msgattrib_SOURCES, msgcat_SOURCES, msgcomm_SOURCES,
+       msgconv_SOURCES, msgen_SOURCES, msgexec_SOURCES, msggrep_SOURCES,
+       msginit_SOURCES, msguniq_SOURCES): Remove source files listed in
+       libgettextsrc_la_SOURCES.
+       (libgettextsrc_la_LDFLAGS): New variable.
+       (msgcmp_LDADD, msgfmt_LDADD, msgmerge_LDADD, msgunfmt_LDADD,
+       xgettext_LDADD, msgattrib_LDADD, msgcat_LDADD, msgcomm_LDADD,
+       msgconv_LDADD, msgen_LDADD, msgexec_LDADD, msggrep_LDADD,
+       msginit_LDADD, msguniq_LDADD): Add libgettextsrc.la. Remove all
+       dependencies already listed in libgettextsrc_la_LDFLAGS.
+       (po-lex.lo): Depend on po-gram-gen2.h.
+
 2001-10-21  Bruno Haible  <haible@clisp.cons.org>
 
        * Makefile.am (LDADD): Replace libnlsut.a with libgettextlib.la.

diff --git a/src/Makefile.am b/src/Makefile.am
index 5905c915e2600a0eac8caee75a68e0465b863d9e..19e2fe7f6cc809dc0c7203c9fa2046c3b31a8a05 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,6 +25,8 @@ msgattrib msgcat msgcomm msgconv msgen msgexec msggrep msginit msguniq
 
 noinst_PROGRAMS = hostname urlget
 
+lib_LTLIBRARIES = libgettextsrc.la
+
 noinst_HEADERS = pos.h message.h po-gram.h po-hash.h po-charset.h po-lex.h \
 po.h open-po.h read-po.h str-list.h write-po.h dir-list.h file-list.h \
 po-gram-gen.h po-hash-gen.h msgl-charset.h msgl-equal.h msgl-iconv.h \
@@ -65,51 +67,64 @@ FORMAT_SOURCE = format.c \
 format-c.c format-java.c format-lisp.c format-python.c format-pascal.c \
 format-ycp.c
 
+# libgettextsrc contains all code that is needed by at least two programs.
+libgettextsrc_la_SOURCES = \
+$(COMMON_SOURCE) read-po.c write-po.c msgl-ascii.c msgl-iconv.c msgl-cat.c \
+msgl-english.c file-list.c msgl-charset.c po-time.c \
+$(FORMAT_SOURCE)
+
 # Source dependencies.
 gettext_SOURCES = gettext.c
 ngettext_SOURCES = ngettext.c
-msgcmp_SOURCES    = msgcmp.c    $(COMMON_SOURCE)
-msgfmt_SOURCES    = msgfmt.c    $(COMMON_SOURCE) msgl-ascii.c msgl-iconv.c write-mo.c write-java.c plural.c plural-eval.c $(FORMAT_SOURCE)
-msgmerge_SOURCES  = msgmerge.c  $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-equal.c
-msgunfmt_SOURCES  = msgunfmt.c  $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c read-mo.c read-java.c
-xgettext_SOURCES  = xgettext.c  $(COMMON_SOURCE) msgl-ascii.c write-po.c file-list.c po-time.c x-c.c x-po.c x-java.l x-ycp.c x-rst.c $(FORMAT_SOURCE)
-msgattrib_SOURCES = msgattrib.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c
-msgcat_SOURCES    = msgcat.c    $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c msgl-cat.c file-list.c
-msgcomm_SOURCES   = msgcomm.c   $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c msgl-cat.c file-list.c
-msgconv_SOURCES   = msgconv.c   $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c
-msgen_SOURCES     = msgen.c     $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-english.c
-msgexec_SOURCES   = msgexec.c   $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-charset.c
-msggrep_SOURCES   = msggrep.c   $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-charset.c
-msginit_SOURCES   = msginit.c   $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-english.c po-time.c
-msguniq_SOURCES   = msguniq.c   $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c msgl-cat.c
-hostname_SOURCES  = hostname.c
-urlget_SOURCES    = urlget.c
+msgcmp_SOURCES = msgcmp.c
+msgfmt_SOURCES = msgfmt.c write-mo.c write-java.c plural.c plural-eval.c
+msgmerge_SOURCES = msgmerge.c msgl-equal.c
+msgunfmt_SOURCES = msgunfmt.c read-mo.c read-java.c
+xgettext_SOURCES = xgettext.c x-c.c x-po.c x-java.l x-ycp.c x-rst.c
+msgattrib_SOURCES = msgattrib.c
+msgcat_SOURCES = msgcat.c
+msgcomm_SOURCES = msgcomm.c
+msgconv_SOURCES = msgconv.c
+msgen_SOURCES = msgen.c
+msgexec_SOURCES = msgexec.c
+msggrep_SOURCES = msggrep.c
+msginit_SOURCES = msginit.c
+msguniq_SOURCES = msguniq.c
+hostname_SOURCES = hostname.c
+urlget_SOURCES = urlget.c
+
+# How to build libgettextsrc.la.
+# Need ../lib/libgettextlib.la.
+# Need @INTLLIBS@ because many source files use gettext().
+# Need @LIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c use
+# iconv().
+libgettextsrc_la_LDFLAGS = \
+  -release @VERSION@ \
+  ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ -no-undefined
 
 # 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/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@
+msgcmp_LDADD = libgettextsrc.la
+msgfmt_LDADD = libgettextsrc.la
+msgmerge_LDADD = libgettextsrc.la
+msgunfmt_LDADD = libgettextsrc.la
+xgettext_LDADD = libgettextsrc.la
+msgattrib_LDADD = libgettextsrc.la
+msgcat_LDADD = libgettextsrc.la
+msgcomm_LDADD = libgettextsrc.la
+msgconv_LDADD = libgettextsrc.la
+msgen_LDADD = libgettextsrc.la
+msgexec_LDADD = libgettextsrc.la
+msggrep_LDADD = libgettextsrc.la
 msginit_LDADD = ../intl/localealias.$(OBJEXT) ../intl/localename.$(OBJEXT) \
-                ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
-msguniq_LDADD = ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@
+                libgettextsrc.la
+msguniq_LDADD = libgettextsrc.la
 
 
 # Special rules for bison and flex generated files.
 
 BUILT_SOURCES = po-gram-gen.c po-hash-gen.c po-gram-gen.h po-hash-gen.h
 
-po-lex.o: po-gram-gen2.h
+po-lex.o po-lex.lo: po-gram-gen2.h
 po-gram-gen2.h: po-gram-gen.h
        $(SED) 's/[yY][yY]/po_gram_/g' $(srcdir)/po-gram-gen.h > $@-tmp
        mv $@-tmp $@