Makefile.in: tidy up the building of lib

* Makefile.in (am--refresh): Mark as .PHONY.
(top_maintainer_clean): Don't remove lib/gnulib.mk m4/gnulib-cache.m4,
as they're not rebuilt unless you do a "make sync-from-gnulib"
and the former is needed for "configure".
(maintainer-clean): Don't recurse into lib, as "make bootstrap-clean"
has already removed lib/Makefile.

diff --git a/ChangeLog b/ChangeLog
index cd9104759d0761deeef29c77c52929b3c90fe578..095a4a7813a99c3eebd25c8b0fa68edeb2c232b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
+       Makefile.in: tidy up the building of lib
+       * Makefile.in (am--refresh): Mark as .PHONY.
+       (top_maintainer_clean): Don't remove lib/gnulib.mk m4/gnulib-cache.m4,
+       as they're not rebuilt unless you do a "make sync-from-gnulib"
+       and the former is needed for "configure".
+       (maintainer-clean): Don't recurse into lib, as "make bootstrap-clean"
+       has already removed lib/Makefile.
+
        * Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr.
        This avoids building ftoastr and ldtoastr, which aren't needed.  See
        <http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00199.html>.

diff --git a/Makefile.in b/Makefile.in
index 4cc6b08f89b98571ee0c301ee8369bb6a26d0e18..13ecb64d68495cef550c6ec01a7af8f8c57b6372 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -406,7 +406,7 @@ AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
 $(srcdir)/configure: $(AUTOCONF_INPUTS)
        cd ${srcdir} && autoconf
 
-ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4 
+ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4
 $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
        cd $(srcdir) && aclocal -I m4
 
@@ -414,6 +414,7 @@ AUTOMAKE_INPUTS = @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am
 $(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS)
        cd $(srcdir) && automake --gnu -a -c lib/Makefile
 am--refresh:
+.PHONY: am--refresh
 
 $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
        @ # Usually, there's no need to rebuild src/config.in just
@@ -832,10 +833,9 @@ bootstrap-clean: FRC
 top_maintainer_clean=\
        ${top_distclean}; \
        rm -fr autom4te.cache; \
-       rm -f aclocal.m4 lib/gnulib.mk m4/gnulib-cache.m4
+       rm -f aclocal.m4
 maintainer-clean: bootstrap-clean FRC
        (cd src;      $(MAKE) $(MFLAGS) maintainer-clean)
-       (cd lib;      $(MAKE) $(MFLAGS) maintainer-clean)
        (cd lisp;     $(MAKE) $(MFLAGS) maintainer-clean)
        ${top_maintainer_clean}