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 <Ralf.Wildenhues@gmx.de>
This commit is contained in:
Ralf Wildenhues 2008-11-16 23:03:29 +01:00
parent fde7ee974a
commit 541df95c2e
2 changed files with 12 additions and 5 deletions

View File

@ -1,5 +1,13 @@
2008-11-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
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.

View File

@ -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