diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2011-06-07 14:02:37 +0200 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2011-06-07 14:02:37 +0200 |
commit | 033e25a3ad215ee3f5a07f0a3315f74c4abfaced (patch) | |
tree | 09dd915a800c5276663d3688768e9cb960538515 | |
parent | 5c8f5b60aa8e24da0bd25824f0f85bf7a4a39ea7 (diff) | |
download | platform_external_iptables-033e25a3ad215ee3f5a07f0a3315f74c4abfaced.tar.gz platform_external_iptables-033e25a3ad215ee3f5a07f0a3315f74c4abfaced.tar.bz2 platform_external_iptables-033e25a3ad215ee3f5a07f0a3315f74c4abfaced.zip |
src: move all iptables pieces into a separate directory
(Unclutter top-level dir)
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
-rw-r--r-- | .gitignore | 14 | ||||
-rw-r--r-- | Makefile.am | 67 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | iptables/.gitignore | 14 | ||||
-rw-r--r-- | iptables/Makefile.am | 67 | ||||
-rw-r--r-- | iptables/ip6tables-multi.h (renamed from ip6tables-multi.h) | 0 | ||||
-rw-r--r-- | iptables/ip6tables-restore.8 (renamed from ip6tables-restore.8) | 0 | ||||
-rw-r--r-- | iptables/ip6tables-restore.c (renamed from ip6tables-restore.c) | 0 | ||||
-rw-r--r-- | iptables/ip6tables-save.8 (renamed from ip6tables-save.8) | 0 | ||||
-rw-r--r-- | iptables/ip6tables-save.c (renamed from ip6tables-save.c) | 0 | ||||
-rw-r--r-- | iptables/ip6tables-standalone.c (renamed from ip6tables-standalone.c) | 0 | ||||
-rw-r--r-- | iptables/ip6tables.8.in (renamed from ip6tables.8.in) | 0 | ||||
-rw-r--r-- | iptables/ip6tables.c (renamed from ip6tables.c) | 0 | ||||
-rwxr-xr-x | iptables/iptables-apply (renamed from iptables-apply) | 0 | ||||
-rw-r--r-- | iptables/iptables-apply.8 (renamed from iptables-apply.8) | 0 | ||||
-rw-r--r-- | iptables/iptables-multi.h (renamed from iptables-multi.h) | 0 | ||||
-rw-r--r-- | iptables/iptables-restore.8 (renamed from iptables-restore.8) | 0 | ||||
-rw-r--r-- | iptables/iptables-restore.c (renamed from iptables-restore.c) | 0 | ||||
-rw-r--r-- | iptables/iptables-save.8 (renamed from iptables-save.8) | 0 | ||||
-rw-r--r-- | iptables/iptables-save.c (renamed from iptables-save.c) | 0 | ||||
-rw-r--r-- | iptables/iptables-standalone.c (renamed from iptables-standalone.c) | 0 | ||||
-rw-r--r-- | iptables/iptables-xml.1 (renamed from iptables-xml.1) | 0 | ||||
-rw-r--r-- | iptables/iptables-xml.c (renamed from iptables-xml.c) | 0 | ||||
-rw-r--r-- | iptables/iptables.8.in (renamed from iptables.8.in) | 0 | ||||
-rw-r--r-- | iptables/iptables.c (renamed from iptables.c) | 0 | ||||
-rw-r--r-- | iptables/iptables.xslt (renamed from iptables.xslt) | 0 | ||||
-rw-r--r-- | iptables/xshared.c (renamed from xshared.c) | 0 | ||||
-rw-r--r-- | iptables/xshared.h (renamed from xshared.h) | 0 | ||||
-rw-r--r-- | iptables/xtables-multi.c (renamed from xtables-multi.c) | 0 | ||||
-rw-r--r-- | iptables/xtables-multi.h (renamed from xtables-multi.h) | 0 | ||||
-rw-r--r-- | iptables/xtables.c (renamed from xtables.c) | 0 | ||||
-rw-r--r-- | iptables/xtables.pc.in (renamed from xtables.pc.in) | 0 | ||||
-rw-r--r-- | iptables/xtoptions.c (renamed from xtoptions.c) | 0 |
33 files changed, 84 insertions, 81 deletions
@@ -36,17 +36,3 @@ Makefile.in /ltmain.sh /missing /stamp-h1 -/xtables.pc - -/ip6tables -/ip6tables.8 -/ip6tables-save -/ip6tables-restore -/ip6tables-static -/iptables -/iptables.8 -/iptables-save -/iptables-restore -/iptables-static -/iptables-xml -/xtables-multi diff --git a/Makefile.am b/Makefile.am index 02b5c096..34b35012 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,9 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CFLAGS = ${regular_CFLAGS} -AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} -SUBDIRS = extensions libiptc +SUBDIRS = extensions libiptc iptables if ENABLE_DEVEL SUBDIRS += include endif @@ -16,61 +14,6 @@ if HAVE_LIBNFNETLINK SUBDIRS += utils endif -lib_LTLIBRARIES = libxtables.la -libxtables_la_SOURCES = xtables.c xtoptions.c -libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage} -if ENABLE_SHARED -libxtables_la_CFLAGS = ${AM_CFLAGS} -libxtables_la_LIBADD = -ldl -else -libxtables_la_CFLAGS = ${AM_CFLAGS} -DNO_SHARED_LIBS=1 -libxtables_la_LIBADD = -endif - -xtables_multi_SOURCES = xtables-multi.c iptables-xml.c -xtables_multi_CFLAGS = ${AM_CFLAGS} -DIPTABLES_MULTI -xtables_multi_LDFLAGS = -rdynamic -xtables_multi_LDADD = extensions/libext.a -if ENABLE_STATIC -xtables_multi_CFLAGS += -DALL_INCLUSIVE -endif -if ENABLE_IPV4 -xtables_multi_SOURCES += iptables-save.c iptables-restore.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 -xtables_multi_SOURCES += xshared.c -xtables_multi_LDADD += libxtables.la -lm - -sbin_PROGRAMS = xtables-multi -man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \ - iptables-xml.1 ip6tables.8 ip6tables-restore.8 \ - ip6tables-save.8 -CLEANFILES = iptables.8 ip6tables.8 - -vx_bin_links = iptables-xml -if ENABLE_IPV4 -v4_sbin_links = iptables iptables-restore iptables-save -endif -if ENABLE_IPV6 -v6_sbin_links = ip6tables ip6tables-restore ip6tables-save -endif - -iptables.8: ${srcdir}/iptables.8.in extensions/matches4.man extensions/targets4.man - ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches4.man' -e '/@TARGET@/ r extensions/targets4.man' $< >$@; - -ip6tables.8: ${srcdir}/ip6tables.8.in extensions/matches6.man extensions/targets6.man - ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches6.man' -e '/@TARGET@/ r extensions/targets6.man' $< >$@; - -pkgconfig_DATA = xtables.pc - .PHONY: tarball tarball: rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION}; @@ -81,11 +24,3 @@ tarball: config.status: extensions/GNUmakefile.in \ include/xtables.h.in include/iptables/internal.h.in - -# Using if..fi avoids an ugly "error (ignored)" message :) -install-exec-hook: - -if test -z "${DESTDIR}"; then /sbin/ldconfig; fi; - ${INSTALL} -dm0755 "${DESTDIR}${bindir}"; - for i in ${vx_bin_links}; do ${LN_S} -f "${sbindir}/xtables-multi" "${DESTDIR}${bindir}/$$i"; done; - for i in ${v4_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done; - for i in ${v6_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done; diff --git a/configure.ac b/configure.ac index f3de3d38..4fba1674 100644 --- a/configure.ac +++ b/configure.ac @@ -111,6 +111,7 @@ libxtables_vmajor=$(($libxtables_vcurrent - $libxtables_vage)); AC_SUBST([libxtables_vmajor]) AC_CONFIG_FILES([Makefile extensions/GNUmakefile include/Makefile + iptables/Makefile iptables/xtables.pc libipq/Makefile libiptc/Makefile libiptc/libiptc.pc utils/Makefile - include/xtables.h include/iptables/internal.h xtables.pc]) + include/xtables.h include/iptables/internal.h]) AC_OUTPUT diff --git a/iptables/.gitignore b/iptables/.gitignore new file mode 100644 index 00000000..5a089376 --- /dev/null +++ b/iptables/.gitignore @@ -0,0 +1,14 @@ +/ip6tables +/ip6tables.8 +/ip6tables-save +/ip6tables-restore +/ip6tables-static +/iptables +/iptables.8 +/iptables-save +/iptables-restore +/iptables-static +/iptables-xml +/xtables-multi + +/xtables.pc diff --git a/iptables/Makefile.am b/iptables/Makefile.am new file mode 100644 index 00000000..13cca9c6 --- /dev/null +++ b/iptables/Makefile.am @@ -0,0 +1,67 @@ +# -*- Makefile -*- + +AM_CFLAGS = ${regular_CFLAGS} +AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} + +lib_LTLIBRARIES = libxtables.la +libxtables_la_SOURCES = xtables.c xtoptions.c +libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage} +if ENABLE_SHARED +libxtables_la_CFLAGS = ${AM_CFLAGS} +libxtables_la_LIBADD = -ldl +else +libxtables_la_CFLAGS = ${AM_CFLAGS} -DNO_SHARED_LIBS=1 +libxtables_la_LIBADD = +endif + +xtables_multi_SOURCES = xtables-multi.c iptables-xml.c +xtables_multi_CFLAGS = ${AM_CFLAGS} -DIPTABLES_MULTI +xtables_multi_LDFLAGS = -rdynamic +xtables_multi_LDADD = ../extensions/libext.a +if ENABLE_STATIC +xtables_multi_CFLAGS += -DALL_INCLUSIVE +endif +if ENABLE_IPV4 +xtables_multi_SOURCES += iptables-save.c iptables-restore.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 +xtables_multi_SOURCES += xshared.c +xtables_multi_LDADD += libxtables.la -lm + +sbin_PROGRAMS = xtables-multi +man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \ + iptables-xml.1 ip6tables.8 ip6tables-restore.8 \ + ip6tables-save.8 +CLEANFILES = iptables.8 ip6tables.8 + +vx_bin_links = iptables-xml +if ENABLE_IPV4 +v4_sbin_links = iptables iptables-restore iptables-save +endif +if ENABLE_IPV6 +v6_sbin_links = ip6tables ip6tables-restore ip6tables-save +endif + +iptables.8: ${srcdir}/iptables.8.in ../extensions/matches4.man ../extensions/targets4.man + ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches4.man' -e '/@TARGET@/ r extensions/targets4.man' $< >$@; + +ip6tables.8: ${srcdir}/ip6tables.8.in ../extensions/matches6.man ../extensions/targets6.man + ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches6.man' -e '/@TARGET@/ r extensions/targets6.man' $< >$@; + +pkgconfig_DATA = xtables.pc + +# Using if..fi avoids an ugly "error (ignored)" message :) +install-exec-hook: + -if test -z "${DESTDIR}"; then /sbin/ldconfig; fi; + ${INSTALL} -dm0755 "${DESTDIR}${bindir}"; + for i in ${vx_bin_links}; do ${LN_S} -f "${sbindir}/xtables-multi" "${DESTDIR}${bindir}/$$i"; done; + for i in ${v4_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done; + for i in ${v6_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done; diff --git a/ip6tables-multi.h b/iptables/ip6tables-multi.h index 551029ad..551029ad 100644 --- a/ip6tables-multi.h +++ b/iptables/ip6tables-multi.h diff --git a/ip6tables-restore.8 b/iptables/ip6tables-restore.8 index 02648070..02648070 100644 --- a/ip6tables-restore.8 +++ b/iptables/ip6tables-restore.8 diff --git a/ip6tables-restore.c b/iptables/ip6tables-restore.c index 420bc523..420bc523 100644 --- a/ip6tables-restore.c +++ b/iptables/ip6tables-restore.c diff --git a/ip6tables-save.8 b/iptables/ip6tables-save.8 index 457be821..457be821 100644 --- a/ip6tables-save.8 +++ b/iptables/ip6tables-save.8 diff --git a/ip6tables-save.c b/iptables/ip6tables-save.c index 39a33256..39a33256 100644 --- a/ip6tables-save.c +++ b/iptables/ip6tables-save.c diff --git a/ip6tables-standalone.c b/iptables/ip6tables-standalone.c index 9d8d5a0f..9d8d5a0f 100644 --- a/ip6tables-standalone.c +++ b/iptables/ip6tables-standalone.c diff --git a/ip6tables.8.in b/iptables/ip6tables.8.in index 48ba18e1..48ba18e1 100644 --- a/ip6tables.8.in +++ b/iptables/ip6tables.8.in diff --git a/ip6tables.c b/iptables/ip6tables.c index 4df73b8d..4df73b8d 100644 --- a/ip6tables.c +++ b/iptables/ip6tables.c diff --git a/iptables-apply b/iptables/iptables-apply index 5fec76b0..5fec76b0 100755 --- a/iptables-apply +++ b/iptables/iptables-apply diff --git a/iptables-apply.8 b/iptables/iptables-apply.8 index 8208fd0f..8208fd0f 100644 --- a/iptables-apply.8 +++ b/iptables/iptables-apply.8 diff --git a/iptables-multi.h b/iptables/iptables-multi.h index a2bb8784..a2bb8784 100644 --- a/iptables-multi.h +++ b/iptables/iptables-multi.h diff --git a/iptables-restore.8 b/iptables/iptables-restore.8 index a52bcebe..a52bcebe 100644 --- a/iptables-restore.8 +++ b/iptables/iptables-restore.8 diff --git a/iptables-restore.c b/iptables/iptables-restore.c index 26245997..26245997 100644 --- a/iptables-restore.c +++ b/iptables/iptables-restore.c diff --git a/iptables-save.8 b/iptables/iptables-save.8 index c2e0a949..c2e0a949 100644 --- a/iptables-save.8 +++ b/iptables/iptables-save.8 diff --git a/iptables-save.c b/iptables/iptables-save.c index 7542bdc0..7542bdc0 100644 --- a/iptables-save.c +++ b/iptables/iptables-save.c diff --git a/iptables-standalone.c b/iptables/iptables-standalone.c index 87f1d31a..87f1d31a 100644 --- a/iptables-standalone.c +++ b/iptables/iptables-standalone.c diff --git a/iptables-xml.1 b/iptables/iptables-xml.1 index 048c2cb8..048c2cb8 100644 --- a/iptables-xml.1 +++ b/iptables/iptables-xml.1 diff --git a/iptables-xml.c b/iptables/iptables-xml.c index 5aa638c0..5aa638c0 100644 --- a/iptables-xml.c +++ b/iptables/iptables-xml.c diff --git a/iptables.8.in b/iptables/iptables.8.in index d09bf7aa..d09bf7aa 100644 --- a/iptables.8.in +++ b/iptables/iptables.8.in diff --git a/iptables.c b/iptables/iptables.c index d9c6436c..d9c6436c 100644 --- a/iptables.c +++ b/iptables/iptables.c diff --git a/iptables.xslt b/iptables/iptables.xslt index d6a432cf..d6a432cf 100644 --- a/iptables.xslt +++ b/iptables/iptables.xslt diff --git a/xshared.c b/iptables/xshared.c index 4651888a..4651888a 100644 --- a/xshared.c +++ b/iptables/xshared.c diff --git a/xshared.h b/iptables/xshared.h index d868c06f..d868c06f 100644 --- a/xshared.h +++ b/iptables/xshared.h diff --git a/xtables-multi.c b/iptables/xtables-multi.c index 8014d5fb..8014d5fb 100644 --- a/xtables-multi.c +++ b/iptables/xtables-multi.c diff --git a/xtables-multi.h b/iptables/xtables-multi.h index 615724b1..615724b1 100644 --- a/xtables-multi.h +++ b/iptables/xtables-multi.h diff --git a/xtables.c b/iptables/xtables.c index acfcf8bd..acfcf8bd 100644 --- a/xtables.c +++ b/iptables/xtables.c diff --git a/xtables.pc.in b/iptables/xtables.pc.in index 43f35d54..43f35d54 100644 --- a/xtables.pc.in +++ b/iptables/xtables.pc.in diff --git a/xtoptions.c b/iptables/xtoptions.c index ac0601f2..ac0601f2 100644 --- a/xtoptions.c +++ b/iptables/xtoptions.c |