Support caller simply setting CFLAGS

diff --git a/Makefile.am b/Makefile.am
index b1579cdd6655a8326363a948aaa2a30d76a26687..7badc290e01b1b17a95078500a3a91e16abb2403 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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

diff --git a/Makefile.in b/Makefile.in
index ec9eb3d58e212277f1765f9f4a4209217368ef4c..779c03c4db26ccff630ad5e22aa1199c30f2e20e 100644 (file)
--- 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@
@@ -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 \