kbuild: Use standard multi-part object declaration in net/*

net/802/Makefile

 #
 # Makefile for the Linux 802.x protocol layers.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := 802.o
 
 export-objs = llc_macinit.o p8022.o psnap.o
 

net/8021q/Makefile

 #
 # Makefile for the Linux VLAN layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
 
-O_TARGET := 8021q.o
+obj-$(CONFIG_VLAN_8021Q) += 8021q.o
 
-obj-y := vlan.o vlanproc.o vlan_dev.o
-obj-m := $(O_TARGET)
+8021q-objs := vlan.o vlanproc.o vlan_dev.o
 
 include $(TOPDIR)/Rules.make

net/Makefile

@@ -7,47 +7,43 @@
 
 O_TARGET :=	network.o
 
-mod-subdirs :=	ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched
+mod-subdirs :=	ipv4 ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched
 export-objs :=	netsyms.o
 
-subdir-y :=	core ethernet
-subdir-m :=	ipv4 # hum?
+obj-y	:= socket.o core/ ethernet/
 
-
-subdir-$(CONFIG_NET)		+= 802 sched netlink
-subdir-$(CONFIG_INET)		+= ipv4
-subdir-$(CONFIG_NETFILTER)	+= ipv4/netfilter
-subdir-$(CONFIG_UNIX)		+= unix
-subdir-$(CONFIG_IPV6)		+= ipv6
+obj-$(CONFIG_NET)		+= 802/ sched/ netlink/
+obj-$(CONFIG_INET)		+= ipv4/
+obj-$(CONFIG_NETFILTER)		+= ipv4/netfilter/
+obj-$(CONFIG_UNIX)		+= unix/
+obj-$(CONFIG_IPV6)		+= ipv6/
 
 ifneq ($(CONFIG_IPV6),n)
 ifneq ($(CONFIG_IPV6),)
-subdir-$(CONFIG_NETFILTER)	+= ipv6/netfilter
+obj-$(CONFIG_NETFILTER)		+= ipv6/netfilter/
 endif
 endif
 
-subdir-$(CONFIG_KHTTPD)		+= khttpd
-subdir-$(CONFIG_PACKET)		+= packet
-subdir-$(CONFIG_NET_SCHED)	+= sched
-subdir-$(CONFIG_BRIDGE)		+= bridge
-subdir-$(CONFIG_IPX)		+= ipx
-subdir-$(CONFIG_ATALK)		+= appletalk
-subdir-$(CONFIG_WAN_ROUTER)	+= wanrouter
-subdir-$(CONFIG_X25)		+= x25
-subdir-$(CONFIG_LAPB)		+= lapb
-subdir-$(CONFIG_NETROM)		+= netrom
-subdir-$(CONFIG_ROSE)		+= rose
-subdir-$(CONFIG_AX25)		+= ax25
-subdir-$(CONFIG_IRDA)		+= irda
-subdir-$(CONFIG_BLUEZ)		+= bluetooth
-subdir-$(CONFIG_SUNRPC)		+= sunrpc
-subdir-$(CONFIG_ATM)		+= atm
-subdir-$(CONFIG_DECNET)		+= decnet
-subdir-$(CONFIG_ECONET)		+= econet
-subdir-$(CONFIG_VLAN_8021Q)           += 8021q
-
-
-obj-y	:= socket.o $(join $(subdir-y), $(patsubst %,/%.o,$(notdir $(subdir-y))))
+obj-$(CONFIG_KHTTPD)		+= khttpd/
+obj-$(CONFIG_PACKET)		+= packet/
+obj-$(CONFIG_NET_SCHED)		+= sched/
+obj-$(CONFIG_BRIDGE)		+= bridge/
+obj-$(CONFIG_IPX)		+= ipx/
+obj-$(CONFIG_ATALK)		+= appletalk/
+obj-$(CONFIG_WAN_ROUTER)	+= wanrouter/
+obj-$(CONFIG_X25)		+= x25/
+obj-$(CONFIG_LAPB)		+= lapb/
+obj-$(CONFIG_NETROM)		+= netrom/
+obj-$(CONFIG_ROSE)		+= rose/
+obj-$(CONFIG_AX25)		+= ax25/
+obj-$(CONFIG_IRDA)		+= irda/
+obj-$(CONFIG_BLUEZ)		+= bluetooth/
+obj-$(CONFIG_SUNRPC)		+= sunrpc/
+obj-$(CONFIG_ATM)		+= atm/
+obj-$(CONFIG_DECNET)		+= decnet/
+obj-$(CONFIG_ECONET)		+= econet/
+obj-$(CONFIG_VLAN_8021Q)	+= 8021q/
+
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_MODULES)		+= netsyms.o
 obj-$(CONFIG_SYSCTL)		+= sysctl_net.o

net/appletalk/Makefile

 #
 # Makefile for the Linux AppleTalk layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := appletalk.o
 
 export-objs = ddp.o
 
-obj-y	 := aarp.o ddp.o
-obj-m	 := $(O_TARGET)
+obj-$(CONFIG_ATALK) += appletalk.o
 
-obj-$(CONFIG_SYSCTL) += sysctl_net_atalk.o
+appletalk-y			:= aarp.o ddp.o
+appletalk-$(CONFIG_SYSCTL)	+= sysctl_net_atalk.o
+appletalk-objs			:= $(appletalk-y)
 
 include $(TOPDIR)/Rules.make
 

net/atm/Makefile

@@ -2,28 +2,15 @@
 # Makefile for the ATM Protocol Families.
 #
 
-O_TARGET	:= atm.o
-
 export-objs 	:= common.o atm_misc.o raw.o resources.o ipcommon.o proc.o
 
 mpoa-objs	:= mpc.o mpoa_caches.o mpoa_proc.o
 
 obj-$(CONFIG_ATM) := addr.o pvc.o signaling.o svc.o common.o atm_misc.o raw.o resources.o
 
-ifeq ($(CONFIG_ATM_CLIP),y)
-obj-y += clip.o
-NEED_IPCOM = ipcommon.o
-endif
-
-ifeq ($(CONFIG_NET_SCH_ATM),y)
-NEED_IPCOM = ipcommon.o
-endif
-
-obj-y += $(NEED_IPCOM)
-
-ifeq ($(CONFIG_PROC_FS),y)
-obj-y += proc.o
-endif
+obj-$(CONFIG_ATM_CLIP) += clip.o ipcommon.o
+obj-$(CONFIG_NET_SCH_ATM) += ipcommon.o
+obj-$(CONFIG_PROC_FS) += proc.o
 
 obj-$(CONFIG_ATM_LANE) += lec.o
 obj-$(CONFIG_ATM_MPOA) += mpoa.o

net/ax25/Makefile

 #
 # Makefile for the Linux AX.25 layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-
-O_TARGET := ax25.o
 
 export-objs := af_ax25.o
 
-obj-y	 := ax25_addr.o ax25_dev.o ax25_iface.o ax25_in.o ax25_ip.o ax25_out.o \
+obj-$(CONFIG_AX25) += ax25.o
+
+ax25-y	 := ax25_addr.o ax25_dev.o ax25_iface.o ax25_in.o ax25_ip.o ax25_out.o \
 	    ax25_route.o ax25_std_in.o ax25_std_subr.o ax25_std_timer.o \
 	    ax25_subr.o ax25_timer.o ax25_uid.o af_ax25.o
-
-obj-m    := $(O_TARGET)
-
-obj-$(CONFIG_AX25_DAMA_SLAVE) += ax25_ds_in.o ax25_ds_subr.o ax25_ds_timer.o
-obj-$(CONFIG_SYSCTL) += sysctl_net_ax25.o
+ax25-$(CONFIG_AX25_DAMA_SLAVE) += ax25_ds_in.o ax25_ds_subr.o ax25_ds_timer.o
+ax25-$(CONFIG_SYSCTL) += sysctl_net_ax25.o
+ax25-objs := $(ax25-y)
 
 include $(TOPDIR)/Rules.make
 

net/bluetooth/Makefile

 #
 # Makefile for the Bluetooth subsystem
 #
-O_TARGET	:= bluetooth.o
 
-list-multi	:= bluez.o
 export-objs	:= syms.o
-bluez-objs	:= af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o lib.o syms.o
 
 obj-$(CONFIG_BLUEZ) += bluez.o
 obj-$(CONFIG_BLUEZ_L2CAP) += l2cap.o
 obj-$(CONFIG_BLUEZ_SCO) += sco.o
 
-include $(TOPDIR)/Rules.make
+bluez-objs	:= af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o lib.o syms.o
 
-bluez.o: $(bluez-objs)
-	$(LD) -r -o $@ $(bluez-objs)
+include $(TOPDIR)/Rules.make

net/bridge/Makefile

 #
 # Makefile for the IEEE 802.1d ethernet bridging layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
 
-O_TARGET	:= bridge.o
-obj-y		:= br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
+obj-$(CONFIG_BRIDGE) += bridge.o
+
+bridge-objs	:= br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
 			br_ioctl.o br_notify.o br_stp.o br_stp_bpdu.o \
 			br_stp_if.o br_stp_timer.o
-obj-m		:= $(O_TARGET)
 
 include $(TOPDIR)/Rules.make

net/core/Makefile

 #
 # Makefile for the Linux networking core.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := core.o
 
 export-objs := netfilter.o profile.o
 

net/decnet/Makefile

-# Note 2! The CFLAGS definition is now in the main makefile...
 
-O_TARGET := decnet.o
-obj-y    := af_decnet.o dn_nsp_in.o dn_nsp_out.o dn_route.o dn_dev.o dn_neigh.o dn_timer.o
-obj-m	 := $(O_TARGET)
+obj-$(CONFIG_DECNET) += decnet.o
 
-obj-$(CONFIG_DECNET_ROUTER) += dn_fib.o dn_rules.o dn_table.o
-obj-$(CONFIG_DECNET_FW) += dn_fw.o
-
-obj-y += sysctl_net_decnet.o
+decnet-y := af_decnet.o dn_nsp_in.o dn_nsp_out.o dn_route.o dn_dev.o dn_neigh.o dn_timer.o
+decnet-$(CONFIG_DECNET_ROUTER) += dn_fib.o dn_rules.o dn_table.o
+decnet-$(CONFIG_DECNET_FW) += dn_fw.o
+decnet-y += sysctl_net_decnet.o
+decnet-objs := $(decnet-y)
 
 include $(TOPDIR)/Rules.make
 

net/econet/Makefile

 #
 # Makefile for Econet support code.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
 
-O_TARGET := econet.o
+obj-$(CONFIG_ECONET) += econet.o
 
-obj-y := af_econet.o
-obj-m := $(O_TARGET)
+econet-objs := af_econet.o
 
 include $(TOPDIR)/Rules.make
 

net/ethernet/Makefile

 #
 # Makefile for the Linux Ethernet layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := ethernet.o
-
-OBJS	:= eth.o
-
-ifeq ($(CONFIG_SYSCTL),y)
-OBJS += sysctl_net_ether.o
-endif
 
-ifdef CONFIG_IPX
-OBJ2	:= pe2.o
-endif
+OBJS-y	:= eth.o
 
-ifdef CONFIG_ATALK
-OBJ2	:= pe2.o
-endif
+OBJS-$(CONFIG_SYSCTL)	+= sysctl_net_ether.o
+OBJS-$(CONFIG_IPX)	+= pe2.o
+OBJS-$(CONFIG_ATALK)	+= pe2.o
 
-obj-$(CONFIG_NET)	:= $(OBJS) $(OBJ2)
+obj-$(CONFIG_NET)	:= $(OBJS-y)
 
 include $(TOPDIR)/Rules.make

net/ipv4/Makefile

 #
 # Makefile for the Linux TCP/IP (INET) layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := ipv4.o
 
 export-objs = ipip.o ip_gre.o
 

net/ipv4/netfilter/Makefile

@@ -2,9 +2,9 @@
 # Makefile for the netfilter modules on top of IPv4.
 #
 
-O_TARGET := netfilter.o
-
-export-objs = ip_conntrack_standalone.o ip_fw_compat.o ip_nat_standalone.o ip_tables.o arp_tables.o
+export-objs  := ip_conntrack_standalone.o ip_fw_compat.o ip_nat_standalone.o \
+		ip_tables.o arp_tables.o ip_conntrack_ftp.o \
+		ip_conntrack_irc.o
 
 # objects for the conntrack and NAT core (used by standalone and backw. compat)
 ip_nf_conntrack-objs	:= ip_conntrack_core.o ip_conntrack_proto_generic.o ip_conntrack_proto_tcp.o ip_conntrack_proto_udp.o ip_conntrack_proto_icmp.o
@@ -25,14 +25,7 @@ obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o
 
 # connection tracking helpers
 obj-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp.o
-ifdef CONFIG_IP_NF_NAT_FTP
-	export-objs += ip_conntrack_ftp.o
-endif
-
 obj-$(CONFIG_IP_NF_IRC) += ip_conntrack_irc.o
-ifdef CONFIG_IP_NF_NAT_IRC
-	export-objs += ip_conntrack_irc.o
-endif
 
 # NAT helpers 
 obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ftp.o

net/ipv6/Makefile

 #
 # Makefile for the Linux TCP/IP (INET6) layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-
-O_TARGET := ipv6.o
 
 export-objs :=  ipv6_syms.o
 
-obj-y :=	af_inet6.o ip6_output.o ip6_input.o addrconf.o sit.o \
+obj-$(CONFIG_IPV6) += ipv6.o
+
+ipv6-objs :=	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 ipv6_syms.o
 
-obj-m  := $(O_TARGET)
-
 #obj-$(CONFIG_IPV6_FIREWALL) += ip6_fw.o
 
 include $(TOPDIR)/Rules.make

net/ipv6/netfilter/Makefile

 #
 # Makefile for the netfilter modules on top of IPv6.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := netfilter.o
 
 export-objs := ip6_tables.o
 

net/ipx/Makefile

 #
 # Makefile for the Linux IPX layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-# We only get in/to here if CONFIG_IPX = 'y' or 'm'
-
-O_TARGET := ipx.o
 
 export-objs = af_ipx.o af_spx.o
 
-obj-y	:= af_ipx.o
-
-ifeq ($(CONFIG_IPX),m)
-  obj-m += $(O_TARGET)
-endif
+obj-$(CONFIG_IPX) += ipx.o
 
-obj-$(CONFIG_SYSCTL) += sysctl_net_ipx.o
-obj-$(CONFIG_SPX) += af_spx.o
+ipx-y			:= af_ipx.o
+ipx-$(CONFIG_SYSCTL)	+= sysctl_net_ipx.o
+ipx-$(CONFIG_SPX)	+= af_spx.o
+ipx-objs		:= $(ipx-y)
 
 include $(TOPDIR)/Rules.make

net/irda/Makefile

 #
 # Makefile for the Linux IrDA protocol layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := irda.o
 
 export-objs := irsyms.o
 
-obj-y	 := iriap.o iriap_event.o irlmp.o irlmp_event.o irlmp_frame.o \
+obj-$(CONFIG_IRDA) += irda.o
+obj-$(CONFIG_IRLAN) += irlan/
+obj-$(CONFIG_IRNET) += irnet/
+obj-$(CONFIG_IRCOMM) += ircomm/
+
+irda-y := iriap.o iriap_event.o irlmp.o irlmp_event.o irlmp_frame.o \
           irlap.o irlap_event.o irlap_frame.o timer.o qos.o irqueue.o \
           irttp.o irda_device.o irias_object.o crc.o wrapper.o af_irda.o \
 	  discovery.o parameters.o irsyms.o
-
-ifeq ($(CONFIG_IRDA),m)
-obj-m   := $(O_TARGET)
-endif
-
-obj-$(CONFIG_PROC_FS) += irproc.o
-obj-$(CONFIG_SYSCTL) += irsysctl.o
-
-subdir-$(CONFIG_IRLAN) += irlan
-subdir-$(CONFIG_IRNET) += irnet
-subdir-$(CONFIG_IRCOMM) += ircomm
-
-ifeq ($(CONFIG_IRLAN),y)
-obj-y += irlan/irlan.o
-endif
-
-ifeq ($(CONFIG_IRNET),y)
-obj-y += irnet/irnet.o
-endif
-
-ifeq ($(CONFIG_IRCOMM),y)
-obj-y += ircomm/ircomm_and_tty.o
-endif
+irda-$(CONFIG_PROC_FS) += irproc.o
+irda-$(CONFIG_SYSCTL) += irsysctl.o
+irda-objs := $(irda-y)
 
 include $(TOPDIR)/Rules.make

net/irda/ircomm/Makefile

@@ -2,14 +2,12 @@
 # Makefile for the Linux IrDA IrCOMM protocol layer.
 #
 
-O_TARGET := ircomm_and_tty.o
-
 export-objs := ircomm_core.o
 
+obj-$(CONFIG_IRCOMM) += ircomm.o ircomm-tty.o
+
 ircomm-objs := ircomm_core.o ircomm_event.o ircomm_lmp.o ircomm_ttp.o
 ircomm-tty-objs := ircomm_tty.o ircomm_tty_attach.o ircomm_tty_ioctl.o ircomm_param.o
 
-obj-$(CONFIG_IRCOMM) += ircomm.o ircomm-tty.o
-
 include $(TOPDIR)/Rules.make
 

net/irda/irlan/Makefile

 #
 # Makefile for the Linux IrDA IrLAN protocol layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
 
-O_TARGET := irlan.o
+obj-$(CONFIG_IRLAN) += irlan.o
 
-obj-y	:= irlan_common.o irlan_eth.o irlan_event.o irlan_client.o irlan_provider.o irlan_filter.o irlan_provider_event.o irlan_client_event.o
-obj-m	:= $(O_TARGET)
+irlan-objs := irlan_common.o irlan_eth.o irlan_event.o irlan_client.o irlan_provider.o irlan_filter.o irlan_provider_event.o irlan_client_event.o
 
 include $(TOPDIR)/Rules.make

net/irda/irnet/Makefile

 #
 # Makefile for the Linux IrDA IrNET protocol layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
 
-MOD_LIST_NAME := IRDA_MODULES
-O_TARGET := irnet.o
+obj-$(CONFIG_IRNET) += irnet.o
 
-obj-y	:= irnet_ppp.o irnet_irda.o
-obj-m	:= $(O_TARGET)
+irnet-objs := irnet_ppp.o irnet_irda.o
 
 include $(TOPDIR)/Rules.make

net/khttpd/Makefile

 #
 # Makefile for kHTTPd
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := khttpd.o
 
-obj-m := 	$(O_TARGET)
-obj-y := 	main.o accept.o datasending.o logging.o misc.o rfc.o rfc_time.o security.o \
-		sockets.o sysctl.o userspace.o waitheaders.o
+obj-$(CONFIG_KHTTPD) += khttpd.o
 
+khttpd-objs := 	main.o accept.o datasending.o logging.o misc.o rfc.o \
+		rfc_time.o security.o sockets.o sysctl.o userspace.o \
+		waitheaders.o
 
 include $(TOPDIR)/Rules.make
 

net/lapb/Makefile

 #
 # Makefile for the Linux LAPB layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-
-O_TARGET := lapb.o
 
 export-objs := lapb_iface.o
 
-obj-y	 := lapb_in.o lapb_out.o lapb_subr.o lapb_timer.o lapb_iface.o
-obj-m    := $(O_TARGET)
+obj-$(CONFIG_LAPB) += lapb.o
+
+lapb-objs := lapb_in.o lapb_out.o lapb_subr.o lapb_timer.o lapb_iface.o
 
 include $(TOPDIR)/Rules.make
 

net/netlink/Makefile

 #
 # Makefile for the netlink driver.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := netlink.o
 
 export-objs := af_netlink.o
 
 obj-y  				:= af_netlink.o
-
-obj-m  :=
-
 obj-$(CONFIG_NETLINK_DEV)	+= netlink_dev.o
 
 include $(TOPDIR)/Rules.make

net/netrom/Makefile

 #
 # Makefile for the Linux NET/ROM layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := netrom.o
 
-obj-y	 := af_netrom.o nr_dev.o nr_in.o nr_loopback.o nr_out.o nr_route.o \
-	    nr_subr.o nr_timer.o
-obj-m    := $(O_TARGET)
+obj-$(CONFIG_NETROM) += netrom.o
 
-obj-$(CONFIG_SYSCTL) += sysctl_net_netrom.o
+netrom-y		:= af_netrom.o nr_dev.o nr_in.o nr_loopback.o \
+			   nr_out.o nr_route.o nr_subr.o nr_timer.o
+netrom-$(CONFIG_SYSCTL)	+= sysctl_net_netrom.o
+netrom-objs		:= $(netrom-y)
 
 include $(TOPDIR)/Rules.make
 

net/packet/Makefile

 #
 # Makefile for the packet AF.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := packet.o
 
 obj-$(CONFIG_PACKET) += af_packet.o
 

net/rose/Makefile

 #
 # Makefile for the Linux Rose (X.25 PLP) layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
 
-O_TARGET := rose.o
+obj-$(CONFIG_ROSE) += rose.o
 
-obj-y	 := af_rose.o rose_dev.o rose_in.o rose_link.o rose_loopback.o \
+rose-y	  := af_rose.o rose_dev.o rose_in.o rose_link.o rose_loopback.o \
 	     rose_out.o rose_route.o rose_subr.o rose_timer.o
-obj-m    := $(O_TARGET)
-
-obj-$(CONFIG_SYSCTL) += sysctl_net_rose.o
+rose-$(CONFIG_SYSCTL) += sysctl_net_rose.o
+rose-objs := $(rose-y)
 
 include $(TOPDIR)/Rules.make
 

net/sched/Makefile

@@ -2,11 +2,8 @@
 # Makefile for the Linux Traffic Control Unit.
 #
 
-O_TARGET := sched.o
-
 obj-y	:= sch_generic.o
 
-
 obj-$(CONFIG_NET_SCHED)		+= sch_api.o sch_fifo.o
 obj-$(CONFIG_NET_ESTIMATOR)	+= estimator.o
 obj-$(CONFIG_NET_CLS)		+= cls_api.o

net/sunrpc/Makefile

 #
 # Makefile for Linux kernel SUN RPC
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
 
-O_TARGET := sunrpc.o
+obj-$(CONFIG_SUNRPC) += sunrpc.o
 
 export-objs := sunrpc_syms.o
 
-obj-y    := clnt.o xprt.o sched.o \
+sunrpc-y := clnt.o xprt.o sched.o \
 	    auth.o auth_null.o auth_unix.o \
 	    svc.o svcsock.o svcauth.o \
 	    pmap_clnt.o xdr.o sunrpc_syms.o
-
-obj-$(CONFIG_PROC_FS) += stats.o
-obj-$(CONFIG_SYSCTL) += sysctl.o
-
-obj-m  := $(O_TARGET)
+sunrpc-$(CONFIG_PROC_FS) += stats.o
+sunrpc-$(CONFIG_SYSCTL) += sysctl.o
+sunrpc-objs := $(sunrpc-y)
 
 include $(TOPDIR)/Rules.make

net/unix/Makefile

 #
 # Makefile for the Linux unix domain socket layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := unix.o
 
-obj-y	 := af_unix.o garbage.o
-obj-m    := $(O_TARGET)
+obj-$(CONFIG_UNIX)	+= unix.o
 
-obj-$(CONFIG_SYSCTL) += sysctl_net_unix.o
+unix-y			:= af_unix.o garbage.o
+unix-$(CONFIG_SYSCTL)	+= sysctl_net_unix.o
+unix-objs		:= $(unix-y)
 
 include $(TOPDIR)/Rules.make
 

net/wanrouter/Makefile

 #
 # Makefile for the Linux WAN router layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := wanrouter.o
 
 export-objs := wanmain.o
 
-obj-y :=  wanproc.o wanmain.o
-obj-m := $(O_TARGET)
-ifneq ($(CONFIG_VENDOR_SANGOMA),n)
-	obj-m += $(O_TARGET)
-endif
+obj-$(CONFIG_WAN_ROUTER) += wanrouter.o
+
+wanrouter-objs :=  wanproc.o wanmain.o
 
 include $(TOPDIR)/Rules.make

net/x25/Makefile

 #
 # Makefile for the Linux X.25 Packet layer.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := x25.o
 
-obj-y	 := af_x25.o x25_dev.o x25_facilities.o x25_in.o x25_link.o x25_out.o \
-	    x25_route.o x25_subr.o x25_timer.o
-obj-m    := $(O_TARGET)
+obj-$(CONFIG_X25) += x25.o
 
-obj-$(CONFIG_SYSCTL) += sysctl_net_x25.o
+x25-y			:= af_x25.o x25_dev.o x25_facilities.o x25_in.o \
+			   x25_link.o x25_out.o x25_route.o x25_subr.o \
+			   x25_timer.o
+x25-$(CONFIG_SYSCTL)	+= sysctl_net_x25.o
+x25-objs		:= $(x25-y)
 
 include $(TOPDIR)/Rules.make