From: Eric Blake <ebb9@byu.net>
Date: Thu, 13 Sep 2007 20:39:33 +0000 (+0000)
Subject: Clean up 'make dist' of previous patch.
X-Git-Tag: v2.62~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01b10135464eb6ffefcc733d16c7e4e73e73bf56;p=thirdparty%2Fautoconf.git

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 04e4f51c..9c8baa77 100644
--- 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 7e23df88..c1141c62 100644
--- 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 2b694eba..db59ebc7 100644
--- 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' \