diff options
author | Jan Engelhardt <jengelh@inai.de> | 2012-11-27 13:45:44 +0100 |
---|---|---|
committer | Jan Engelhardt <jengelh@inai.de> | 2012-11-27 13:45:44 +0100 |
commit | 2fe41885926f9f0d9364d3437f15e3f2a3d23aeb (patch) | |
tree | 6b23c199ecb636b716efedac54fdadfb72303ed9 | |
parent | 96d19632dacf3bacb3874a6681f442fcc33086e7 (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>
-rw-r--r-- | filter/Makefile.am | 4 | ||||
-rw-r--r-- | output/Makefile.am | 6 | ||||
-rw-r--r-- | output/sqlite3/Makefile.am | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/filter/Makefile.am b/filter/Makefile.am index 5af0696..875850b 100644 --- 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 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 |