mirror of
git://git.sv.gnu.org/autoconf
synced 2025-03-01 14:16:02 +08:00
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".
This commit is contained in:
parent
610817462b
commit
48520ed2f7
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 $@
|
||||
|
||||
|
||||
## --------------- ##
|
||||
|
Loading…
Reference in New Issue
Block a user