summaryrefslogtreecommitdiffstats
path: root/net/netlink
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-01-10 17:17:53 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-01-10 17:17:53 +0000
commitb2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch)
tree954a648692e7da983db1d2470953705f6a729264 /net/netlink
parentc9c06167e7933d93a6e396174c68abf242294abb (diff)
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'net/netlink')
-rw-r--r--net/netlink/Makefile13
1 files changed, 4 insertions, 9 deletions
diff --git a/net/netlink/Makefile b/net/netlink/Makefile
index da89d0af0..15edc5301 100644
--- a/net/netlink/Makefile
+++ b/net/netlink/Makefile
@@ -9,17 +9,12 @@
O_TARGET := netlink.o
-O_OBJS :=
-OX_OBJS := af_netlink.o
+export-objs := af_netlink.o
-M_OBJS :=
+obj-y := af_netlink.o
-ifeq ($(CONFIG_NETLINK_DEV), y)
- O_OBJS += netlink_dev.o
-endif
+obj-m :=
-ifeq ($(CONFIG_NETLINK_DEV), m)
- M_OBJS += netlink_dev.o
-endif
+obj-$(CONFIG_NETLINK_DEV) += netlink_dev.o
include $(TOPDIR)/Rules.make