.

5 files changed, 25 insertions, 17 deletions

diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index 2572aefcd..15fa520c5 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -43,7 +43,6 @@ GMSGFMT = @GMSGFMT@
 CC = @CC@
 
 x = cut
-
 explicit =
 maint_gen = t1.in t1.exp t2.in t2.exp t3.in t3.exp t4.in t4.exp t5.in t5.exp \
 t6.in t6.exp t7.in t7.exp t8.in t8.exp t9.in t9.exp ta.in ta.exp tb.in tb.exp \
@@ -93,7 +92,7 @@ default: all
 .SUFFIXES:
 .SUFFIXES: .pl
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
-	cd $(top_srcdir) && automake --gnits tests/cut-test/Makefile
+	cd $(top_srcdir) && automake --gnu tests/cut-test/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -201,9 +200,12 @@ $x-tests: @MAINT@mk-script Test.pm
 
 @MAINT@rebuild-check: Test.pm mk-script
 @MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' Makefile.am > $$rb; \
+@MAINT@	m_template=../Makefile.am.in; \
+@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@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' Makefile.am >> $$rb; \
+@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
 @MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index 721d27c91..4e9b06cf8 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -43,7 +43,6 @@ GMSGFMT = @GMSGFMT@
 CC = @CC@
 
 x = join
-
 explicit =
 maint_gen = t1a.in1 t1a.in2 t1a.exp t1b.in1 t1b.in2 t1b.exp t1c.in1 t1c.in2 \
 t1c.exp t1d.in1 t1d.in2 t1d.exp t1e.in1 t1e.in2 t1e.exp t1f.in1 t1f.in2 \
@@ -98,7 +97,7 @@ default: all
 .SUFFIXES:
 .SUFFIXES: .pl
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
-	cd $(top_srcdir) && automake --gnits tests/join-test/Makefile
+	cd $(top_srcdir) && automake --gnu tests/join-test/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -206,9 +205,12 @@ $x-tests: @MAINT@mk-script Test.pm
 
 @MAINT@rebuild-check: Test.pm mk-script
 @MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' Makefile.am > $$rb; \
+@MAINT@	m_template=../Makefile.am.in; \
+@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@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' Makefile.am >> $$rb; \
+@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
 @MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index dc1b901d6..bb32ce4f3 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -62,7 +62,7 @@ default: all
 
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
-	cd $(top_srcdir) && automake --gnits tests/md5sum-test/Makefile
+	cd $(top_srcdir) && automake --gnu tests/md5sum-test/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index c07535fab..9dfdc011c 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -43,7 +43,6 @@ GMSGFMT = @GMSGFMT@
 CC = @CC@
 
 x = sort
-
 explicit =
 maint_gen = t01a.in t01a.exp t02a.in t02a.exp t02b.in t02b.exp t02c.in \
 t02c.exp t02d.in t02d.exp t02e.in t02e.exp t02f.in t02f.exp t03a.in t03a.exp \
@@ -116,7 +115,7 @@ default: all
 .SUFFIXES:
 .SUFFIXES: .pl
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
-	cd $(top_srcdir) && automake --gnits tests/sort-test/Makefile
+	cd $(top_srcdir) && automake --gnu tests/sort-test/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -224,9 +223,12 @@ $x-tests: @MAINT@mk-script Test.pm
 
 @MAINT@rebuild-check: Test.pm mk-script
 @MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' Makefile.am > $$rb; \
+@MAINT@	m_template=../Makefile.am.in; \
+@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@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' Makefile.am >> $$rb; \
+@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
 @MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index e65a47812..23c7e752a 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -43,7 +43,6 @@ GMSGFMT = @GMSGFMT@
 CC = @CC@
 
 x = tr
-
 explicit =
 maint_gen = t1.in t1.exp t2.in t2.exp t3.in t3.exp t4.in t4.exp t5.in t5.exp \
 t6.in t6.exp t7.in t7.exp t8.in t8.exp t9.in t9.exp ta.in ta.exp tb.in tb.exp \
@@ -99,7 +98,7 @@ default: all
 .SUFFIXES:
 .SUFFIXES: .pl
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
-	cd $(top_srcdir) && automake --gnits tests/tr-test/Makefile
+	cd $(top_srcdir) && automake --gnu tests/tr-test/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -207,9 +206,12 @@ $x-tests: @MAINT@mk-script Test.pm
 
 @MAINT@rebuild-check: Test.pm mk-script
 @MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' Makefile.am > $$rb; \
+@MAINT@	m_template=../Makefile.am.in; \
+@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@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' Makefile.am >> $$rb; \
+@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
 @MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.