Commit 900eb6a5 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller

[NET]: Makefile cleanups for net/.

parent c46236ee
......@@ -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/
......@@ -4,13 +4,9 @@
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 \
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
......
......@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment