.

2 files changed, 26 insertions, 44 deletions

diff --git a/tests/factor/Makefile.am b/tests/factor/Makefile.am
index 55a2388cb..2795668bb 100644
--- a/tests/factor/Makefile.am
+++ b/tests/factor/Makefile.am
@@ -1,4 +1,4 @@
-## Process this file with automake to produce Makefile.in.
+## Process this file with automake to produce Makefile.in -*-Makefile-*-.
 
 ##test-files-begin
 x = factor
@@ -11,7 +11,7 @@ m.E n.O n.E o.O o.E p.O p.E q.O q.E s.O 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
 ##test-files-end
 
-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@
@@ -19,29 +19,20 @@ editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
 
 TESTS = $x-tests
 
-$(srcdir)/$x-tests: @MAINT@mk-script Test.pm
-	./mk-script ../../src/$x > $@.n
+mk_script = $(srcdir)/../mk-script
+$(srcdir)/$x-tests: $(mk_script) Test.pm
+	$(PERL) -w -- $(mk_script) ../../src/$x > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
-mk-script: ../../config.status
-
-SUFFIXES = .pl
-
-.pl:
-	rm -f $@ $@.tmp
-	$(editpl) $< > $@.tmp
-	chmod +x-w $@.tmp
-	mv $@.tmp $@
-
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
 
-@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) -w -- $(mk_script) --list >> $@t
+	sed -n '/^##test-files-end/,$$p' $< >> $@t
+	mv $@t $@
diff --git a/tests/factor/Makefile.in b/tests/factor/Makefile.in
index 7c4de3a34..d4c8e60a2 100644
--- a/tests/factor/Makefile.in
+++ b/tests/factor/Makefile.in
@@ -61,6 +61,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 GENCAT = @GENCAT@
+GETHOSTBYNAME_LIB = @GETHOSTBYNAME_LIB@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -105,7 +106,7 @@ d.O d.E e.O e.E f.O f.E g.O g.E h.O h.E i.O i.E j.O j.E k.O k.E l.O l.E m.O \
 m.E n.O n.E o.O o.E p.O p.E q.O q.E s.O 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
 
-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@
@@ -113,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)
@@ -132,7 +133,6 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .pl
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/factor/Makefile
 
@@ -238,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) -w -- $(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.