From 5085c3a037fa9327377dec7540d9c3ef2d53a58e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 1 Jun 2011 02:20:40 +0200 Subject: build: move kinclude's preprocessor flags to kinclude_CPPFLAGS References: http://bugzilla.netfilter.org/show_bug.cgi?id=713 Signed-off-by: Jan Engelhardt --- Makefile.am | 4 ++-- configure.ac | 8 ++++---- extensions/GNUmakefile.in | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 414905c2..ac4a10e6 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 ${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 77502fb6..daed602d 100644 --- 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 9e39977f..eea3c705 100644 --- 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},) -- cgit v1.2.3