From: Ralf Wildenhues Date: Sun, 16 Nov 2008 22:03:29 +0000 (+0100) Subject: Use a different workaround for an automake quirk. X-Git-Tag: v2.63b~100 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=541df95c2eb3e31f3ee0177b02f40467e65ba2aa;p=thirdparty%2Fautoconf.git Use a different workaround for an automake quirk. * tests/Makefile.am (AUTOMAKE_OPTIONS): Remove. (distclean_generic): New helper variable, to fool automake. ($(distclean_generic)): Depend on clean-local, to prevent the race in the two rules with accessing and removing $(TESTSUITE). Report by Eric Blake. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index cdce7ec2c..bf0e8712f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-11-16 Ralf Wildenhues + Use a different workaround for an automake quirk. + * tests/Makefile.am (AUTOMAKE_OPTIONS): Remove. + (distclean_generic): New helper variable, to fool automake. + ($(distclean_generic)): Depend on clean-local, to prevent + the race in the two rules with accessing and removing + $(TESTSUITE). + Report by Eric Blake. + * lib/m4sugar/m4sh.m4 (_AS_VAR_ARITH_PREPARE): Simplify, avoid unbalanced parentheses from last change. Spotted by Eric Blake, fix suggested by Paolo Bonzini. diff --git a/tests/Makefile.am b/tests/Makefile.am index 01acf3aca..0556b2952 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -127,12 +127,11 @@ atconfig: $(top_builddir)/config.status # if found, attempts to run it. But the distclean-generic rule may # be running in parallel, and it removes $(DISTCLEANFILES) which # includes $(TESTSUITE). This is the Automake rule, plus our -# dependency, and we silence the warning from 'automake -Wall'. +# dependency, and we silence the warning from 'automake -Wall' by +# hiding the dependency behind a variable. # TODO - fix this if newer automake accomodates the dependency. -AUTOMAKE_OPTIONS = -Wno-override -distclean-generic: clean-local - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) +distclean_generic = distclean-generic +$(distclean_generic): clean-local clean-local: test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean