.

5 files changed, 39 insertions, 42 deletions

diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index 81caf4a4c..d10c86970 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1k from Makefile.am
+# Makefile.in generated automatically by automake 1.1l from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -38,11 +38,10 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 RANLIB = @RANLIB@
-POW_LIBM = @POW_LIBM@
+GENCAT = @GENCAT@
+GMSGFMT = @GMSGFMT@
 CC = @CC@
 
-AUTOMAKE_OPTIONS = 1.1c
-
 x = cut
 t = t1 t2 t3 t4 t5 t6 t7 t8 t9 tA tB tC tD ta tb tc td te tf tg th \
 ti tj tk tl tm tn to tp tq tr ts tt tu tv tw tx ty tz
@@ -52,8 +51,8 @@ exp = $(t:=.exp)
 out = $(t:=.out)
 err = $(t:=.err)
 
-EXTRA_DIST = build-script.pl Test.pm $x-tests $(in) $(exp)
-noinst_SCRIPTS = $x-tests build-script
+EXTRA_DIST = mk-script.pl Test.pm $x-tests $(in) $(exp)
+noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
@@ -83,8 +82,8 @@ default: all
 
 .SUFFIXES:
 .SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in 
-	cd $(top_srcdir) && automake --gnits Makefile
+$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
+	cd $(top_srcdir) && automake --gnu tests/cut-test/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -179,8 +178,8 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@build-script Test.pm
-	./build-script ../../src/$x > $@.n
+$x-tests: @MAINT@mk-script Test.pm
+	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index a9e477f2f..d669d6abf 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1k from Makefile.am
+# Makefile.in generated automatically by automake 1.1l from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -38,7 +38,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 RANLIB = @RANLIB@
-POW_LIBM = @POW_LIBM@
+GENCAT = @GENCAT@
+GMSGFMT = @GMSGFMT@
 CC = @CC@
 
 x = join
@@ -51,8 +52,8 @@ exp = $(t:=.exp)
 out = $(t:=.out)
 err = $(t:=.err)
 
-EXTRA_DIST = build-script.pl Test.pm $x-tests $(in1) $(in2) $(exp)
-noinst_SCRIPTS = $x-tests build-script
+EXTRA_DIST = mk-script.pl Test.pm $x-tests $(in1) $(in2) $(exp)
+noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
@@ -82,8 +83,8 @@ default: all
 
 .SUFFIXES:
 .SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in 
-	cd $(top_srcdir) && automake --gnits Makefile
+$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
+	cd $(top_srcdir) && automake --gnu tests/join-test/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -178,8 +179,8 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@build-script Test.pm
-	./build-script ../../src/$x > $@.n
+$x-tests: @MAINT@mk-script Test.pm
+	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index fa0ed3acc..bb32ce4f3 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1k from Makefile.am
+# Makefile.in generated automatically by automake 1.1l from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -38,12 +38,11 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 RANLIB = @RANLIB@
-POW_LIBM = @POW_LIBM@
+GENCAT = @GENCAT@
 PERL = @PERL@
+GMSGFMT = @GMSGFMT@
 CC = @CC@
 
-AUTOMAKE_OPTIONS = 1.1
-
 TESTS = md5-rfc
 EXTRA_DIST = $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -62,8 +61,8 @@ TAR = tar
 default: all
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in 
-	cd $(top_srcdir) && automake --gnits Makefile
+$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
+	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 0885010c0..18b91f60a 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1k from Makefile.am
+# Makefile.in generated automatically by automake 1.1l from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -38,11 +38,10 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 RANLIB = @RANLIB@
-POW_LIBM = @POW_LIBM@
+GENCAT = @GENCAT@
+GMSGFMT = @GMSGFMT@
 CC = @CC@
 
-AUTOMAKE_OPTIONS = 1.1
-
 x = sort
 t = \
   t01a t02a t02b t02c t02d t02e t02f t03a t03b t03c t03d t03e t03f t03g \
@@ -57,7 +56,7 @@ exp = $(t:=.exp)
 out = $(t:=.out)
 err = $(t:=.err)
 
-EXTRA_DIST = build-script.pl Test.pm $x-tests $(in) $(exp)
+EXTRA_DIST = mk-script.pl Test.pm $x-tests $(in) $(exp)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -88,8 +87,8 @@ default: all
 
 .SUFFIXES:
 .SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in 
-	cd $(top_srcdir) && automake --gnits Makefile
+$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
+	cd $(top_srcdir) && automake --gnu tests/sort-test/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -184,8 +183,8 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@ build-script Test.pm
-	./build-script ../../src/$x > $@.n
+$x-tests: @MAINT@ mk-script Test.pm
+	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index 97147e003..62f867e3e 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1k from Makefile.am
+# Makefile.in generated automatically by automake 1.1l from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -38,11 +38,10 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 RANLIB = @RANLIB@
-POW_LIBM = @POW_LIBM@
+GENCAT = @GENCAT@
+GMSGFMT = @GMSGFMT@
 CC = @CC@
 
-AUTOMAKE_OPTIONS = 1.1c
-
 x = tr
 t = \
   t1 t2 t3 t4 t5 t6 t7 t8 t9 tA tB tC tD tE tF tG tH tI tR0.0 tR0.1 tR1.0 \
@@ -54,7 +53,7 @@ exp = $(t:=.exp)
 out = $(t:=.out)
 err = $(t:=.err)
 
-EXTRA_DIST = build-script.pl Test.pm $x-tests $(in) $(exp)
+EXTRA_DIST = mk-script.pl Test.pm $x-tests $(in) $(exp)
 noinst_SCRIPTS = $x-tests
 
 PERL = @PERL@
@@ -85,8 +84,8 @@ default: all
 
 .SUFFIXES:
 .SUFFIXES: .pl
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in 
-	cd $(top_srcdir) && automake --gnits Makefile
+$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
+	cd $(top_srcdir) && automake --gnu tests/tr-test/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -181,8 +180,8 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@ build-script Test.pm
-	./build-script ../../src/$x > $@.n
+$x-tests: @MAINT@mk-script Test.pm
+	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@