From: Ralf Wildenhues Date: Sun, 22 Jul 2007 08:48:18 +0000 (+0000) Subject: * lib/am/configure.am (%?REGEN-ACLOCAL-M4%): New target X-Git-Tag: v1.10b~245 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0ebf7129536c9b2fa6333237378a61bf5063526;p=thirdparty%2Fautomake.git * lib/am/configure.am (%?REGEN-ACLOCAL-M4%): New target $(am__aclocal_m4_deps) without any dependencies, to avoid the "deleted .m4 file" problem. * tests/acloca22.test: New test. * tests/Makefile.am: Update. * NEWS: Update. --- diff --git a/ChangeLog b/ChangeLog index d3df99803..406a6609a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-07-22 Ralf Wildenhues + Alexandre Duret-Lutz + + * lib/am/configure.am (%?REGEN-ACLOCAL-M4%): New target + $(am__aclocal_m4_deps) without any dependencies, to avoid the + "deleted .m4 file" problem. + * tests/acloca22.test: New test. + * tests/Makefile.am: Update. + * NEWS: Update. + 2007-07-22 Francesco Salvestrini Ralf Wildenhues diff --git a/Makefile.in b/Makefile.in index e2cd6067d..5c72e2669 100644 --- a/Makefile.in +++ b/Makefile.in @@ -234,6 +234,7 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" diff --git a/NEWS b/NEWS index 4fd57de63..6304757ec 100644 --- a/NEWS +++ b/NEWS @@ -31,6 +31,10 @@ New in 1.10a: - install-sh supports -C, which does not update the installed file (and its time stamps) if the contents did not change. + - The "deleted header file problem" for *.m4 files is avoided by + stub rules. This allows `make' to trigger a rerun of `aclocal' + also if some previously needed macro file has been removed. + Bugs fixed in 1.10a: * Long standing bugs: diff --git a/doc/Makefile.in b/doc/Makefile.in index 6c1e4b6cd..35a0897cf 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -222,6 +222,7 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): .texi.info: restore=: && backupdir="$(am__leading_dot)am$$$$" && \ diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 5c7f96056..6385f5e6c 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -226,6 +226,7 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-dist_perllibDATA: $(dist_perllib_DATA) @$(NORMAL_INSTALL) test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)" diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 836facfae..f03165ccd 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -173,6 +173,7 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): tags: TAGS TAGS: diff --git a/lib/Makefile.in b/lib/Makefile.in index 9a97c45d2..902a1520f 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -202,6 +202,7 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgvdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgvdatadir)" diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index d895e6c5f..b90071b57 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -218,6 +218,7 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-dist_amDATA: $(dist_am_DATA) @$(NORMAL_INSTALL) test -z "$(amdir)" || $(MKDIR_P) "$(DESTDIR)$(amdir)" diff --git a/lib/am/configure.am b/lib/am/configure.am index b2926e3d4..1e10de856 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -1,5 +1,6 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. +## Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 Free Software +## Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -117,6 +118,9 @@ if %?REGEN-ACLOCAL-M4% $(ACLOCAL_M4): %MAINTAINER-MODE% $(am__aclocal_m4_deps) ?TOPDIR_P? cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +## Avoid the "deleted header file" problem for the dependencies. +$(am__aclocal_m4_deps): endif %?REGEN-ACLOCAL-M4% diff --git a/m4/Makefile.in b/m4/Makefile.in index 21181eb6d..386484483 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -214,6 +214,7 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-dist_m4dataDATA: $(dist_m4data_DATA) @$(NORMAL_INSTALL) test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)" diff --git a/tests/Makefile.am b/tests/Makefile.am index df6ff8760..7dbdc390b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,6 +24,7 @@ acloca18.test \ acloca19.test \ acloca20.test \ acloca21.test \ +acloca22.test \ acoutnoq.test \ acoutpt.test \ acoutpt2.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index f45ba3ea0..0fb651e47 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -157,6 +157,7 @@ acloca18.test \ acloca19.test \ acloca20.test \ acloca21.test \ +acloca22.test \ acoutnoq.test \ acoutpt.test \ acoutpt2.test \ @@ -785,6 +786,7 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): defs: $(top_builddir)/config.status $(srcdir)/defs.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ aclocal-${APIVERSION}: $(top_builddir)/config.status $(srcdir)/aclocal.in diff --git a/tests/acloca22.test b/tests/acloca22.test new file mode 100755 index 000000000..f5514cd73 --- /dev/null +++ b/tests/acloca22.test @@ -0,0 +1,53 @@ +#! /bin/sh +# Copyright (C) 2007 Free Software Foundation, Inc. +# +# This file is part of GNU Automake. +# +# GNU Automake is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Automake is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Automake; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. + +# Make sure the "deleted header file" issue is fixed wrt. aclocal.m4 +# dependencies. + +. ./defs || exit 1 + +set -e + +cat >>configure.in <foo.m4 <bar.m4 <Makefile.am < t +mv -f t configure.in +rm -f foo.m4 +$MAKE +grep GREPFOO Makefile && exit 1 +grep GREPBAR Makefile