[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
accurate dependencies
From: |
Jim Meyering |
Subject: |
accurate dependencies |
Date: |
Tue, 13 Nov 2007 09:01:19 +0100 |
I've fixed the annoying, inaccurate dependency behind
the make check failures and recent GNUmakefile kludge.
In duplicate code, no less.
I fixed another redirect-to-target buglet at the same time.
Just pushed:
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".
---
ChangeLog | 9 +++++++++
GNUmakefile | 3 ---
lib/m4sugar/Makefile.am | 5 +++--
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1426278..cc23b5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-13 Jim Meyering <address@hidden>
+
+ 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 <address@hidden>
* doc/autoconf.texi (Making testsuite Scripts): Document
diff --git a/GNUmakefile b/GNUmakefile
index 841a918..eca7b16 100644
--- 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 7360ca1..39da620 100644
--- 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
+ } > address@hidden
+ mv address@hidden $@
## --------------- ##
--
1.5.3.5.643.g40e25
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- accurate dependencies,
Jim Meyering <=