Adapt dependencies, now that a version change doesn't modify configure.ac

* GNUmakefile: Remove "make clean" kludge.
* lib/m4sugar/Makefile.am (version.m4): Depend on Makefile, not
configure.ac.
Don't redirect directly to target.
Use $@, not literal "version.m4".

diff --git a/ChangeLog b/ChangeLog
index 14262785335759d05ddbbba547c50c49204b7032..cc23b5a956aec9a5c11690aa6ec28d22b64d7e6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-13  Jim Meyering  <meyering@redhat.com>
+
+       Adapt dependencies, now that a version change doesn't modify configure.ac
+       * GNUmakefile: Remove "make clean" kludge.
+       * lib/m4sugar/Makefile.am (version.m4): Depend on Makefile, not
+       configure.ac.
+       Don't redirect directly to target.
+       Use $@, not literal "version.m4".
+
 2007-11-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/autoconf.texi (Making testsuite Scripts): Document

diff --git a/GNUmakefile b/GNUmakefile
index 841a9180f1df6bff14471df17157f90d046bade2..eca7b16dc1505bcb2dc7084a6f38680d70141c5f 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -45,8 +45,6 @@ include Makefile
 
 # Ensure that $(VERSION) is up to date for dist-related targets, but not
 # for others: rerunning autoconf and recompiling everything isn't cheap.
-# The $(MAKE) clean is required, to remove all traces of the previous
-# version string, which would otherwise cause a few test failures.
 # Remove the autoreconf-provided INSTALL, so that we regenerate it.
 ifeq (0,$(MAKELEVEL))
   _is-dist-target = $(filter dist% alpha beta major,$(MAKECMDGOALS))
@@ -57,7 +55,6 @@ ifeq (0,$(MAKELEVEL))
       dummy := $(shell                         \
        rm -rf autom4te.cache;                  \
        (cd $(srcdir) && autoreconf -i -v)      \
-         && $(MAKE) clean                      \
          && rm -f INSTALL)
     endif
   endif

diff --git a/lib/m4sugar/Makefile.am b/lib/m4sugar/Makefile.am
index 7360ca101153dca0fa6428d06fe7a6cecd390857..39da620868d40cd78b2f63a885f7f2c8dd4cad8e 100644 (file)
--- a/lib/m4sugar/Makefile.am
+++ b/lib/m4sugar/Makefile.am
@@ -25,7 +25,7 @@ CLEANFILES = $(nodist_m4sugarlib_DATA)
 ## ------------ ##
 
 # The `:;' works around a redirected compound command bash exit status bug.
-version.m4: $(top_srcdir)/configure.ac
+version.m4: Makefile
        :;{ \
          echo '# This file is part of -*- Autoconf -*-.' && \
          echo '# Version of Autoconf.' && \
@@ -37,7 +37,8 @@ version.m4: $(top_srcdir)/configure.ac
          echo 'm4_define([m4_PACKAGE_VERSION],   [$(PACKAGE_VERSION)])' && \
          echo 'm4_define([m4_PACKAGE_STRING],    [$(PACKAGE_STRING)])' && \
          echo 'm4_define([m4_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \
-       } >version.m4
+       } > $@-t
+       mv $@-t $@
 
 
 ## --------------- ##