build: propagate global CFLAGS

We must not override CFLAGS, because that will break when the user
overrides CFLAGS again at make time (which he is entitled to). So,
name our CFLAGS regular_CFLAGS, and also include that across all
Makefiles so that they are actually uesd for all the code.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/configure.ac b/configure.ac
index 244757413095ddf83c5f5db06b7ad41bd1bae7b1..fec034ef08bad3849d2346779610cd7b494824c9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,8 @@ dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(socket strerror)
 
-CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
+regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter"
+AC_SUBST([regular_CFLAGS])
 
 dnl Check for the right nfnetlink version
 LIBNFNETLINK_REQUIRED=0.0.39

diff --git a/filter/Makefile.am b/filter/Makefile.am
index 9b51670f74496cc4e200bb674e299a2f8a55b611..3c3f152a39c2453452253c0309be70795cde8eae 100644 (file)
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = raw2packet packet2flow
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = ${regular_CFLAGS}
 
 pkglib_LTLIBRARIES = ulogd_filter_IFINDEX.la ulogd_filter_PWSNIFF.la \
                     ulogd_filter_PRINTPKT.la ulogd_filter_PRINTFLOW.la \

diff --git a/filter/raw2packet/Makefile.am b/filter/raw2packet/Makefile.am
index c95966144409255384ee0fbc00d73e66a24a324a..8b5a4ad2231d843ee916cd18251cfdd0c0884944 100644 (file)
--- a/filter/raw2packet/Makefile.am
+++ b/filter/raw2packet/Makefile.am
@@ -1,5 +1,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = ${regular_CFLAGS}
 
 pkglib_LTLIBRARIES = ulogd_raw2packet_BASE.la 
 

diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index 21ab32f86600b86a03ef565dabc3df3ad5efca39..127caf6ba2e1b281609bfae823ce0c82ba04b17a 100644 (file)
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -1,6 +1,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -Wall
+AM_CFLAGS = ${regular_CFLAGS}
 
 pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
 

diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index f8afc033ef1b6c43efcfe967b801a425c644fa81..7fd8979e3c8c753bce1bc2379e370c68e8bc196b 100644 (file)
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -1,6 +1,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -Wall
+AM_CFLAGS = ${regular_CFLAGS}
 LIBS=
 
 pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la ulogd_inppkt_UNIXSOCK.la

diff --git a/libipulog/Makefile.am b/libipulog/Makefile.am
index 7c46bec0bb9fddfcd7398afe5420c02bd1f77741..111cd4889ed6d5207ca13b24aa334ee22a75bc5b 100644 (file)
--- a/libipulog/Makefile.am
+++ b/libipulog/Makefile.am
@@ -1,5 +1,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = ${regular_CFLAGS}
 
 noinst_LTLIBRARIES = libipulog.la
 

diff --git a/output/Makefile.am b/output/Makefile.am
index 2c3505432b1eba5c8e83732bbea0b79c631ced3a..34ffb2d2242f57df77d9115549ad19803cca7d8e 100644 (file)
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = ${regular_CFLAGS}
 LIBS=""
 
 SUBDIRS= pcap mysql pgsql sqlite3 dbi

diff --git a/output/dbi/Makefile.am b/output/dbi/Makefile.am
index 0e68cd3e02763e8f44cae7e58536a4231a26a91f..1ee8f2aed01816cd4654845e82a692f0cc808473 100644 (file)
--- a/output/dbi/Makefile.am
+++ b/output/dbi/Makefile.am
@@ -1,5 +1,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include $(DBI_INC)
+AM_CFLAGS = ${regular_CFLAGS}
 LIBS=$(DBI_LIB)
 
 if HAVE_DBI

diff --git a/output/mysql/Makefile.am b/output/mysql/Makefile.am
index 8da758b57f491d037c5435f60a3e0e9c7bdb6f63..a98cdebdab5e2877d84b831dab381cf8c20f6b66 100644 (file)
--- a/output/mysql/Makefile.am
+++ b/output/mysql/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include $(MYSQL_INC)
+AM_CFLAGS = ${regular_CFLAGS}
 LIBS=$(MYSQL_LIB)
 
 if HAVE_MYSQL

diff --git a/output/pcap/Makefile.am b/output/pcap/Makefile.am
index ac89cfe2160a95640308c714a3204c842278606c..59cb3f62b8f003392ba74865c7166300cd4690be 100644 (file)
--- a/output/pcap/Makefile.am
+++ b/output/pcap/Makefile.am
@@ -1,5 +1,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include $(PCAP_INC)
+AM_CFLAGS = ${regular_CFLAGS}
 LIBS=$(PCAP_LIB)
 
 if HAVE_PCAP

diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am
index 99947bc09344e44af58c0cf6d32d49174637fc83..32be79b19ef4755c5173343dca7e4fda9faf0948 100644 (file)
--- a/output/pgsql/Makefile.am
+++ b/output/pgsql/Makefile.am
@@ -1,5 +1,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(PQINCPATH)
+AM_CFLAGS = ${regular_CFLAGS}
 LIBS=$(PQLIBS)
 
 if HAVE_PGSQL

diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am
index d8bedc972d9085596115e3d6e542fa0edfd15818..d14398c053db36dc49b3c86dad2e7acdcc730af3 100644 (file)
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include $(SQLITE3_INC)
+AM_CFLAGS = ${regular_CFLAGS}
 LIBS=$(SQLITE3_LIB)
 
 if HAVE_SQLITE3

diff --git a/src/Makefile.am b/src/Makefile.am
index d83d13e57dc5a6d84b51c489c9b96b6ed5f5b0e3..9ae78846e080dc77f687b479fe58e44e982d34c9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include \
              -DULOGD_CONFIGFILE="\"$(sysconfdir)/ulogd.conf\"" \
              -DULOGD_LOGFILE_DEFAULT="\"$(localstatedir)/log/ulogd.log\""
+AM_CFLAGS = ${regular_CFLAGS}
 
 sbin_PROGRAMS = ulogd