From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 6 Dec 2015 01:46:34 +0000 (+0000)
Subject: Support caller simply setting CFLAGS
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=innduct.git;a=commitdiff_plain;h=cc9e500c9ae3d74c3735168710a5f1a67bd14f81

Support caller simply setting CFLAGS
---

diff --git a/Makefile.am b/Makefile.am
index b1579cd..7badc29 100644
--- 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 ec9eb3d..779c03c 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@
@@ -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 \