.

diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index bbfbcd2..e3780fe 100644 (file)
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -100,7 +100,7 @@ s.E t.O t.E u.O u.E v.O v.E w.O w.E x.O x.E y.O y.E z.O z.E empty-fl.O \
 empty-fl.E missing-fl.O missing-fl.E empty-bl.O empty-bl.E missing-bl.O \
 missing-bl.E empty-f1.O empty-f1.E empty-f2.O empty-f2.E
 
-EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -108,7 +108,7 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-SUFFIXES = .pl
+mk_script = $(srcdir)/../mk-script
 
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
@@ -127,8 +127,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/cut/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -233,28 +232,19 @@ install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
-       ./mk-script ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm
+       $(PERL) -w -- $(mk_script) ../../src/$x > $@.n
        mv $@.n $@
        chmod 755 $@
 
-mk-script: ../../config.status
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< > $@.tmp
-       chmod +x-w $@.tmp
-       mv $@.tmp $@
-
-@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" >> $@t
-@MAINT@        ./mk-script --list >> $@t
-@MAINT@        sed -n '/^##test-files-end/,$$p' $< >> $@t
-@MAINT@        mv $@t $@
+Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
+       rm -f $@ $@t
+       sed -n '1,/^##test-files-begin/p' $< > $@t
+       tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+         echo "x = $$tool" >> $@t
+       $(PERL) $(mk_script) --list >> $@t
+       sed -n '/^##test-files-end/,$$p' $< >> $@t
+       mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/head/Makefile.in b/tests/head/Makefile.in
index 2cf3ba6..deefcd4 100644 (file)
--- a/tests/head/Makefile.in
+++ b/tests/head/Makefile.in
@@ -99,7 +99,7 @@ obs-4.O obs-4.E obs-5.O obs-5.E fail-1.O fail-1.E posix-0.O posix-0.E \
 posix-1.O posix-1.E posix-2.O posix-2.E posix-3.O posix-3.E posix-4.O \
 posix-4.E posix-5.O posix-5.E
 
-EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -107,7 +107,7 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-SUFFIXES = .pl
+mk_script = $(srcdir)/../mk-script
 
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
@@ -126,8 +126,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/head/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -232,28 +231,19 @@ install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
-       ./mk-script ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm
+       $(PERL) -w -- $(mk_script) ../../src/$x > $@.n
        mv $@.n $@
        chmod 755 $@
 
-mk-script: ../../config.status
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< > $@.tmp
-       chmod +x-w $@.tmp
-       mv $@.tmp $@
-
-@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" >> $@t
-@MAINT@        ./mk-script --list >> $@t
-@MAINT@        sed -n '/^##test-files-end/,$$p' $< >> $@t
-@MAINT@        mv $@t $@
+Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
+       rm -f $@ $@t
+       sed -n '1,/^##test-files-begin/p' $< > $@t
+       tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+         echo "x = $$tool" >> $@t
+       $(PERL) $(mk_script) --list >> $@t
+       sed -n '/^##test-files-end/,$$p' $< >> $@t
+       mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index 5311884..1e6bf90 100644 (file)
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -102,7 +102,7 @@ run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 2a.O \
 5g.E 5h.O 5h.E 5i.O 5i.E 5j.O 5j.E 5k.O 5k.E 5l.O 5l.E 5m.O 5m.E 6a.O 6a.E \
 6b.O 6b.E 6c.O 6c.E 7a.O 7a.E 8a.O 8a.E 8b.O 8b.E 9a.O 9a.E
 
-EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -110,7 +110,7 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-SUFFIXES = .pl
+mk_script = $(srcdir)/../mk-script
 
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
@@ -129,8 +129,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/join/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -235,28 +234,19 @@ install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
-       ./mk-script ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm
+       $(PERL) -w -- $(mk_script) ../../src/$x > $@.n
        mv $@.n $@
        chmod 755 $@
 
-mk-script: ../../config.status
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< > $@.tmp
-       chmod +x-w $@.tmp
-       mv $@.tmp $@
-
-@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" >> $@t
-@MAINT@        ./mk-script --list >> $@t
-@MAINT@        sed -n '/^##test-files-end/,$$p' $< >> $@t
-@MAINT@        mv $@t $@
+Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
+       rm -f $@ $@t
+       sed -n '1,/^##test-files-begin/p' $< > $@t
+       tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+         echo "x = $$tool" >> $@t
+       $(PERL) $(mk_script) --list >> $@t
+       sed -n '/^##test-files-end/,$$p' $< >> $@t
+       mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index af91f86..164d564 100644 (file)
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -90,7 +90,7 @@ explicit =
 maint_gen = 1.I 1.X 2.I 2.X 3.I 3.X 4.I 4.X 5.I 5.X 6.I 6.X 7.I 7.X
 run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E
 
-EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -98,7 +98,7 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-SUFFIXES = .pl
+mk_script = $(srcdir)/../mk-script
 
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
@@ -117,8 +117,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/md5sum/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -223,28 +222,19 @@ install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
-       ./mk-script ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm
+       $(PERL) -w -- $(mk_script) ../../src/$x > $@.n
        mv $@.n $@
        chmod 755 $@
 
-mk-script: ../../config.status
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< > $@.tmp
-       chmod +x-w $@.tmp
-       mv $@.tmp $@
-
-@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" >> $@t
-@MAINT@        ./mk-script --list >> $@t
-@MAINT@        sed -n '/^##test-files-end/,$$p' $< >> $@t
-@MAINT@        mv $@t $@
+Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
+       rm -f $@ $@t
+       sed -n '1,/^##test-files-begin/p' $< > $@t
+       tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+         echo "x = $$tool" >> $@t
+       $(PERL) $(mk_script) --list >> $@t
+       sed -n '/^##test-files-end/,$$p' $< >> $@t
+       mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index 7aba365..d57427d 100644 (file)
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -142,7 +142,7 @@ run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \
 12bc.O 12bc.E 12ma.O 12ma.E 12mb.O 12mb.E 12mc.O 12mc.E 12md.O 12md.E \
 margin-0.O margin-0.E
 
-EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -150,7 +150,7 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-SUFFIXES = .pl
+mk_script = $(srcdir)/../mk-script
 
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
@@ -169,8 +169,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/pr/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -275,28 +274,19 @@ install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
-       ./mk-script ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm
+       $(PERL) -w -- $(mk_script) ../../src/$x > $@.n
        mv $@.n $@
        chmod 755 $@
 
-mk-script: ../../config.status
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< > $@.tmp
-       chmod +x-w $@.tmp
-       mv $@.tmp $@
-
-@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" >> $@t
-@MAINT@        ./mk-script --list >> $@t
-@MAINT@        sed -n '/^##test-files-end/,$$p' $< >> $@t
-@MAINT@        mv $@t $@
+Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
+       rm -f $@ $@t
+       sed -n '1,/^##test-files-begin/p' $< > $@t
+       tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+         echo "x = $$tool" >> $@t
+       $(PERL) $(mk_script) --list >> $@t
+       sed -n '/^##test-files-end/,$$p' $< >> $@t
+       mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index 8725222..eed2b1e 100644 (file)
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -120,7 +120,7 @@ n10b.E n11a.O n11a.E n11b.O n11b.E 01a.O 01a.E 02a.O 02a.E 02b.O 02b.E 02c.O \
 18c.O 18c.E 18d.O 18d.E 18e.O 18e.E 19a.O 19a.E 19b.O 19b.E 20a.O 20a.E 21a.O \
 21a.E 21b.O 21b.E 21c.O 21c.E 21d.O 21d.E 21e.O 21e.E 21f.O 21f.E 21g.O 21g.E
 
-EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -128,7 +128,7 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-SUFFIXES = .pl
+mk_script = $(srcdir)/../mk-script
 
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
@@ -147,8 +147,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/sort/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -253,28 +252,19 @@ install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
-       ./mk-script ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm
+       $(PERL) -w -- $(mk_script) ../../src/$x > $@.n
        mv $@.n $@
        chmod 755 $@
 
-mk-script: ../../config.status
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< > $@.tmp
-       chmod +x-w $@.tmp
-       mv $@.tmp $@
-
-@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" >> $@t
-@MAINT@        ./mk-script --list >> $@t
-@MAINT@        sed -n '/^##test-files-end/,$$p' $< >> $@t
-@MAINT@        mv $@t $@
+Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
+       rm -f $@ $@t
+       sed -n '1,/^##test-files-begin/p' $< > $@t
+       tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+         echo "x = $$tool" >> $@t
+       $(PERL) $(mk_script) --list >> $@t
+       sed -n '/^##test-files-end/,$$p' $< >> $@t
+       mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index fcd7eab..846f102 100644 (file)
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -98,7 +98,7 @@ basic-f.E basic-g.O basic-g.E basic-h.O basic-h.E basic-i.O basic-i.E \
 basic-j.O basic-j.E basic-k.O basic-k.E b2-e.O b2-e.E b2-f.O b2-f.E b2-g.O \
 b2-g.E b2-h.O b2-h.E b2-i.O b2-i.E b2-j.O b2-j.E b2-k.O b2-k.E
 
-EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -106,7 +106,7 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-SUFFIXES = .pl
+mk_script = $(srcdir)/../mk-script
 
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
@@ -125,8 +125,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/tac/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -231,28 +230,19 @@ install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
-       ./mk-script ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm
+       $(PERL) -w -- $(mk_script) ../../src/$x > $@.n
        mv $@.n $@
        chmod 755 $@
 
-mk-script: ../../config.status
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< > $@.tmp
-       chmod +x-w $@.tmp
-       mv $@.tmp $@
-
-@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" >> $@t
-@MAINT@        ./mk-script --list >> $@t
-@MAINT@        sed -n '/^##test-files-end/,$$p' $< >> $@t
-@MAINT@        mv $@t $@
+Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
+       rm -f $@ $@t
+       sed -n '1,/^##test-files-begin/p' $< > $@t
+       tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+         echo "x = $$tool" >> $@t
+       $(PERL) $(mk_script) --list >> $@t
+       sed -n '/^##test-files-end/,$$p' $< >> $@t
+       mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index fe9b69b..df1d04a 100644 (file)
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -104,7 +104,7 @@ err-4.O err-4.E err-5.O err-5.E err-6.O err-6.E minus-1.O minus-1.E minus-2.O \
 minus-2.E n-1.O n-1.E n-2.O n-2.E n-3.O n-3.E n-4.O n-4.E n-4a.O n-4a.E n-5.O \
 n-5.E n-5a.O n-5a.E n-5b.O n-5b.E f-1.O f-1.E
 
-EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -112,7 +112,7 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-SUFFIXES = .pl
+mk_script = $(srcdir)/../mk-script
 
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
@@ -131,8 +131,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/tail/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -237,28 +236,19 @@ install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
-       ./mk-script ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm
+       $(PERL) -w -- $(mk_script) ../../src/$x > $@.n
        mv $@.n $@
        chmod 755 $@
 
-mk-script: ../../config.status
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< > $@.tmp
-       chmod +x-w $@.tmp
-       mv $@.tmp $@
-
-@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" >> $@t
-@MAINT@        ./mk-script --list >> $@t
-@MAINT@        sed -n '/^##test-files-end/,$$p' $< >> $@t
-@MAINT@        mv $@t $@
+Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
+       rm -f $@ $@t
+       sed -n '1,/^##test-files-begin/p' $< > $@t
+       tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+         echo "x = $$tool" >> $@t
+       $(PERL) $(mk_script) --list >> $@t
+       sed -n '/^##test-files-end/,$$p' $< >> $@t
+       mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index 4d343fb..8592321 100644 (file)
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -106,7 +106,7 @@ ross-0a.O ross-0a.E ross-0b.O ross-0b.E ross-1a.O ross-1a.E ross-1b.O \
 ross-1b.E ross-2.O ross-2.E ross-3.O ross-3.E ross-4.O ross-4.E ross-5.O \
 ross-5.E ross-6.O ross-6.E
 
-EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -114,7 +114,7 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-SUFFIXES = .pl
+mk_script = $(srcdir)/../mk-script
 
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
@@ -133,8 +133,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/tr/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -239,28 +238,19 @@ install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
-       ./mk-script ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm
+       $(PERL) -w -- $(mk_script) ../../src/$x > $@.n
        mv $@.n $@
        chmod 755 $@
 
-mk-script: ../../config.status
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< > $@.tmp
-       chmod +x-w $@.tmp
-       mv $@.tmp $@
-
-@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" >> $@t
-@MAINT@        ./mk-script --list >> $@t
-@MAINT@        sed -n '/^##test-files-end/,$$p' $< >> $@t
-@MAINT@        mv $@t $@
+Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
+       rm -f $@ $@t
+       sed -n '1,/^##test-files-begin/p' $< > $@t
+       tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+         echo "x = $$tool" >> $@t
+       $(PERL) $(mk_script) --list >> $@t
+       sed -n '/^##test-files-end/,$$p' $< >> $@t
+       mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/wc/Makefile.in b/tests/wc/Makefile.in
index b7480de..f606b5a 100644 (file)
--- a/tests/wc/Makefile.in
+++ b/tests/wc/Makefile.in
@@ -94,7 +94,7 @@ run_gen = a0.O a0.E a1.O a1.E a2.O a2.E a3.O a3.E a4.O a4.E a5.O a5.E a6.O \
 a6.E a7.O a7.E a8.O a8.E a9.O a9.E b0.O b0.E b1.O b1.E c0.O c0.E c1.O c1.E \
 c2.O c2.E
 
-EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -102,7 +102,7 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-SUFFIXES = .pl
+mk_script = $(srcdir)/../mk-script
 
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
@@ -121,8 +121,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/wc/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -227,28 +226,19 @@ install-exec install-data install uninstall all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
-       ./mk-script ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm
+       $(PERL) -w -- $(mk_script) ../../src/$x > $@.n
        mv $@.n $@
        chmod 755 $@
 
-mk-script: ../../config.status
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< > $@.tmp
-       chmod +x-w $@.tmp
-       mv $@.tmp $@
-
-@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" >> $@t
-@MAINT@        ./mk-script --list >> $@t
-@MAINT@        sed -n '/^##test-files-end/,$$p' $< >> $@t
-@MAINT@        mv $@t $@
+Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
+       rm -f $@ $@t
+       sed -n '1,/^##test-files-begin/p' $< > $@t
+       tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+         echo "x = $$tool" >> $@t
+       $(PERL) $(mk_script) --list >> $@t
+       sed -n '/^##test-files-end/,$$p' $< >> $@t
+       mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.