Clean up 'make dist' of previous patch.

* tests/Makefile.am (EXTRA_DIST): Distribute mktests.stamp.
(CLEANFILES): Don't clean the stamp, since we distribute the
generated files pre-built.
(MAINTAINERCLEANFILES): Clean it here instead.
* tests/Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 04e4f51c7f904ee8fc8ad50591220a7db470aea6..9c8baa778ba41fde890dd449f8b451b1de4de237 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-09-13  Eric Blake  <ebb9@byu.net>
 
+       Clean up 'make dist' of previous patch.
+       * tests/Makefile.am (EXTRA_DIST): Distribute mktests.stamp.
+       (CLEANFILES): Don't clean the stamp, since we distribute the
+       generated files pre-built.
+       (MAINTAINERCLEANFILES): Clean it here instead.
+       * tests/Makefile.in: Regenerate.
+
        Avoid parallel 'make check' issue.
        * tests/Makefile.am (mktests.stamp): New witness.
        (TESTSUITE_GENERATED_AT): Use it.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7e23df880841118a3b484ec67f52c18aff8e5010..c1141c62bdfb81bccd3c84c12a168e3150f50978 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -172,7 +172,10 @@ mktests.stamp : mktests.sh $(AUTOCONF_FILES)
          `echo " "$(AUTOCONF_FILES) | sed 's, [^ ]*/, ../lib/autoconf/,g'`
        @mv -f mktests.tmp $@
 
-CLEANFILES += mktests.stamp mktests.tmp
+## Distribute the stamp file, since we distribute the generated files.
+EXTRA_DIST += mktests.stamp
+CLEANFILES += mktests.tmp
+MAINTAINERCLEANFILES += mktests.stamp
 
 ## maintainer-check ##
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2b694ebad595d5ce3dfddf53733f31998f712a93..db59ebc77ada02d1d81007bff83d06ef329f8345 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -161,14 +161,14 @@ top_srcdir = @top_srcdir@
 
 # We don't actually distribute the testsuite, since one only
 # needs m4 to build it, m4 being required anyway to install Autoconf.
-EXTRA_DIST = $(TESTSUITE_AT) local.at mktests.sh \
-            atlocal.in package.m4 wrapper.as
-
+EXTRA_DIST = $(TESTSUITE_AT) local.at mktests.sh atlocal.in package.m4 \
+       wrapper.as mktests.stamp
 
 # Running the uninstalled scripts.
 check_SCRIPTS = $(wrappers)
 DISTCLEANFILES = atconfig atlocal $(TESTSUITE)
-MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE_GENERATED_AT)
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE_GENERATED_AT) \
+       mktests.stamp
 SUFFIXES = .m4 .m4f
 AUTOM4TE_CFG = $(top_builddir)/lib/autom4te.cfg
 
@@ -239,7 +239,7 @@ ETAGS_FOR_AUTOCONF = \
 wrappers = autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames
 
 # The hairy heredoc is more robust than using echo.
-CLEANFILES = wrapper.in $(wrappers) mktests.stamp mktests.tmp expr
+CLEANFILES = wrapper.in $(wrappers) mktests.tmp expr
 edit = sed \
        -e 's|@wrap_program[@]|$@|g' \
        -e 's|@abs_top_srcdir[@]|@abs_top_srcdir@|g' \