regenerate with updated ../Makefile.am.in

8 files changed, 80 insertions, 72 deletions

diff --git a/tests/cut/Makefile.am b/tests/cut/Makefile.am
index bdeb33428..cc6d5f08e 100644
--- a/tests/cut/Makefile.am
+++ b/tests/cut/Makefile.am
@@ -25,11 +25,13 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 SUFFIXES = .pl
 
 .pl:
@@ -41,12 +43,11 @@ SUFFIXES = .pl
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am
index 809a49896..c6a6ad6ac 100644
--- a/tests/join/Makefile.am
+++ b/tests/join/Makefile.am
@@ -27,11 +27,13 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 SUFFIXES = .pl
 
 .pl:
@@ -43,12 +45,11 @@ SUFFIXES = .pl
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
diff --git a/tests/md5sum/Makefile.am b/tests/md5sum/Makefile.am
index df7e25a95..f998fd502 100644
--- a/tests/md5sum/Makefile.am
+++ b/tests/md5sum/Makefile.am
@@ -15,11 +15,13 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 SUFFIXES = .pl
 
 .pl:
@@ -31,12 +33,11 @@ SUFFIXES = .pl
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
diff --git a/tests/pr/Makefile.am b/tests/pr/Makefile.am
index efa425091..91f4d0912 100644
--- a/tests/pr/Makefile.am
+++ b/tests/pr/Makefile.am
@@ -67,11 +67,13 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 SUFFIXES = .pl
 
 .pl:
@@ -83,12 +85,11 @@ SUFFIXES = .pl
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am
index 829122b80..79d69740a 100644
--- a/tests/sort/Makefile.am
+++ b/tests/sort/Makefile.am
@@ -39,11 +39,13 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 SUFFIXES = .pl
 
 .pl:
@@ -55,12 +57,11 @@ SUFFIXES = .pl
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
diff --git a/tests/tac/Makefile.am b/tests/tac/Makefile.am
index 4c8eab7b1..c0885239c 100644
--- a/tests/tac/Makefile.am
+++ b/tests/tac/Makefile.am
@@ -23,11 +23,13 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 SUFFIXES = .pl
 
 .pl:
@@ -39,12 +41,11 @@ SUFFIXES = .pl
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
diff --git a/tests/tail/Makefile.am b/tests/tail/Makefile.am
index def636394..129389034 100644
--- a/tests/tail/Makefile.am
+++ b/tests/tail/Makefile.am
@@ -29,11 +29,13 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 SUFFIXES = .pl
 
 .pl:
@@ -45,12 +47,11 @@ SUFFIXES = .pl
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@
diff --git a/tests/tr/Makefile.am b/tests/tr/Makefile.am
index d083f5fb6..0d7d0f353 100644
--- a/tests/tr/Makefile.am
+++ b/tests/tr/Makefile.am
@@ -31,11 +31,13 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 SUFFIXES = .pl
 
 .pl:
@@ -47,12 +49,11 @@ SUFFIXES = .pl
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
 
-@MAINT@rebuild-check: Test.pm mk-script
-@MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	m_template=../Makefile.am.in; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@Makefile.am: ../Makefile.am.in Test.pm mk-script
+@MAINT@	rm -f $@ $@t
+@MAINT@	sed -n '1,/^##test-files-begin/p' $< > $@t
 @MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-@MAINT@	echo "x = $$tool" >> $$rb; \
-@MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
-@MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
+@MAINT@	  echo "x = $$tool" >> $@t
+@MAINT@	./mk-script --list >> $@t
+@MAINT@	sed -n '/^##test-files-end/,$$p' $< >> $@t
+@MAINT@	mv $@t $@