Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0795c65d authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller
Browse files

[NETFILTER]: Clean up Makefile 



Sort matches and targets in the NF makefiles.

Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b98e1747

net/ipv4/netfilter/Makefile

+10 −10
Original line number Diff line number Diff line
@@ -41,27 +41,27 @@ obj-$(CONFIG_NF_NAT) += iptable_nat.o 
obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o



# matches

obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o

obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o

obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o

obj-$(CONFIG_IP_NF_MATCH_IPRANGE) += ipt_iprange.o

obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o

obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o

obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o

obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o

obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o

obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o

obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o

obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o



# targets

obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o

obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o

obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o

obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o

obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o

obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o

obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o

obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o

obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o

obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o

obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_SAME.o

obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o

obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o

obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o

obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o

obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o

obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o



# generic ARP tables

obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o

net/ipv6/netfilter/Makefile

+16 −12
Original line number Diff line number Diff line
@@ -4,25 +4,29 @@ 


# Link order matters here.

obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o

obj-$(CONFIG_IP6_NF_MATCH_RT) += ip6t_rt.o

obj-$(CONFIG_IP6_NF_MATCH_OPTS) += ip6t_hbh.o

obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) += ip6t_ipv6header.o

obj-$(CONFIG_IP6_NF_MATCH_FRAG) += ip6t_frag.o

obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o

obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o

obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o

obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o

obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o

obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o

obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o

obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o

obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o

obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o

obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o

obj-$(CONFIG_IP6_NF_MATCH_MH) += ip6t_mh.o



# objects for l3 independent conntrack

nf_conntrack_ipv6-objs  :=  nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o nf_conntrack_reasm.o



# l3 independent conntrack

obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o



# matches

obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o

obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o

obj-$(CONFIG_IP6_NF_MATCH_FRAG) += ip6t_frag.o

obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o

obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) += ip6t_ipv6header.o

obj-$(CONFIG_IP6_NF_MATCH_MH) += ip6t_mh.o

obj-$(CONFIG_IP6_NF_MATCH_OPTS) += ip6t_hbh.o

obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o

obj-$(CONFIG_IP6_NF_MATCH_RT) += ip6t_rt.o



# targets

obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o

obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o

obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o

net/netfilter/Makefile

+7 −7
Original line number Diff line number Diff line
@@ -40,15 +40,15 @@ obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o 
# targets

obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIFY) += xt_CLASSIFY.o

obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o

obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o

obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o

obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o

obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o

obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o

obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o

obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o

obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o

obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o

obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o

obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o

obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o



# matches

obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o
@@ -59,22 +59,22 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRACK) += xt_conntrack.o 
obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o

obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o

obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o

obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o

obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o

obj-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) += xt_length.o

obj-$(CONFIG_NETFILTER_XT_MATCH_LIMIT) += xt_limit.o

obj-$(CONFIG_NETFILTER_XT_MATCH_MAC) += xt_mac.o

obj-$(CONFIG_NETFILTER_XT_MATCH_MARK) += xt_mark.o

obj-$(CONFIG_NETFILTER_XT_MATCH_MULTIPORT) += xt_multiport.o

obj-$(CONFIG_NETFILTER_XT_MATCH_POLICY) += xt_policy.o

obj-$(CONFIG_NETFILTER_XT_MATCH_PHYSDEV) += xt_physdev.o

obj-$(CONFIG_NETFILTER_XT_MATCH_PKTTYPE) += xt_pkttype.o

obj-$(CONFIG_NETFILTER_XT_MATCH_POLICY) += xt_policy.o

obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) += xt_quota.o

obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o

obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o

obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o

obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o

obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o

obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o

obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o

obj-$(CONFIG_NETFILTER_XT_MATCH_PHYSDEV) += xt_physdev.o

obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o

obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
 
obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o