From: Bruno Haible Date: Tue, 21 May 2002 18:30:24 +0000 (+0000) Subject: Don't install libgettextlib.a and libgettextsrc.a. X-Git-Tag: v0.11.3~54 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b6b574e19b4de8684f6755c98b28c34510b31f06;p=thirdparty%2Fgettext.git Don't install libgettextlib.a and libgettextsrc.a. --- diff --git a/ChangeLog b/ChangeLog index ea56bdc64..0876b6a5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-05-18 Bruno Haible + + * PACKAGING: Remove note about libgettextlib.a and libgettextsrc.a. + 2002-05-03 Bruno Haible * Makefile.am (SUBDIRS): Move man and m4 after projects and misc. diff --git a/PACKAGING b/PACKAGING index 7962f9887..f4b98195c 100644 --- a/PACKAGING +++ b/PACKAGING @@ -87,8 +87,3 @@ following file list. $prefix/share/emacs/site-lisp/po-compat.elc $prefix/share/emacs/site-lisp/po-mode.el $prefix/share/emacs/site-lisp/po-mode.elc - -Note: Although installed by "make install", the static libraries - $prefix/lib/libgettextlib.a - $prefix/lib/libgettextsrc.a -don't need to be included in binary distributions; they are redundant. diff --git a/lib/ChangeLog b/lib/ChangeLog index f40e1b3fb..c5a54ce48 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2002-05-18 Bruno Haible + + * Makefile.am (RM): New variable. + (install-exec-am): Depend on install-exec-clean. + (install-exec-clean): New rule. + 2002-05-09 Bruno Haible * config.charset: Update for newest glibc. Add canonical names diff --git a/lib/Makefile.am b/lib/Makefile.am index 97c487a21..2c4b89323 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -19,6 +19,8 @@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies +RM = rm -f + lib_LTLIBRARIES = libgettextlib.la # Sources that are compiled on all platforms. @@ -95,6 +97,11 @@ libgettextlib_la_LDFLAGS = \ -release @VERSION@ \ @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined +# No need to install libgettextlib.a. +install-exec-am: install-exec-clean +install-exec-clean: + $(RM) $(DESTDIR)$(libdir)/libgettextlib.a + # Extra files to be installed. gettextsrcdir = $(datadir)/gettext diff --git a/src/ChangeLog b/src/ChangeLog index 0ef88b3d2..21d8e70c2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2002-05-18 Bruno Haible + + * Makefile.am (RM): New variable. + (install-exec-am): Depend on install-exec-clean. + (install-exec-clean): New rule. + 2002-05-14 Bruno Haible * write-po.c (wrap): Canonicalize the charset. Handle the case when diff --git a/src/Makefile.am b/src/Makefile.am index c200e0644..a4fc1ad2f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,6 +19,8 @@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies +RM = rm -f + bin_PROGRAMS = gettext ngettext \ msgcmp msgfmt msgmerge msgunfmt xgettext \ msgattrib msgcat msgcomm msgconv msgen msgexec msgfilter msggrep msginit msguniq @@ -112,6 +114,11 @@ libgettextsrc_la_LDFLAGS = \ -release @VERSION@ \ ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined +# No need to install libgettextsrc.a. +install-exec-am: install-exec-clean +install-exec-clean: + $(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@