build: move remaining preprocessor flags into CPPFLAGS

The flags retrieved from `pkg-config --cflags ...` are generally only
preprocessor flags (mostly -I to point to the directories), since
anything else would inconvenience downstream users.

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

diff --git a/filter/Makefile.am b/filter/Makefile.am
index 5af069615bec7e0b101680360b2d4db234554912..875850b8ae90d99ff9ab0cd0fd62ee5f6844078e 100644 (file)
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = raw2packet packet2flow
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = ${regular_CFLAGS} ${LIBNFNETLINK_CFLAGS}
+AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNFNETLINK_CFLAGS}
+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/output/Makefile.am b/output/Makefile.am
index 61d827a18e2dd5afd5282220612a99b801f46096..fe0a19c3176078c67def81b62ccff75d873d5ccf 100644 (file)
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -1,6 +1,6 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_ACCT_CFLAGS}
-AM_CFLAGS = ${regular_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} \
-           ${LIBNETFILTER_CONNTRACK_CFLAGS}
+AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_ACCT_CFLAGS} \
+              ${LIBNETFILTER_CONNTRACK_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS}
+AM_CFLAGS = ${regular_CFLAGS}
 
 SUBDIRS= pcap mysql pgsql sqlite3 dbi
 

diff --git a/output/sqlite3/Makefile.am b/output/sqlite3/Makefile.am
index dd148ec4e5dd9d0c39f037f5ea2920d3e9ffca2f..62af267c4108882448af6c31577a0ef87aafd484 100644 (file)
--- a/output/sqlite3/Makefile.am
+++ b/output/sqlite3/Makefile.am
@@ -1,5 +1,5 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = ${regular_CFLAGS} ${libsqlite3_CFLAGS}
+AM_CPPFLAGS = -I$(top_srcdir)/include ${libsqlite3_CFLAGS}
+AM_CFLAGS = ${regular_CFLAGS}
 
 if HAVE_SQLITE3