Introduce usage of new syntax for composite objects in net/ Makefiles. This allowed several occurences of ifeq ($(CONFIG_FOO),y) to be removed - resulting in more readable Makefiles. Also in net/core/Makefile use the knowledge that the net/Makefile has the check for the CONFIG_NET so make it simpler. Sam bridge/Makefile | 6 ++---- core/Makefile | 10 +++------- rxrpc/Makefile | 10 +++------- 3 files changed, 8 insertions(+), 18 deletions(-) ===== net/bridge/Makefile 1.6 vs edited ===== --- 1.6/net/bridge/Makefile Mon Feb 3 23:19:39 2003 +++ edited/net/bridge/Makefile Sat Jul 19 10:01:22 2003 @@ -4,12 +4,10 @@ obj-$(CONFIG_BRIDGE) += bridge.o -bridge-objs := br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \ +bridge-y := 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 -ifeq ($(CONFIG_NETFILTER),y) -bridge-objs += br_netfilter.o -endif +bridge-$(CONFIG_NETFILTER) += br_netfilter.o obj-$(CONFIG_BRIDGE_NF_EBTABLES) += netfilter/ ===== net/core/Makefile 1.15 vs edited ===== --- 1.15/net/core/Makefile Wed May 21 04:59:14 2003 +++ edited/net/core/Makefile Sat Jul 19 09:59:13 2003 @@ -4,14 +4,10 @@ obj-y := sock.o skbuff.o iovec.o datagram.o scm.o -ifeq ($(CONFIG_SYSCTL),y) -ifeq ($(CONFIG_NET),y) -obj-y += sysctl_net_core.o -endif -endif +obj-$(CONFIG_SYSCTL) += sysctl_net_core.o -obj-$(CONFIG_NET) += flow.o dev.o net-sysfs.o dev_mcast.o dst.o neighbour.o \ - rtnetlink.o utils.o link_watch.o filter.o +obj-y += flow.o dev.o net-sysfs.o dev_mcast.o dst.o neighbour.o \ + rtnetlink.o utils.o link_watch.o filter.o obj-$(CONFIG_NETFILTER) += netfilter.o obj-$(CONFIG_NET_DIVERT) += dv.o ===== net/rxrpc/Makefile 1.4 vs edited ===== --- 1.4/net/rxrpc/Makefile Mon Feb 3 23:19:39 2003 +++ edited/net/rxrpc/Makefile Sat Jul 19 10:02:53 2003 @@ -2,7 +2,7 @@ # Makefile for Linux kernel Rx RPC # -rxrpc-objs := \ +rxrpc-y := \ call.o \ connection.o \ krxiod.o \ @@ -13,11 +13,7 @@ rxrpc_syms.o \ transport.o -ifeq ($(CONFIG_PROC_FS),y) -rxrpc-objs += proc.o -endif -ifeq ($(CONFIG_SYSCTL),y) -rxrpc-objs += sysctl.o -endif +rxrpc-$(CONFIG_PROC_FS) += proc.o +rxrpc-$(CONFIG_SYSCTL) += sysctl.o obj-$(CONFIG_RXRPC) := rxrpc.o - : send the line "unsubscribe linux-net" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
