summaryrefslogtreecommitdiffstats
path: root/output
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@inai.de>2012-11-27 13:45:44 +0100
committerJan Engelhardt <jengelh@inai.de>2012-11-27 13:45:44 +0100
commit2fe41885926f9f0d9364d3437f15e3f2a3d23aeb (patch)
tree6b23c199ecb636b716efedac54fdadfb72303ed9 /output
parent96d19632dacf3bacb3874a6681f442fcc33086e7 (diff)
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>
Diffstat (limited to 'output')
-rw-r--r--output/Makefile.am6
-rw-r--r--output/sqlite3/Makefile.am4
2 files changed, 5 insertions, 5 deletions
diff --git a/output/Makefile.am b/output/Makefile.am
index 61d827a..fe0a19c 100644
--- 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 dd148ec..62af267 100644
--- 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