X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile.in;h=5b1bba92316b942e28697f0a2ad1cff510f2fb99;hb=a5b1f745e128f541586d90913241a95f8a9e0dd6;hp=6ed6972a3eba1a0d1c19a4a6c16713024b4cac21;hpb=0b6c5209fc86b652fd428616b941e5b8f73b7f32;p=innduct.git

diff --git a/Makefile.in b/Makefile.in
index 6ed6972..5b1bba9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -246,7 +246,7 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ $(WARNINGS) $(WERROR) $(CMDLINE_CFLAGS)
+CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -325,7 +325,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
-INCLUDES = -I/usr/include/inn
+AM_CPPFLAGS = -I/usr/include/inn $(CMDLINE_CPPFLAGS)
 WERROR = -Werror
 CMDLINE_CFLAGS = 
 WARNINGS = \
@@ -336,6 +336,7 @@ WARNINGS = \
 	-Wmissing-format-attribute -Wredundant-decls -Wnested-externs \
 	-Wno-pointer-sign
 
+AM_CFLAGS = $(WARNINGS) $(WERROR) $(CMDLINE_CFLAGS)
 bin_SCRIPTS = innduct-stats-report innduct-forall
 man_MANS = innduct.8 innduct-stats-report.8
 innduct_SOURCES = duct.c conn.c filemon.c infile.c recv.c xmit.c \
@@ -364,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
 
@@ -383,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
@@ -909,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.