Don't install libgettextlib.a and libgettextsrc.a.

diff --git a/ChangeLog b/ChangeLog
index ea56bdc64078aaa39554f3ed4e85a20e42338240..0876b6a5b76277d7206e33f548b4157e8c7d10d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-18  Bruno Haible  <bruno@clisp.org>
+
+       * PACKAGING: Remove note about libgettextlib.a and libgettextsrc.a.
+
 2002-05-03  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (SUBDIRS): Move man and m4 after projects and misc.

diff --git a/PACKAGING b/PACKAGING
index 7962f988788c9bbb60d7765a39c56dcf7c7d6967..f4b98195c8c80c81b3f144ac616cc7e5f8b93a97 100644 (file)
--- 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 f40e1b3fb6a8febcfb640efe41152554e9c80546..c5a54ce48b9fb550bde1f5c331aa7b136c5a1442 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-18  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (RM): New variable.
+       (install-exec-am): Depend on install-exec-clean.
+       (install-exec-clean): New rule.
+
 2002-05-09  Bruno Haible  <bruno@clisp.org>
 
        * config.charset: Update for newest glibc. Add canonical names

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 97c487a21cd303b4724edb6f961ef01dc0294d7d..2c4b89323268321644432cf0ef0d30b5f07d96ad 100644 (file)
--- 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 0ef88b3d2aea2e6dbc2a31db613db26aaaed5283..21d8e70c266cbb93da0910c0875b3956b73d4e34 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-18  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (RM): New variable.
+       (install-exec-am): Depend on install-exec-clean.
+       (install-exec-clean): New rule.
+
 2002-05-14  Bruno Haible  <bruno@clisp.org>
 
        * write-po.c (wrap): Canonicalize the charset. Handle the case when

diff --git a/src/Makefile.am b/src/Makefile.am
index c200e06445bed4649578c3511748dc94e1993dcb..a4fc1ad2f4d9d8c3b161997b9f005244965389f9 100644 (file)
--- 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@