From 2fe41885926f9f0d9364d3437f15e3f2a3d23aeb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Nov 2012 13:45:44 +0100 Subject: 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 --- output/Makefile.am | 6 +++--- output/sqlite3/Makefile.am | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'output') 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 -- cgit v1.2.3