combine ip6?tables-multi into xtables-multi

Signed-off-by: Maciej Zenczykowski <maze@google.com>

diff --git a/.gitignore b/.gitignore
index 9b59e6a615947a4eb765c58c183b018961c177d6..9d24ce0d563dc21127b1e3b2e4ab5e1295e0dc2b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,14 +41,13 @@ Makefile.in
 
 /ip6tables
 /ip6tables.8
-/ip6tables-multi
 /ip6tables-save
 /ip6tables-restore
 /ip6tables-static
 /iptables
 /iptables.8
-/iptables-multi
 /iptables-save
 /iptables-restore
 /iptables-static
 /iptables-xml
+/xtables-multi

diff --git a/Makefile.am b/Makefile.am
index 6affcac2b40c7db3a85638c9ec0bda5d10f3fb1a..13e144e40c0becd6358ad93308a767c7386ab1e5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ endif
 lib_LTLIBRARIES =
 
 # libiptc
-lib_LTLIBRARIES           += libiptc/libip4tc.la libiptc/libip6tc.la libiptc/libiptc.la
+lib_LTLIBRARIES            += libiptc/libip4tc.la libiptc/libip6tc.la libiptc/libiptc.la
 libiptc_libiptc_la_SOURCES  =
 libiptc_libiptc_la_LIBADD   = libiptc/libip4tc.la libiptc/libip6tc.la
 libiptc_libiptc_la_LDFLAGS  = -version-info 0:0:0 ${libiptc_LDFLAGS2}
@@ -37,43 +37,39 @@ libxtables_la_CFLAGS  = ${AM_CFLAGS} -DNO_SHARED_LIBS=1
 libxtables_la_LIBADD  =
 endif
 
-iptables_multi_SOURCES    = iptables-multi.c iptables-save.c \
-                            iptables-restore.c iptables-xml.c \
-                            iptables-standalone.c iptables.c xshared.c
-iptables_multi_CFLAGS     = ${AM_CFLAGS} -DIPTABLES_MULTI
+xtables_multi_SOURCES  = xtables-multi.c
+xtables_multi_CFLAGS   = ${AM_CFLAGS} -DIPTABLES_MULTI
+xtables_multi_LDFLAGS  = -rdynamic
+xtables_multi_LDADD    = extensions/libext.a
 if ENABLE_STATIC
-iptables_multi_CFLAGS    += -DALL_INCLUSIVE
+xtables_multi_CFLAGS  += -DALL_INCLUSIVE
 endif
-iptables_multi_LDFLAGS    = -rdynamic
-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 \
-                            ip6tables.c xshared.c
-ip6tables_multi_CFLAGS    = ${AM_CFLAGS} -DIPTABLES_MULTI
-if ENABLE_STATIC
-ip6tables_multi_CFLAGS   += -DALL_INCLUSIVE
+if ENABLE_IPV4
+xtables_multi_SOURCES += iptables-save.c iptables-restore.c iptables-xml.c \
+                         iptables-standalone.c iptables.c
+xtables_multi_CFLAGS  += -DENABLE_IPV4
+xtables_multi_LDADD   += libiptc/libip4tc.la extensions/libext4.a
+endif
+if ENABLE_IPV6
+xtables_multi_SOURCES += ip6tables-save.c ip6tables-restore.c \
+                          ip6tables-standalone.c ip6tables.c
+xtables_multi_CFLAGS  += -DENABLE_IPV6
+xtables_multi_LDADD   += libiptc/libip6tc.la extensions/libext6.a
 endif
-ip6tables_multi_LDFLAGS   = -rdynamic
-ip6tables_multi_LDADD     = libiptc/libip6tc.la \
-                            extensions/libext.a extensions/libext6.a \
-                            libxtables.la -lm
+xtables_multi_SOURCES += xshared.c
+xtables_multi_LDADD   += libxtables.la -lm
 
-sbin_PROGRAMS    =
+sbin_PROGRAMS    = xtables-multi
 man_MANS         = iptables.8 iptables-restore.8 iptables-save.8 \
                    iptables-xml.8 ip6tables.8 ip6tables-restore.8 \
                    ip6tables-save.8
 CLEANFILES       = iptables.8 ip6tables.8
 
 if ENABLE_IPV4
-sbin_PROGRAMS += iptables-multi
 v4_bin_links   = iptables-xml
 v4_sbin_links  = iptables iptables-restore iptables-save
 endif
 if ENABLE_IPV6
-sbin_PROGRAMS += ip6tables-multi
 v6_sbin_links  = ip6tables ip6tables-restore ip6tables-save
 endif
 

diff --git a/ip6tables-multi.c b/ip6tables-multi.c
deleted file mode 100644 (file)
index 40ce37b..0000000
--- a/ip6tables-multi.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "xshared.h"
-#include "ip6tables-multi.h"
-
-static const struct subcommand multi6_subcommands[] = {
-       {"ip6tables",         ip6tables_main},
-       {"main",              ip6tables_main},
-       {"ip6tables-save",    ip6tables_save_main},
-       {"save",              ip6tables_save_main},
-       {"ip6tables-restore", ip6tables_restore_main},
-       {"restore",           ip6tables_restore_main},
-       {NULL},
-};
-
-int main(int argc, char **argv)
-{
-       return subcmd_main(argc, argv, multi6_subcommands);
-}

diff --git a/iptables-multi.c b/iptables-multi.c
deleted file mode 100644 (file)
index 14579e0..0000000
--- a/iptables-multi.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "xshared.h"
-#include "iptables-multi.h"
-
-static const struct subcommand multi4_subcommands[] = {
-       {"iptables",         iptables_main},
-       {"main",             iptables_main},
-       {"iptables-save",    iptables_save_main},
-       {"save",             iptables_save_main},
-       {"iptables-restore", iptables_restore_main},
-       {"restore",          iptables_restore_main},
-       {"iptables-xml",     iptables_xml_main},
-       {"xml",              iptables_xml_main},
-       {NULL},
-};
-
-int main(int argc, char **argv)
-{
-       return subcmd_main(argc, argv, multi4_subcommands);
-}

diff --git a/xtables-multi.c b/xtables-multi.c
new file mode 100644 (file)
index 0000000..f8d56ce
--- /dev/null
+++ b/xtables-multi.c
@@ -0,0 +1,39 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "xshared.h"
+
+#ifdef ENABLE_IPV4
+#include "iptables-multi.h"
+#endif
+
+#ifdef ENABLE_IPV6
+#include "ip6tables-multi.h"
+#endif
+
+static const struct subcommand multi_subcommands[] = {
+#ifdef ENABLE_IPV4
+       {"iptables",            iptables_main},
+       {"main4",               iptables_main},
+       {"iptables-save",       iptables_save_main},
+       {"save4",               iptables_save_main},
+       {"iptables-restore",    iptables_restore_main},
+       {"restore4",            iptables_restore_main},
+       {"iptables-xml",        iptables_xml_main},
+       {"xml4",                iptables_xml_main},
+#endif
+#ifdef ENABLE_IPV6
+       {"ip6tables",           ip6tables_main},
+       {"main6",               ip6tables_main},
+       {"ip6tables-save",      ip6tables_save_main},
+       {"save6",               ip6tables_save_main},
+       {"ip6tables-restore",   ip6tables_restore_main},
+       {"restore6",            ip6tables_restore_main},
+#endif
+       {NULL},
+};
+
+int main(int argc, char **argv)
+{
+       return subcmd_main(argc, argv, multi_subcommands);
+}