build: move kinclude's preprocessor flags to kinclude_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 414905c2450e9b7e82df007e9b32c67eb168c189..ac4a10e65326d93f9f877d545cf71a7d52ba0b14 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 ${kinclude_CFLAGS}
-AM_CPPFLAGS      = ${regular_CPPFLAGS}
+AM_CFLAGS        = ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include
+AM_CPPFLAGS      = ${regular_CPPFLAGS} ${kinclude_CPPFLAGS}
 SUBDIRS          = extensions
 if ENABLE_DEVEL
 SUBDIRS         += include

diff --git a/configure.ac b/configure.ac
index 77502fb66ac765c245bca183ee4c4a2ea4036e7d..daed602d0579991919850a5f35a45008b81068b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -88,18 +88,18 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
        -Winline -pipe";
 regular_CPPFLAGS="${largefile_cppflags} -D_REENTRANT \
        -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" -DXTABLES_INTERNAL";
-kinclude_CFLAGS="";
+kinclude_CPPFLAGS="";
 if [[ -n "$kbuilddir" ]]; then
-       kinclude_CFLAGS="$kinclude_CFLAGS -I $kbuilddir/include";
+       kinclude_CPPFLAGS="$kinclude_CPPFLAGS -I$kbuilddir/include";
 fi;
 if [[ -n "$ksourcedir" ]]; then
-       kinclude_CFLAGS="$kinclude_CFLAGS -I $ksourcedir/include";
+       kinclude_CPPFLAGS="$kinclude_CPPFLAGS -I$ksourcedir/include";
 fi;
 pkgdatadir='${datadir}/xtables';
 
 AC_SUBST([regular_CFLAGS])
 AC_SUBST([regular_CPPFLAGS])
-AC_SUBST([kinclude_CFLAGS])
+AC_SUBST([kinclude_CPPFLAGS])
 AC_SUBST([kbuilddir])
 AC_SUBST([ksourcedir])
 AC_SUBST([xtlibdir])

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