[NET]: Makefile cleanups for net/.

diff --git a/net/bridge/Makefile b/net/bridge/Makefile
index 068150c0f923fdc869deaff6949283552e0510f3..d86edb7281b0fb429e772014918850d68796ac18 100644 (file)
--- a/net/bridge/Makefile
+++ b/net/bridge/Makefile
@@ -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/

diff --git a/net/core/Makefile b/net/core/Makefile
index dc05b5f08a5a1e4d8eecb361b764a02b644b3bc3..bbefeba45a0bf668fbcf5c016750d25a4da46a8d 100644 (file)
--- a/net/core/Makefile
+++ b/net/core/Makefile
@@ -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

diff --git a/net/rxrpc/Makefile b/net/rxrpc/Makefile
index 18403fe87c15e7eb1cd78a941ff58b7a0c41f814..01ff446eae185604f8e2b25a4e5749cca0f405c4 100644 (file)
--- a/net/rxrpc/Makefile
+++ b/net/rxrpc/Makefile
@@ -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-objs := \
        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