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>

diff --git a/ChangeLog b/ChangeLog
index cdce7ec2c30160c9d55bfc25c77412f5829fb5e5..bf0e8712f1b748eb99a1f484753012bc534265ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 01acf3aca564880c9355ca0d306e8b9819a51009..0556b2952ed1c1ca8055b5509a53464f41db0c54 100644 (file)
--- 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