Patchwork iptables: extensions/GNUMakefile.in use CPPFLAGS

login
register
mail settings
Submitter Laurence J. Lane
Date Aug. 19, 2013, 4:02 p.m.
Message ID <1376928139-10273-1-git-send-email-ljlane@debian.org>
Download mbox | patch
Permalink /patch/268258/
State Superseded
Headers show

Comments

Laurence J. Lane - Aug. 19, 2013, 4:02 p.m.
From: "Laurence J. Lane" <ljlane@debian.org>

"All other Makefiles add CPPFLAGS to ${COMPILE} (automake), but GNUmakefile.in
 doesn't set it."

http://bugs.debian.org/665286

Signed-off-by: Laurence J. Lane <ljlane@debian.org>
---
 extensions/GNUmakefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Jan Engelhardt - Aug. 19, 2013, 11:50 p.m.
On Monday 2013-08-19 18:02, Laurence J. Lane wrote:

>From: "Laurence J. Lane" <ljlane@debian.org>
>
>"All other Makefiles add CPPFLAGS to ${COMPILE} (automake), but GNUmakefile.in
> doesn't set it."

CPPFLAGS must come last because it's the uservariable that is supposed 
to override everything else.

>-AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
>+AM_CPPFLAGS     = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 14e7c57..be89a17 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -21,7 +21,7 @@  regular_CPPFLAGS   = @regular_CPPFLAGS@
 kinclude_CPPFLAGS  = @kinclude_CPPFLAGS@
 
 AM_CFLAGS       = ${regular_CFLAGS}
-AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
+AM_CPPFLAGS     = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
 AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
 AM_LDFLAGS      = @noundef_LDFLAGS@