summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-04-02 22:13:23 -0400
committerJan Engelhardt <jengelh@medozas.de>2011-06-01 02:27:10 +0200
commit6918795519ddbf4d0efa9aa5b1b51cdafb99c55a (patch)
treef4bf61a763d6512f1c59ffdfde455f46d1af71c7
parent5085c3a037fa9327377dec7540d9c3ef2d53a58e (diff)
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>
-rw-r--r--Makefile.am4
-rw-r--r--extensions/GNUmakefile.in4
-rw-r--r--libipq/Makefile.am4
-rw-r--r--utils/Makefile.am4
4 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index ac4a10e6..60ea83b1 100644
--- 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 eea3c705..fbaf2eca 100644
--- 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 8ebeb14c..93e5b1c8 100644
--- 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 87bb1cbc..306d9933 100644
--- 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