summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-02-12 07:09:55 +0100
committerPatrick McHardy <kaber@trash.net>2009-02-12 07:09:55 +0100
commit6f3c30059d9cf73c438db08998c58cd1b502eb44 (patch)
treed81ab345883d439f4519031728f59e79b0178d59 /Makefile.am
parent8b7baebc93989106fd5d26b262d0ce191f8ef7c0 (diff)
parent47a6fd9ec9891a8040eb8fd6db3c5012c1056061 (diff)
Merge branch 'master' of git://dev.medozas.de/iptables
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 96de1b2e..dbdfa97a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,11 +15,12 @@ libiptc_libiptc_a_SOURCES = libiptc/libip4tc.c libiptc/libip6tc.c
lib_LTLIBRARIES = libxtables.la
libxtables_la_SOURCES = xtables.c
libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage}
+libxtables_la_LIBADD = -ldl
# iptables, dynamic
iptables_SOURCES = iptables-standalone.c iptables.c
iptables_LDFLAGS = -rdynamic
-iptables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext4.a libxtables.la
+iptables_LDADD = -lm libiptc/libiptc.a extensions/libext4.a libxtables.la
iptables_xml_LDADD = -ldl libxtables.la
iptables_multi_SOURCES = iptables-multi.c iptables-save.c \
@@ -47,7 +48,7 @@ iptables_xml_SOURCES = iptables-xml.c
# ip6tables, dynamic
ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c
ip6tables_LDFLAGS = -rdynamic
-ip6tables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext6.a libxtables.la
+ip6tables_LDADD = -lm libiptc/libiptc.a extensions/libext6.a libxtables.la
ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \
ip6tables-restore.c ip6tables-standalone.c \
@@ -105,7 +106,7 @@ tarball:
tar -C /tmp -cjf ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.bz2 --owner=root --group=root ${PACKAGE_TARNAME}-${PACKAGE_VERSION}/;
rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION};
-config.status: include/xtables.h.in
+config.status: include/xtables.h.in include/iptables/internal.h.in
# ldconfig may fail when we are not root (as is the case in build systems)
# so add appropriate protection that it does not let `make` fail.