From 3cbecb8f286aa3309f68d9909317e03df4f597d6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 17 Jan 2011 11:20:37 -0800 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ Makefile.in | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd9104759d..095a4a7813 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-01-17 Paul Eggert + 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 . diff --git a/Makefile.in b/Makefile.in index 4cc6b08f89..13ecb64d68 100644 --- 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} -- 2.20.1