Patchwork [2/2] build: move remaining preprocessor flags into CPPFLAGS

login
register
mail settings
Submitter Jan Engelhardt
Date Nov. 27, 2012, 12:49 p.m.
Message ID <1354020546-4799-2-git-send-email-jengelh@inai.de>
Download mbox | patch
Permalink /patch/202205/
State Not Applicable
Headers show

Comments

Jan Engelhardt - Nov. 27, 2012, 12:49 p.m.
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>
---
 filter/Makefile.am         |    4 ++--
 output/Makefile.am         |    6 +++---
 output/sqlite3/Makefile.am |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
Eric Leblond - Nov. 27, 2012, 1:09 p.m.
Hi,

On Tue, 2012-11-27 at 13:49 +0100, Jan Engelhardt wrote:
> 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.
> 
...
> -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
 
All four patches have been applied. Thanks a lot Jan.

BR,

Patch

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