summaryrefslogtreecommitdiffstats
path: root/drivers/nubus
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 /drivers/nubus
parentc9c06167e7933d93a6e396174c68abf242294abb (diff)
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'drivers/nubus')
-rw-r--r--drivers/nubus/Makefile16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/nubus/Makefile b/drivers/nubus/Makefile
index 4d42035c3..4df102258 100644
--- a/drivers/nubus/Makefile
+++ b/drivers/nubus/Makefile
@@ -11,17 +11,11 @@
L_TARGET := nubus.a
-ifeq ($(CONFIG_MODULES),y)
-O_TARGET := nubus_n_syms.o
-OX_OBJS := nubus_syms.o
-O_OBJS := nubus.o
-L_OBJS := nubus_n_syms.o
-else
-L_OBJS := nubus.o
-endif
+export-objs := nubus_syms.o
-ifdef CONFIG_PROC_FS
-L_OBJS += proc.o
-endif
+obj-y := nubus.o
+
+obj-$(CONFIG_MODULES) += nubus_syms.o
+obj-$(CONFIG_PROC_FS) += proc.o
include $(TOPDIR)/Rules.make