[patch] iptables out-of-tree build directory

[patch] iptables out-of-tree build directory

[Henrik Nordstrom]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

The attached patch fixes iptables out-of-tree compiles which otherwise
failed in extensions/ complaining about not finding xtables.h


mkdir build
cd build
../iptables/configure
make

Regards
Henrik

[-- Attachment #2: out_of_tree_build.patch --]
[-- Type: text/x-patch, Size: 525 bytes --]

Index: extensions/GNUmakefile.in
===================================================================
--- extensions/GNUmakefile.in	(revision 7519)
+++ extensions/GNUmakefile.in	(working copy)
@@ -16,7 +16,7 @@
 regular_CFLAGS := @regular_CFLAGS@
 kinclude_CFLAGS := @kinclude_CFLAGS@
 
-AM_CFLAGS      := ${regular_CFLAGS} -I${top_srcdir}/include ${kinclude_CFLAGS}
+AM_CFLAGS      := ${regular_CFLAGS} -I${top_srcdir}/include -I../include ${kinclude_CFLAGS}
 AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
 
 ifeq (${V},)

Re: [patch] iptables out-of-tree build directory

[Jan Engelhardt]

On Monday 2008-05-12 01:15, Henrik Nordstrom wrote:

>The attached patch fixes iptables out-of-tree compiles which otherwise
>failed in extensions/ complaining about not finding xtables.h
>
>
>mkdir build
>cd build
>../iptables/configure
>make

Thanks for noticing!
-I../ is rather hackish, though. Following patch is the proper
thing (IMO):

===
commit 333c904234d9320aca2494cf86595b9639b03f3e
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Mon May 12 10:25:15 2008 +0200

    Makefile: fix out-of-topdir compilation
    
    Reported by: Henrik Nordstrom
    
    When xtables.h is not already found in /usr/include, compilation
    would fail when ${top_srcdir} != ${top_builddir}.
---
 extensions/GNUmakefile.in |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 31e6fb7..9c46ab1 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -1,5 +1,7 @@
 # -*- Makefile -*-
 
+top_builddir := @top_builddir@
+builddir     := @builddir@
 top_srcdir  := @top_srcdir@
 srcdir      := @srcdir@
 ksourcedir  := @ksourcedir@
@@ -16,7 +18,7 @@ LDFLAGS        := @LDFLAGS@
 regular_CFLAGS := @regular_CFLAGS@
 kinclude_CFLAGS := @kinclude_CFLAGS@
 
-AM_CFLAGS      := ${regular_CFLAGS} -I${top_srcdir}/include ${kinclude_CFLAGS}
+AM_CFLAGS      := ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CFLAGS}
 AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
 
 ifeq (${V},)

Re: [patch] iptables out-of-tree build directory

[Henrik Nordstrom]

On mån, 2008-05-12 at 10:28 +0200, Jan Engelhardt wrote:

> -I../ is rather hackish, though. Following patch is the proper
> thing (IMO)

Indeed.

Regards
Henrik

--
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

Re: [patch] iptables out-of-tree build directory

[Patrick McHardy]

Jan Engelhardt wrote:
> commit 333c904234d9320aca2494cf86595b9639b03f3e
> Author: Jan Engelhardt <jengelh@medozas.de>
> Date:   Mon May 12 10:25:15 2008 +0200
> 
>     Makefile: fix out-of-topdir compilation
>     
>     Reported by: Henrik Nordstrom
>     
>     When xtables.h is not already found in /usr/include, compilation
>     would fail when ${top_srcdir} != ${top_builddir}.

Applied, thanks.