Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

2 files changed, 13 insertions, 171 deletions

diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index 23754e3d3..f9964e085 100644
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -8,18 +8,15 @@
 
 
 O_TARGET := ipv6.o
-IPV6_OBJS :=	af_inet6.o ip6_output.o ip6_input.o addrconf.o sit.o \
+
+obj-y :=	af_inet6.o ip6_output.o ip6_input.o addrconf.o sit.o \
 		route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o raw.o \
 		protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \
 		exthdrs.o sysctl_net_ipv6.o datagram.o proc.o \
 		ip6_flowlabel.o
 
-M_OBJS   := $(O_TARGET)
-
-#ifeq ($(CONFIG_IPV6_FIREWALL),y)
-#  IPV6_OBJS += ip6_fw.o
-#endif
+obj-m  := $(O_TARGET)
 
-O_OBJS := $(IPV6_OBJS)
+#obj-$(CONFIG_IPV6_FIREWALL) += ip6_fw.o
 
 include $(TOPDIR)/Rules.make
diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile
index 5f89671a2..aec5db879 100644
--- a/net/ipv6/netfilter/Makefile
+++ b/net/ipv6/netfilter/Makefile
@@ -8,172 +8,17 @@
 # Note 2! The CFLAGS definition is now in the main makefile...
 
 O_TARGET := netfilter.o
-M_OBJS :=
 
-IP6_NF_CONNTRACK_OBJ:=ip6_conntrack_core.o ip6_conntrack_proto_generic.o ip6_conntrack_proto_tcp.o ip6_conntrack_proto_udp.o ip6_conntrack_proto_icmp.o
+multi-objs :=
+export-objs :=
 
 # Link order matters here.
-ifeq ($(CONFIG_IP6_NF_CONNTRACK),y)
-O_OBJS += ip6_conntrack_standalone.o $(IP6_NF_CONNTRACK_OBJ)
-else
-  ifeq ($(CONFIG_IP6_NF_CONNTRACK),m)
-  MI_OBJS += $(IP6_NF_CONNTRACK_OBJ)
-  MIX_OBJS += ip6_conntrack_standalone.o
-  M_OBJS += ip6_conntrack.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_FTP),y)
-O_OBJS += ip6_conntrack_ftp.o
-else
-  ifeq ($(CONFIG_IP6_NF_FTP),m)
-  MX_OBJS += ip6_conntrack_ftp.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_IPTABLES),y)
-O_OBJS += ip6_tables.o
-else
-  ifeq ($(CONFIG_IP6_NF_IPTABLES),m)
-  MX_OBJS += ip6_tables.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_MATCH_LIMIT),y)
-O_OBJS += ip6t_limit.o
-else
-  ifeq ($(CONFIG_IP6_NF_MATCH_LIMIT),m)
-  M_OBJS += ip6t_limit.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_MATCH_MARK),y)
-O_OBJS += ip6t_mark.o
-else
-  ifeq ($(CONFIG_IP6_NF_MATCH_MARK),m)
-  M_OBJS += ip6t_mark.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_MATCH_MAC),y)
-O_OBJS += ip6t_mac.o
-else
-  ifeq ($(CONFIG_IP6_NF_MATCH_MAC),m)
-  M_OBJS += ip6t_mac.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_MATCH_MULTIPORT),y)
-O_OBJS += ip6t_multiport.o
-else
-  ifeq ($(CONFIG_IP6_NF_MATCH_MULTIPORT),m)
-  M_OBJS += ip6t_multiport.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_MATCH_OWNER),y)
-O_OBJS += ip6t_owner.o
-else
-  ifeq ($(CONFIG_IP6_NF_MATCH_OWNER),m)
-  M_OBJS += ip6t_owner.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_MATCH_TOS),y)
-O_OBJS += ip6t_tos.o
-else
-  ifeq ($(CONFIG_IP6_NF_MATCH_TOS),m)
-  M_OBJS += ip6t_tos.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_MATCH_STATE),y)
-O_OBJS += ip6t_state.o
-else
-  ifeq ($(CONFIG_IP6_NF_MATCH_STATE),m)
-  M_OBJS += ip6t_state.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_MATCH_UNCLEAN),y)
-O_OBJS += ip6t_unclean.o
-else
-  ifeq ($(CONFIG_IP6_NF_MATCH_UNCLEAN),m)
-  M_OBJS += ip6t_unclean.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_FILTER),y)
-O_OBJS += ip6table_filter.o
-else
-  ifeq ($(CONFIG_IP6_NF_FILTER),m)
-  M_OBJS += ip6table_filter.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_TARGET_REJECT),y)
-O_OBJS += ip6t_REJECT.o
-else
-  ifeq ($(CONFIG_IP6_NF_TARGET_REJECT),m)
-  M_OBJS += ip6t_REJECT.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_TARGET_MIRROR),y)
-O_OBJS += ip6t_MIRROR.o
-else
-  ifeq ($(CONFIG_IP6_NF_TARGET_MIRROR),m)
-  M_OBJS += ip6t_MIRROR.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_TARGET_TOS),y)
-O_OBJS += ip6t_TOS.o
-else
-  ifeq ($(CONFIG_IP6_NF_TARGET_TOS),m)
-  M_OBJS += ip6t_TOS.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_TARGET_MARK),y)
-O_OBJS += ip6t_MARK.o
-else
-  ifeq ($(CONFIG_IP6_NF_TARGET_MARK),m)
-  M_OBJS += ip6t_MARK.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_TARGET_REDIRECT),y)
-O_OBJS += ip6t_REDIRECT.o
-else
-  ifeq ($(CONFIG_IP6_NF_TARGET_REDIRECT),m)
-  M_OBJS += ip6t_REDIRECT.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_TARGET_LOG),y)
-O_OBJS += ip6t_LOG.o
-else
-  ifeq ($(CONFIG_IP6_NF_TARGET_LOG),m)
-  M_OBJS += ip6t_LOG.o
-  endif
-endif
-
-ifeq ($(CONFIG_IP6_NF_QUEUE),y)
-O_OBJS += ip6_queue.o
-else
-  ifeq ($(CONFIG_IP6_NF_QUEUE),m)
-  M_OBJS += ip6_queue.o
-  endif
-endif
+obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
+obj-$(CONFIG_IP6_NF_MATCH_LIMIT) += ip6t_limit.o
+obj-$(CONFIG_IP6_NF_MATCH_MARK) += ip6t_mark.o
+obj-$(CONFIG_IP6_NF_MATCH_MAC) += ip6t_mac.o
+obj-$(CONFIG_IP6_NF_MATCH_MULTIPORT) += ip6t_multiport.o
+obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
+obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t_MARK.o
 
 include $(TOPDIR)/Rules.make
-
-ip6_conntrack.o: ip6_conntrack_standalone.o $(IP6_NF_CONNTRACK_OBJ)
-	$(LD) -r -o $@ $(IP6_NF_CONNTRACK_OBJ) ip6_conntrack_standalone.o 
-
-ip6fwadm.o: ipfwadm_core.o $(IP6_NF_COMPAT_LAYER)
-	$(LD) -r -o $@ ip6fwadm_core.o $(IP6_NF_COMPAT_LAYER)
-
-ip6chains.o: ip6chains_core.o $(IP6_NF_COMPAT_LAYER) 
-	$(LD) -r -o $@ ip6chains_core.o $(IP6_NF_COMPAT_LAYER)