build: move remaining preprocessor flags to CPPFLAGS

References; http://bugzilla.netfilter.org/show_bug.cgi?id=713
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/Makefile.am b/Makefile.am
index ac4a10e65326d93f9f877d545cf71a7d52ba0b14..60ea83b1ea5af416373197c3c884b704ddd9faa3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,8 @@
 ACLOCAL_AMFLAGS  = -I m4
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS        = ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include
-AM_CPPFLAGS      = ${regular_CPPFLAGS} ${kinclude_CPPFLAGS}
+AM_CFLAGS        = ${regular_CFLAGS}
+AM_CPPFLAGS      = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS}
 SUBDIRS          = extensions
 if ENABLE_DEVEL
 SUBDIRS         += include

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index eea3c7057ad4f487f4215e4545be682b84c2ad8e..fbaf2eca798dd36e7d0ee185012e14254d438292 100644 (file)
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -20,8 +20,8 @@ regular_CFLAGS := @regular_CFLAGS@
 regular_CPPFLAGS := @regular_CPPFLAGS@
 kinclude_CPPFLAGS := @kinclude_CPPFLAGS@
 
-AM_CFLAGS      := ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include
-AM_CPPFLAGS     = ${regular_CPPFLAGS} ${kinclude_CPPFLAGS}
+AM_CFLAGS      := ${regular_CFLAGS}
+AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS}
 AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
 
 ifeq (${V},)

diff --git a/libipq/Makefile.am b/libipq/Makefile.am
index 8ebeb14cc60789352216ca4f087f81604a37c643..93e5b1c878ba47ede9ab1e4017d32bcda949082e 100644 (file)
--- a/libipq/Makefile.am
+++ b/libipq/Makefile.am
@@ -1,7 +1,7 @@
 # -*- Makefile -*-
 
-AM_CFLAGS = ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include
-AM_CPPFLAGS = ${regular_CPPFLAGS}
+AM_CFLAGS = ${regular_CFLAGS}
+AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include
 
 libipq_la_SOURCES = libipq.c
 lib_LTLIBRARIES   = libipq.la

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 87bb1cbce91a8d556aebeee4e3e0fb1d9d1c350f..306d993341233e12d0204b8978570d2b7f8be526 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,7 +1,7 @@
 # -*- Makefile -*-
 
-AM_CFLAGS = ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include
-AM_CPPFLAGS = ${regular_CPPFLAGS}
+AM_CFLAGS = ${regular_CFLAGS}
+AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include
 
 sbin_PROGRAMS = nfnl_osf
 pkgdata_DATA = pf.os