* Makefile.am: Don't use suffix rules for perl and shell

scripts. Use explicit rules instead.

diff --git a/ChangeLog b/ChangeLog
index 4e67e02f972af37582ad2b2bf6d4f83869a34d22..f4f24ab9a0b52b27befdc3ddd47a0a1de1bc86bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-12  Pavel Roskin  <proski@gnu.org>
+
+       * Makefile.am: Don't use suffix rules for perl and shell
+       scripts. Use explicit rules instead.
+
 2000-12-12  Pavel Roskin  <proski@gnu.org>
 
        * autoscan.pl (init_tables): Allow spaces on the right hand side

diff --git a/Makefile.am b/Makefile.am
index 1cd9a65308881eb4c6c04661be5139c5daadd118..23f495c6b123dbdac744f9fbe20041e80ec63345 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = check-news 1.4 readme-alpha
 
 SUBDIRS = . m4 man doc tests
 
-SUFFIXES = .m4 .m4f .pl .sh
+SUFFIXES = .m4 .m4f
 ## There is currently no means with Automake not to run aclocal.
 ACLOCAL_AMFLAGS = --version >/dev/null && touch aclocal.m4
 WGET = wget
@@ -107,9 +107,6 @@ install-data-hook: INSTALL.txt
 ## The scripts.  ##
 ## ------------- ##
 
-# Follow the version number changes.
-$(bin_SCRIPTS): configure.in
-
 editsh = sed \
        -e 's,@datadir\@,$(pkgdatadir),g' \
        -e 's,@M4\@,$(M4),g' \
@@ -127,17 +124,41 @@ editpl = sed \
        -e 's,@VERSION\@,$(VERSION),g' \
        -e 's,@PACKAGE\@,$(PACKAGE),g'
 
-.sh:
-       rm -f $@ $@.tmp
-       $(editsh) $< >$@.tmp
-       chmod +x $@.tmp
-       mv $@.tmp $@
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< >$@.tmp
-       chmod +x $@.tmp
-       mv $@.tmp $@
+autoconf: $(srcdir)/autoconf.sh $(srcdir)/configure.in
+       rm -f autoconf autoconf.tmp
+       $(editsh) $(srcdir)/autoconf.sh >autoconf.tmp
+       chmod +x autoconf.tmp
+       mv autoconf.tmp autoconf
+
+autoheader: $(srcdir)/autoheader.sh $(srcdir)/configure.in
+       rm -f autoheader autoheader.tmp
+       $(editsh) $(srcdir)/autoheader.sh >autoheader.tmp
+       chmod +x autoheader.tmp
+       mv autoheader.tmp autoheader
+
+autoreconf: $(srcdir)/autoreconf.sh $(srcdir)/configure.in
+       rm -f autoreconf autoreconf.tmp
+       $(editsh) $(srcdir)/autoreconf.sh >autoreconf.tmp
+       chmod +x autoreconf.tmp
+       mv autoreconf.tmp autoreconf
+
+autoupdate: $(srcdir)/autoupdate.sh $(srcdir)/configure.in
+       rm -f autoupdate autoupdate.tmp
+       $(editsh) $(srcdir)/autoupdate.sh >autoupdate.tmp
+       chmod +x autoupdate.tmp
+       mv autoupdate.tmp autoupdate
+
+ifnames: $(srcdir)/ifnames.sh $(srcdir)/configure.in
+       rm -f ifnames ifnames.tmp
+       $(editsh) $(srcdir)/ifnames.sh >ifnames.tmp
+       chmod +x ifnames.tmp
+       mv ifnames.tmp ifnames
+
+autoscan: $(srcdir)/autoscan.pl $(srcdir)/configure.in
+       rm -f autoscan autoscan.tmp
+       $(editpl) $(srcdir)/autoscan.pl >autoscan.tmp
+       chmod +x autoscan.tmp
+       mv autoscan.tmp autoscan
 
 
 ## ------------------ ##

diff --git a/Makefile.in b/Makefile.in
index 3ff1eba66cdca0e8710c90f7632ee3d0d3e14ec6..44a333e4e1b649cb4c01f74f3409b0087eab77b4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -68,7 +68,7 @@ AUTOMAKE_OPTIONS = check-news 1.4 readme-alpha
 
 SUBDIRS = . m4 man doc tests
 
-SUFFIXES = .m4 .m4f .pl .sh
+SUFFIXES = .m4 .m4f
 ACLOCAL_AMFLAGS = --version >/dev/null && touch aclocal.m4
 WGET = wget
 
@@ -126,7 +126,7 @@ TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .m4 .m4f .pl .sh
+.SUFFIXES: .m4 .m4f
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
@@ -438,20 +438,41 @@ install-data-hook: INSTALL.txt
          $(INSTALL_DATA) $$d$$p.txt $(DESTDIR)$(pkgdatadir)/$$f; \
        done
 
-# Follow the version number changes.
-$(bin_SCRIPTS): configure.in
-
-.sh:
-       rm -f $@ $@.tmp
-       $(editsh) $< >$@.tmp
-       chmod +x $@.tmp
-       mv $@.tmp $@
-
-.pl:
-       rm -f $@ $@.tmp
-       $(editpl) $< >$@.tmp
-       chmod +x $@.tmp
-       mv $@.tmp $@
+autoconf: $(srcdir)/autoconf.sh $(srcdir)/configure.in
+       rm -f autoconf autoconf.tmp
+       $(editsh) $(srcdir)/autoconf.sh >autoconf.tmp
+       chmod +x autoconf.tmp
+       mv autoconf.tmp autoconf
+
+autoheader: $(srcdir)/autoheader.sh $(srcdir)/configure.in
+       rm -f autoheader autoheader.tmp
+       $(editsh) $(srcdir)/autoheader.sh >autoheader.tmp
+       chmod +x autoheader.tmp
+       mv autoheader.tmp autoheader
+
+autoreconf: $(srcdir)/autoreconf.sh $(srcdir)/configure.in
+       rm -f autoreconf autoreconf.tmp
+       $(editsh) $(srcdir)/autoreconf.sh >autoreconf.tmp
+       chmod +x autoreconf.tmp
+       mv autoreconf.tmp autoreconf
+
+autoupdate: $(srcdir)/autoupdate.sh $(srcdir)/configure.in
+       rm -f autoupdate autoupdate.tmp
+       $(editsh) $(srcdir)/autoupdate.sh >autoupdate.tmp
+       chmod +x autoupdate.tmp
+       mv autoupdate.tmp autoupdate
+
+ifnames: $(srcdir)/ifnames.sh $(srcdir)/configure.in
+       rm -f ifnames ifnames.tmp
+       $(editsh) $(srcdir)/ifnames.sh >ifnames.tmp
+       chmod +x ifnames.tmp
+       mv ifnames.tmp ifnames
+
+autoscan: $(srcdir)/autoscan.pl $(srcdir)/configure.in
+       rm -f autoscan autoscan.tmp
+       $(editpl) $(srcdir)/autoscan.pl >autoscan.tmp
+       chmod +x autoscan.tmp
+       mv autoscan.tmp autoscan
 
 # When processing the file with diversion disabled, there must be no
 # output but comments and empty lines.