Move "autoconf" target stuff into autogen.sh

Also, arranges for autogen.sh to strip the Makefile and config.h
targets from the generated Makefile.

diff --git a/Makefile.am b/Makefile.am
index 7badc290e01b1b17a95078500a3a91e16abb2403..21003dbfbc3b13b09eea286d06ac922a8dfcd071 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,12 +47,7 @@ innduct_SOURCES = duct.c conn.c filemon.c infile.c recv.c xmit.c \
 
 innduct_LDADD = -L/usr/lib/news -lstorage -linn -lm -loop
 
-autoconf:
-       aclocal-1.4
-       autoheader2.50
-       autoconf2.50
-       automake-1.4
-       perl -i.bak -pe '$$_="" if m/^(?:Makefile|config\.h):/..m/^$$/' \
-               Makefile.in
+autogen autoconf:
+       ./autogen.sh
 
 MAINTAINERCLEANFILES = configure config.h.in Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 779c03c4db26ccff630ad5e22aa1199c30f2e20e..5b1bba92316b942e28697f0a2ad1cff510f2fb99 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -365,16 +365,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
        $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           echo ' $(SHELL) ./config.status'; \
-           $(SHELL) ./config.status;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-       esac;
-
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
 
@@ -384,10 +374,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
-config.h: stamp-h1
-       @test -f $@ || rm -f stamp-h1
-       @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
        @rm -f stamp-h1
        cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -910,13 +896,8 @@ uninstall-man: uninstall-man8
        uninstall-binSCRIPTS uninstall-man uninstall-man8
 
 
-autoconf:
-       aclocal-1.4
-       autoheader2.50
-       autoconf2.50
-       automake-1.4
-       perl -i.bak -pe '$$_="" if m/^(?:Makefile|config\.h):/..m/^$$/' \
-               Makefile.in
+autogen autoconf:
+       ./autogen.sh
 
 # 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/autogen.sh b/autogen.sh
index 39441f704da0fc4c8106b053fbc8652328961d2b..4623850e1eabe63b7f73f0133a17346d7aa708cb 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,5 @@
 #!/bin/sh
 set -e
 autoreconf --install
+perl -i.bak -pe '$_="" if m/^(?:Makefile|config\.h):/..m/^$/' \
+       Makefile.in