.

9 files changed, 27 insertions, 39 deletions

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 730c21fd8..5e35bb8a8 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -59,40 +59,29 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 GENCAT = @GENCAT@
-GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
-LIB_CRYPT = @LIB_CRYPT@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NEED_SETGID = @NEED_SETGID@
-OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
-OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
-SEQ_LIBM = @SEQ_LIBM@
-SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-YACC = @YACC@
 l = @l@
 
 EXTRA_DIST = README \
diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index 9f2f95678..bf70b2d45 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -125,7 +125,7 @@ default: all
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/cut-test/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index 964b64b4a..023a1d9d8 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -127,7 +127,7 @@ default: all
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/join-test/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index 6d2fdb614..bc7849eb6 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -115,7 +115,7 @@ default: all
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/md5sum-test/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index a9b9dcf6b..00c7af136 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -167,7 +167,7 @@ default: all
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/pr-test/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index 913759471..0599bc32e 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -139,7 +139,7 @@ default: all
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/sort-test/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index 77ee98be2..8ba9b7439 100644
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -81,18 +81,16 @@ l = @l@
 
 x = tac
 explicit =
-maint_gen = basic-a.I basic-a.X basic-b.I basic-b.X basic-c.I basic-c.X \
-basic-d.I basic-d.X basic-e.I basic-e.X basic-f.I basic-f.X basic-g.I \
-basic-g.X basic-h.I basic-h.X basic-i.I basic-i.X empty.I empty.X no-nl-b.I \
-no-nl-b.X no-nl-c.I no-nl-c.X no-nl-d.I no-nl-d.X no-nl-e.I no-nl-e.X \
-no-nl-f.I no-nl-f.X no-nl-g.I no-nl-g.X no-nl-h.I no-nl-h.X no-nl-i.I \
-no-nl-i.X no-nl-j.I no-nl-j.X
-run_gen = basic-a.O basic-a.E basic-b.O basic-b.E basic-c.O basic-c.E \
-basic-d.O basic-d.E basic-e.O basic-e.E basic-f.O basic-f.E basic-g.O \
-basic-g.E basic-h.O basic-h.E basic-i.O basic-i.E empty.O empty.E no-nl-b.O \
-no-nl-b.E no-nl-c.O no-nl-c.E no-nl-d.O no-nl-d.E no-nl-e.O no-nl-e.E \
-no-nl-f.O no-nl-f.E no-nl-g.O no-nl-g.E no-nl-h.O no-nl-h.E no-nl-i.O \
-no-nl-i.E no-nl-j.O no-nl-j.E
+maint_gen = basic-0.I basic-0.X basic-a.I basic-a.X basic-b.I basic-b.X \
+basic-c.I basic-c.X basic-d.I basic-d.X basic-e.I basic-e.X basic-f.I \
+basic-f.X basic-g.I basic-g.X basic-h.I basic-h.X basic-i.I basic-i.X \
+basic-j.I basic-j.X basic-k.I basic-k.X b2-e.I b2-e.X b2-f.I b2-f.X b2-g.I \
+b2-g.X b2-h.I b2-h.X b2-i.I b2-i.X b2-j.I b2-j.X b2-k.I b2-k.X
+run_gen = basic-0.O basic-0.E basic-a.O basic-a.E basic-b.O basic-b.E \
+basic-c.O basic-c.E basic-d.O basic-d.E basic-e.O basic-e.E basic-f.O \
+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)
 noinst_SCRIPTS = $x-tests
@@ -125,7 +123,7 @@ default: all
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/tac/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -232,21 +230,22 @@ $(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	mv $@.n $@
 	chmod 755 $@
 
+mk-script: ../../config.status
+
 .pl:
 	rm -f $@ $@.tmp
 	$(editpl) $< > $@.tmp
 	chmod +x-w $@.tmp
 	mv $@.tmp $@
 
-@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 $@
 
 # 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 817ef273d..dd45dd398 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -129,7 +129,7 @@ default: all
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/tail/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index 2c041a0c0..896a16de6 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -131,7 +131,7 @@ default: all
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/tr-test/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status