X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=innduct.git;a=blobdiff_plain;f=Makefile.am;h=21003dbfbc3b13b09eea286d06ac922a8dfcd071;hp=693c90fbbf79ea8c4ece1df075c8a8b40cc9f3f2;hb=8bf1ce160b83b6036fc4964b992bfef0418c9ee2;hpb=f4263fc2c4f6aa79455f6c8252606b17daf5aa7d

diff --git a/Makefile.am b/Makefile.am
index 693c90f..21003db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@
 
 AUTOMAKE_OPTIONS=foreign
 
-AM_CPPFLAGS = -I/usr/include/inn
+AM_CPPFLAGS = -I/usr/include/inn $(CMDLINE_CPPFLAGS)
 
 WERROR = -Werror
 CMDLINE_CFLAGS =
@@ -37,7 +37,7 @@ WARNINGS= \
 	-Wmissing-format-attribute -Wredundant-decls -Wnested-externs \
 	-Wno-pointer-sign
 
-CFLAGS = @CFLAGS@ $(WARNINGS) $(WERROR) $(CMDLINE_CFLAGS)
+AM_CFLAGS = $(WARNINGS) $(WERROR) $(CMDLINE_CFLAGS)
 
 bin_PROGRAMS = innduct
 bin_SCRIPTS = innduct-stats-report innduct-forall
@@ -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