OpenWrt – Diff between revs 2 and 3
?pathlinks?
| Rev 2 | Rev 3 | |||
|---|---|---|---|---|
| Line 54... | Line 54... | |||
| 54 | initextb_func := $(addprefix ebt_,${pfb_build_static}) |
54 | initextb_func := $(addprefix ebt_,${pfb_build_static}) |
|
| 55 | --- a/iptables/Makefile.am |
55 | --- a/iptables/Makefile.am |
|
| 56 | +++ b/iptables/Makefile.am |
56 | +++ b/iptables/Makefile.am |
|
| 57 | @@ -8,7 +8,8 @@ BUILT_SOURCES = |
57 | @@ -8,7 +8,8 @@ BUILT_SOURCES = |
|
| Line 58... | Line 58... | |||
| 58 | |
58 | |
|
| 59 | xtables_legacy_multi_SOURCES = xtables-legacy-multi.c iptables-xml.c |
59 | xtables_multi_SOURCES = xtables-multi.c iptables-xml.c |
|
| 60 | xtables_legacy_multi_CFLAGS = ${AM_CFLAGS} |
60 | xtables_multi_CFLAGS = ${AM_CFLAGS} |
|
| 61 | -xtables_legacy_multi_LDADD = ../extensions/libext.a |
61 | -xtables_multi_LDADD = ../extensions/libext.a |
|
| 62 | +xtables_legacy_multi_LDADD = |
62 | +xtables_multi_LDADD = |
|
| 63 | +xtables_legacy_multi_LDFLAGS = -L../extensions/ -liptext |
63 | +xtables_multi_LDFLAGS = -L../extensions/ -liptext |
|
| 64 | if ENABLE_STATIC |
64 | if ENABLE_STATIC |
|
| 65 | xtables_legacy_multi_CFLAGS += -DALL_INCLUSIVE |
65 | xtables_multi_CFLAGS += -DALL_INCLUSIVE |
|
| 66 | endif |
66 | endif |
|
| 67 | @@ -16,13 +17,15 @@ if ENABLE_IPV4 |
67 | @@ -16,13 +17,15 @@ if ENABLE_IPV4 |
|
| 68 | xtables_legacy_multi_SOURCES += iptables-save.c iptables-restore.c \ |
68 | xtables_multi_SOURCES += iptables-save.c iptables-restore.c \ |
|
| 69 | iptables-standalone.c iptables.c |
69 | iptables-standalone.c iptables.c |
|
| 70 | xtables_legacy_multi_CFLAGS += -DENABLE_IPV4 |
70 | xtables_multi_CFLAGS += -DENABLE_IPV4 |
|
| 71 | -xtables_legacy_multi_LDADD += ../libiptc/libip4tc.la ../extensions/libext4.a |
71 | -xtables_multi_LDADD += ../libiptc/libip4tc.la ../extensions/libext4.a |
|
| 72 | +xtables_legacy_multi_LDADD += ../libiptc/libip4tc.la |
72 | +xtables_multi_LDADD += ../libiptc/libip4tc.la |
|
| 73 | +xtables_legacy_multi_LDFLAGS += -liptext4 |
73 | +xtables_multi_LDFLAGS += -liptext4 |
|
| 74 | endif |
74 | endif |
|
| 75 | if ENABLE_IPV6 |
75 | if ENABLE_IPV6 |
|
| 76 | xtables_legacy_multi_SOURCES += ip6tables-save.c ip6tables-restore.c \ |
76 | xtables_multi_SOURCES += ip6tables-save.c ip6tables-restore.c \ |
|
| 77 | ip6tables-standalone.c ip6tables.c |
77 | ip6tables-standalone.c ip6tables.c |
|
| 78 | xtables_legacy_multi_CFLAGS += -DENABLE_IPV6 |
78 | xtables_multi_CFLAGS += -DENABLE_IPV6 |
|
| 79 | -xtables_legacy_multi_LDADD += ../libiptc/libip6tc.la ../extensions/libext6.a |
79 | -xtables_multi_LDADD += ../libiptc/libip6tc.la ../extensions/libext6.a |
|
| 80 | +xtables_legacy_multi_LDADD += ../libiptc/libip6tc.la |
80 | +xtables_multi_LDADD += ../libiptc/libip6tc.la |
|
| 81 | +xtables_legacy_multi_LDFLAGS += -liptext6 |
81 | +xtables_multi_LDFLAGS += -liptext6 |
|
| 82 | endif |
82 | endif |
|
| 83 | xtables_legacy_multi_SOURCES += xshared.c |
83 | xtables_multi_SOURCES += xshared.c |
|
| 84 | xtables_legacy_multi_LDADD += ../libxtables/libxtables.la -lm |
84 | xtables_multi_LDADD += ../libxtables/libxtables.la -lm |
|
| 85 | @@ -32,7 +35,8 @@ if ENABLE_NFTABLES |
85 | @@ -32,7 +35,8 @@ if ENABLE_NFTABLES |
|
| 86 | BUILT_SOURCES += xtables-config-parser.h |
86 | BUILT_SOURCES += xtables-config-parser.h |
|
| 87 | xtables_nft_multi_SOURCES = xtables-nft-multi.c iptables-xml.c |
87 | xtables_compat_multi_SOURCES = xtables-compat-multi.c iptables-xml.c |
|
| 88 | xtables_nft_multi_CFLAGS = ${AM_CFLAGS} |
88 | xtables_compat_multi_CFLAGS = ${AM_CFLAGS} |
|
| 89 | -xtables_nft_multi_LDADD = ../extensions/libext.a ../extensions/libext_ebt.a |
89 | -xtables_compat_multi_LDADD = ../extensions/libext.a ../extensions/libext_ebt.a |
|
| 90 | +xtables_nft_multi_LDADD = |
90 | +xtables_compat_multi_LDADD = |
|
| 91 | +xtables_nft_multi_LDFLAGS = -L../extensions/ -liptext -liptext_ebt |
91 | +xtables_compat_multi_LDFLAGS = -L../extensions/ -liptext -liptext_ebt |
|
| 92 | if ENABLE_STATIC |
92 | if ENABLE_STATIC |
|
| 93 | xtables_nft_multi_CFLAGS += -DALL_INCLUSIVE |
93 | xtables_compat_multi_CFLAGS += -DALL_INCLUSIVE |
|
| 94 | endif |
94 | endif |
|
| - | 95 | @@ -45,7 +49,8 @@ xtables_compat_multi_SOURCES += xtables- |
||
| 95 | @@ -47,7 +51,8 @@ xtables_nft_multi_SOURCES += xtables-sav |
96 | getethertype.c nft-bridge.c \ |
|
| 96 | xtables-eb-standalone.c xtables-eb.c \ |
- | ||
| 97 | xtables-eb-translate.c \ |
97 | xtables-eb-standalone.c xtables-eb.c \ |
|
| 98 | xtables-translate.c |
98 | xtables-translate.c |
|
| 99 | -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 |
99 | -xtables_compat_multi_LDADD += ${libmnl_LIBS} ${libnftnl_LIBS} ${libnetfilter_conntrack_LIBS} ../extensions/libext4.a ../extensions/libext6.a ../extensions/libext_ebt.a ../extensions/libext_arpt.a |
|
| 100 | +xtables_nft_multi_LDADD += ${libmnl_LIBS} ${libnftnl_LIBS} ${libnetfilter_conntrack_LIBS} |
100 | +xtables_compat_multi_LDADD += ${libmnl_LIBS} ${libnftnl_LIBS} ${libnetfilter_conntrack_LIBS} |
|
| 101 | +xtables_nft_multi_LDFLAGS += -liptext4 -liptext6 -liptext_arpt |
101 | +xtables_compat_multi_LDFLAGS += -liptext4 -liptext6 -liptext_arpt |
|
| 102 | # yacc and lex generate dirty code |
102 | # yacc and lex generate dirty code |
|
| 103 | 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 |
103 | xtables_compat_multi-xtables-config-parser.o xtables_compat_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 |
|