.

2 files changed, 24 insertions, 22 deletions

diff --git a/tests/date/Makefile.am b/tests/date/Makefile.am
index d1632a1f4..c042e3846 100644
--- a/tests/date/Makefile.am
+++ b/tests/date/Makefile.am
@@ -7,7 +7,8 @@ maint_gen = 1.X 2.X 3.X 4.X 5.X 6.X 7.X 8.X 9.X leap-1.X U95-1.X U95-2.X \
 U95-3.X U92-1.X U92-2.X U92-3.X V92-1.X V92-2.X V92-3.X W92-1.X W92-2.X \
 W92-3.X millen-1.X rel-0.X rel-1a.X rel-1b.X rel-2a.X rel-2b.X rel-2c.X \
 rel-2d.X rel-2e.X rel-2f.X rel-2g.X rel-3a.X next-s.X next-m.X next-h.X \
-next-d.X next-w.X next-mo.X next-y.X
+next-d.X next-w.X next-mo.X next-y.X utc-0.X utc-1.X date2sec-0.X \
+sec2date-0.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 8.O 8.E 9.O \
 9.E leap-1.O leap-1.E U95-1.O U95-1.E U95-2.O U95-2.E U95-3.O U95-3.E U92-1.O \
 U92-1.E U92-2.O U92-2.E U92-3.O U92-3.E V92-1.O V92-1.E V92-2.O V92-2.E \
@@ -16,7 +17,8 @@ millen-1.E rel-0.O rel-0.E rel-1a.O rel-1a.E rel-1b.O rel-1b.E rel-2a.O \
 rel-2a.E rel-2b.O rel-2b.E rel-2c.O rel-2c.E rel-2d.O rel-2d.E rel-2e.O \
 rel-2e.E rel-2f.O rel-2f.E rel-2g.O rel-2g.E rel-3a.O rel-3a.E next-s.O \
 next-s.E next-m.O next-m.E next-h.O next-h.E next-d.O next-d.E next-w.O \
-next-w.E next-mo.O next-mo.E next-y.O next-y.E
+next-w.E next-mo.O next-mo.E next-y.O next-y.E utc-0.O utc-0.E utc-1.O \
+utc-1.E date2sec-0.O date2sec-0.E sec2date-0.O sec2date-0.E
 ##test-files-end
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
@@ -27,7 +29,7 @@ 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 $@
@@ -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/date/Makefile.in b/tests/date/Makefile.in
index 0a724f7d8..549a3d5ff 100644
--- a/tests/date/Makefile.in
+++ b/tests/date/Makefile.in
@@ -96,7 +96,8 @@ maint_gen = 1.X 2.X 3.X 4.X 5.X 6.X 7.X 8.X 9.X leap-1.X U95-1.X U95-2.X \
 U95-3.X U92-1.X U92-2.X U92-3.X V92-1.X V92-2.X V92-3.X W92-1.X W92-2.X \
 W92-3.X millen-1.X rel-0.X rel-1a.X rel-1b.X rel-2a.X rel-2b.X rel-2c.X \
 rel-2d.X rel-2e.X rel-2f.X rel-2g.X rel-3a.X next-s.X next-m.X next-h.X \
-next-d.X next-w.X next-mo.X next-y.X
+next-d.X next-w.X next-mo.X next-y.X utc-0.X utc-1.X date2sec-0.X \
+sec2date-0.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 8.O 8.E 9.O \
 9.E leap-1.O leap-1.E U95-1.O U95-1.E U95-2.O U95-2.E U95-3.O U95-3.E U92-1.O \
 U92-1.E U92-2.O U92-2.E U92-3.O U92-3.E V92-1.O V92-1.E V92-2.O V92-2.E \
@@ -105,7 +106,8 @@ millen-1.E rel-0.O rel-0.E rel-1a.O rel-1a.E rel-1b.O rel-1b.E rel-2a.O \
 rel-2a.E rel-2b.O rel-2b.E rel-2c.O rel-2c.E rel-2d.O rel-2d.E rel-2e.O \
 rel-2e.E rel-2f.O rel-2f.E rel-2g.O rel-2g.E rel-3a.O rel-3a.E next-s.O \
 next-s.E next-m.O next-m.E next-h.O next-h.E next-d.O next-d.E next-w.O \
-next-w.E next-mo.O next-mo.E next-y.O next-y.E
+next-w.E next-mo.O next-mo.E next-y.O next-y.E utc-0.O utc-0.E utc-1.O \
+utc-1.E date2sec-0.O date2sec-0.E sec2date-0.O sec2date-0.E
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
@@ -240,7 +242,7 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-$x-tests: @MAINT@mk-script Test.pm
+$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
 	./mk-script ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
@@ -253,15 +255,14 @@ mk-script: ../../config.status
 	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.