summaryrefslogtreecommitdiffstats
path: root/net/decnet
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/decnet
parentc9c06167e7933d93a6e396174c68abf242294abb (diff)
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'net/decnet')
-rw-r--r--net/decnet/Makefile15
1 files changed, 5 insertions, 10 deletions
diff --git a/net/decnet/Makefile b/net/decnet/Makefile
index 03d35cc9c..ac7a1a462 100644
--- a/net/decnet/Makefile
+++ b/net/decnet/Makefile
@@ -1,18 +1,13 @@
# Note 2! The CFLAGS definition is now in the main makefile...
O_TARGET := decnet.o
-O_OBJS := af_decnet.o dn_nsp_in.o dn_nsp_out.o dn_route.o dn_dev.o dn_neigh.o dn_timer.o
-M_OBJS := $(O_TARGET)
+obj-y := af_decnet.o dn_nsp_in.o dn_nsp_out.o dn_route.o dn_dev.o dn_neigh.o dn_timer.o
+obj-m := $(O_TARGET)
-ifeq ($(CONFIG_DECNET_ROUTER),y)
-O_OBJS += dn_fib.o dn_rules.o dn_table.o
-endif
+obj-$(CONFIG_DECNET_ROUTER) += dn_fib.o dn_rules.o dn_table.o
+obj-$(CONFIG_DECNET_FW) += dn_fw.o
-ifeq ($(CONFIG_DECNET_FW),y)
-O_OBJS += dn_fw.o
-endif
-
-O_OBJS += sysctl_net_decnet.o
+obj-y += sysctl_net_decnet.o
include $(TOPDIR)/Rules.make