summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-12-06 01:46:34 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-12-06 01:46:34 +0000
commitcc9e500c9ae3d74c3735168710a5f1a67bd14f81 (patch)
treebdd6c48ac311e18da7d3542d9538b9aa24af4725
parent7f2f7562ac7c2fd27bfe2cf9f9edb87a6ce13c7f (diff)
Support caller simply setting CFLAGS
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in3
2 files changed, 3 insertions, 2 deletions
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 \