Skip to contentSkip to conversation

Move common parts of libext{4,6}.a into libext.a

PATCH New Maciej Żenczykowski 1 participant 1 message Apr 14, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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
index e5d3099..9b59e6a 100644
@@ -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
index fbed41f..6affcac 100644
@@ -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
index b4915c4..7bf2994 100644
@@ -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
index 5531d6e..420bc52 100644
@@ -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
index d9ecc62..39a3325 100644
@@ -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
index 7d34684..9d8d5a0 100644
@@ -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
index e4f0604..2624599 100644
@@ -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
index dee1752..7542bdc 100644
@@ -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
index b085946..87f1d31 100644
@@ -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