Move common parts of libext{4,6}.a into libext.a
PATCH 1/1 Move common parts of libext{4,6}.a into libext.a
From: Maciej Żenczykowski <[email protected]>
--- .gitignore | 1 + Makefile.am | 8 +++++- extensions/GNUmakefile.in | 53 ++++++++++++++++++++++++++++++++++----------- include/xtables.h.in | 1 + ip6tables-restore.c | 1 + ip6tables-save.c | 1 + ip6tables-standalone.c | 1 + iptables-restore.c | 1 + iptables-save.c | 1 + iptables-standalone.c | 1 + 10 files changed, 54 insertions(+), 15 deletions(-)
.gitignore +1 -0
@@ -13,6 +13,7 @@ Makefile Makefile.in /extensions/GNUmakefile +/extensions/initext.c /extensions/initext?.c /extensions/matches?.man /extensions/targets?.man
Makefile.am +6 -2
@@ -45,7 +45,9 @@ if ENABLE_STATIC iptables_multi_CFLAGS += -DALL_INCLUSIVE endif iptables_multi_LDFLAGS = -rdynamic -iptables_multi_LDADD = libiptc/libip4tc.la extensions/libext4.a libxtables.la -lm +iptables_multi_LDADD = libiptc/libip4tc.la \ + extensions/libext.a extensions/libext4.a \ + libxtables.la -lm ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \ ip6tables-restore.c ip6tables-standalone.c \
@@ -55,7 +57,9 @@ if ENABLE_STATIC ip6tables_multi_CFLAGS += -DALL_INCLUSIVE endif ip6tables_multi_LDFLAGS = -rdynamic -ip6tables_multi_LDADD = libiptc/libip6tc.la extensions/libext6.a libxtables.la -lm +ip6tables_multi_LDADD = libiptc/libip6tc.la \ + extensions/libext.a extensions/libext6.a \ + libxtables.la -lm sbin_PROGRAMS = man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \
extensions/GNUmakefile.in +40 -13
108 lines not on this page · raw message
include/xtables.h.in +1 -0
@@ -387,6 +387,7 @@ extern void xtables_save_string(const char *value); # undef _init # define _init _INIT # endif + extern void init_extensions(void); extern void init_extensions4(void); extern void init_extensions6(void); #else
ip6tables-restore.c +1 -0
@@ -137,6 +137,7 @@ int main(int argc, char *argv[])exit (1 ); }#if defined(ALL_INCLUSIVE ) || defined(NO_SHARED_LIBS ) +init_extensions ();init_extensions6 ();#endif
ip6tables-save.c +1 -0
@@ -149,6 +149,7 @@ int main(int argc, char *argv[])exit (1 ); }#if defined(ALL_INCLUSIVE ) || defined(NO_SHARED_LIBS ) +init_extensions ();init_extensions6 ();#endif
ip6tables-standalone.c +1 -0
@@ -59,6 +59,7 @@ main(int argc, char *argv[]) }#if defined(ALL_INCLUSIVE ) || defined(NO_SHARED_LIBS ) +init_extensions ();init_extensions6 ();#endif
iptables-restore.c +1 -0
@@ -140,6 +140,7 @@ main(int argc, char *argv[])exit (1 ); }#if defined(ALL_INCLUSIVE ) || defined(NO_SHARED_LIBS ) +init_extensions ();init_extensions4 ();#endif
iptables-save.c +1 -0
@@ -149,6 +149,7 @@ main(int argc, char *argv[])exit (1 ); }#if defined(ALL_INCLUSIVE ) || defined(NO_SHARED_LIBS ) +init_extensions ();init_extensions4 ();#endif
iptables-standalone.c +1 -0
@@ -59,6 +59,7 @@ main(int argc, char *argv[])exit (1 ); }#if defined(ALL_INCLUSIVE ) || defined(NO_SHARED_LIBS ) +init_extensions ();init_extensions4 ();#endif
Signature · 6 lines
1.7.3.1 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html