Mercurial > emacs
changeset 112331:f6578f2bd119
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.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 17 Jan 2011 11:20:37 -0800 |
| parents | 56d3e9c28eb0 |
| children | 28ca83ef1128 |
| files | ChangeLog Makefile.in |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 17 11:01:01 2011 -0800 +++ b/ChangeLog Mon Jan 17 11:20:37 2011 -0800 @@ -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>.
--- a/Makefile.in Mon Jan 17 11:01:01 2011 -0800 +++ b/Makefile.in Mon Jan 17 11:20:37 2011 -0800 @@ -406,7 +406,7 @@ $(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 @@ $(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 @@ 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}