All of lore.kernel.org
 help / color / mirror / Atom feed
* build: fix iptables-static build
@ 2008-08-15  1:21 Jan Engelhardt
  2008-08-15 12:16 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Engelhardt @ 2008-08-15  1:21 UTC (permalink / raw)
  To: kaber; +Cc: pablo, Netfilter Developer Mailing List

commit 1c9158d35e415d6983b3e9b0c67345d566940425
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Thu Aug 14 20:59:49 2008 -0400

build: fix iptables-static build

Commit 126c1361ad5201973e6ebc761b3e38a67915de29 unfortunately broke
building iptables-static due to listing iptables.c twice. Fix this.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0355e2e..066dc56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ iptables_save_LDFLAGS     = ${iptables_LDFLAGS}
 iptables_save_LDADD       = ${iptables_LDADD}
 
 # iptables-multi, semi-static
-iptables_static_SOURCES   = ${iptables_multi_SOURCES} iptables.c xtables.c
+iptables_static_SOURCES   = ${iptables_multi_SOURCES} xtables.c
 iptables_static_CFLAGS    = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1
 iptables_static_LDADD     = -lm libiptc/libiptc.a extensions/libext4.a
 
@@ -63,7 +63,7 @@ ip6tables_save_LDFLAGS    = ${ip6tables_LDFLAGS}
 ip6tables_save_LDADD      = ${ip6tables_LDADD}
 
 # iptables-multi, semi-static
-ip6tables_static_SOURCES    = ${ip6tables_multi_SOURCES} ip6tables.c xtables.c
+ip6tables_static_SOURCES    = ${ip6tables_multi_SOURCES} xtables.c
 ip6tables_static_CFLAGS     = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1
 ip6tables_static_LDADD      = -lm libiptc/libiptc.a extensions/libext6.a
 


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-08-15 13:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-15  1:21 build: fix iptables-static build Jan Engelhardt
2008-08-15 12:16 ` Pablo Neira Ayuso

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.