patch-2.4.0-prerelease linux/net/core/Makefile

Next file: linux/net/core/skbuff.c
Previous file: linux/net/bridge/br_input.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test12/linux/net/core/Makefile linux/net/core/Makefile
@@ -9,35 +9,23 @@
 
 O_TARGET := core.o
 
-O_OBJS	:= sock.o skbuff.o iovec.o datagram.o scm.o
+export-objs := netfilter.o profile.o
+
+obj-y := sock.o skbuff.o iovec.o datagram.o scm.o
 
 ifeq ($(CONFIG_SYSCTL),y)
 ifeq ($(CONFIG_NET),y)
-O_OBJS += sysctl_net_core.o
-endif
+obj-y += sysctl_net_core.o
 endif
-
-ifdef CONFIG_FILTER
-O_OBJS += filter.o
-endif
-
-ifdef CONFIG_NET
-
-O_OBJS	+= dev.o dev_mcast.o dst.o neighbour.o rtnetlink.o utils.o
-
-ifdef CONFIG_NETFILTER
-OX_OBJS += netfilter.o
 endif
 
-ifeq ($(CONFIG_NET_DIVERT),y)
-O_OBJS += dv.o
-endif
+obj-$(CONFIG_FILTER) += filter.o
 
-endif
+obj-$(CONFIG_NET) += dev.o dev_mcast.o dst.o neighbour.o rtnetlink.o utils.o
 
-ifdef CONFIG_NET_PROFILE
-OX_OBJS += profile.o
-endif
+obj-$(CONFIG_NETFILTER) += netfilter.o
+obj-$(CONFIG_NET_DIVERT) += dv.o
+obj-$(CONFIG_NET_PROFILE) += profile.o
 
 include $(TOPDIR)/Rules.make
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)