diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-07-25 17:19:14 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-07-29 15:20:55 +0200 |
| commit | 06fd5e46d46f7454baa8f9470976002124827e53 (patch) | |
| tree | 6254901762b3422a8e7a2972072672c0b8be26e8 /iptables/Makefile.am | |
| parent | 719940f6f48d98f5b7aebe7562948f2cff6f5cf8 (diff) | |
xtables: Drop support for /etc/xtables.conf
As decided upon at NFWS2019, drop support for configurable nftables base
chains to use with iptables-nft.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/Makefile.am')
| -rw-r--r-- | iptables/Makefile.am | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/iptables/Makefile.am b/iptables/Makefile.am index 3ff85893..6f7f428e 100644 --- a/iptables/Makefile.am +++ b/iptables/Makefile.am @@ -2,7 +2,6 @@ AM_CFLAGS = ${regular_CFLAGS} AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include -I${top_srcdir} ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS} -AM_YFLAGS = -d BUILT_SOURCES = @@ -27,7 +26,6 @@ xtables_legacy_multi_LDADD += ../libxtables/libxtables.la -lm # iptables using nf_tables api if ENABLE_NFTABLES -BUILT_SOURCES += xtables-config-parser.h xtables_nft_multi_SOURCES = xtables-nft-multi.c iptables-xml.c xtables_nft_multi_CFLAGS = ${AM_CFLAGS} xtables_nft_multi_LDADD = ../extensions/libext.a ../extensions/libext_ebt.a @@ -35,7 +33,6 @@ if ENABLE_STATIC xtables_nft_multi_CFLAGS += -DALL_INCLUSIVE endif xtables_nft_multi_CFLAGS += -DENABLE_NFTABLES -DENABLE_IPV4 -DENABLE_IPV6 -xtables_nft_multi_SOURCES += xtables-config-parser.y xtables-config-syntax.l xtables_nft_multi_SOURCES += xtables-save.c xtables-restore.c \ xtables-standalone.c xtables.c nft.c \ nft-shared.c nft-ipv4.c nft-ipv6.c nft-arp.c \ @@ -46,8 +43,6 @@ xtables_nft_multi_SOURCES += xtables-save.c xtables-restore.c \ xtables-eb-translate.c \ xtables-translate.c xtables_nft_multi_LDADD += ${libmnl_LIBS} ${libnftnl_LIBS} ${libnetfilter_conntrack_LIBS} ../extensions/libext4.a ../extensions/libext6.a ../extensions/libext_ebt.a ../extensions/libext_arpt.a -# yacc and lex generate dirty code -xtables_nft_multi-xtables-config-parser.o xtables_nft_multi-xtables-config-syntax.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations -Wno-implicit-function-declaration -Wno-nested-externs -Wno-undef -Wno-redundant-decls xtables_nft_multi_SOURCES += xshared.c xtables_nft_multi_LDADD += ../libxtables/libxtables.la -lm endif @@ -67,8 +62,7 @@ man_MANS += arptables-nft.8 arptables-nft-restore.8 arptables-nft-save.8 \ ebtables-nft.8 endif CLEANFILES = iptables.8 xtables-monitor.8 \ - iptables-translate.8 ip6tables-translate.8 \ - xtables-config-parser.c xtables-config-syntax.c + iptables-translate.8 ip6tables-translate.8 vx_bin_links = iptables-xml if ENABLE_IPV4 |