patch-2.4.0-prerelease linux/drivers/sbus/Makefile

• Lines: 35
• Date: Fri Dec 29 14:07:22 2000
• Orig file: v2.4.0-test12/linux/drivers/sbus/Makefile
• Orig date: Tue Oct 31 12:42:26 2000

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/sbus/Makefile linux/drivers/sbus/Makefile
@@ -7,25 +7,17 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-SUB_DIRS     :=
-MOD_SUB_DIRS := $(SUB_DIRS) char audio
-ALL_SUB_DIRS := $(SUB_DIRS) char audio
-
-O_OBJS   := sbus.o dvma.o
 O_TARGET := sbus_all.o
-
-# Character devices for SBUS-based machines.
-#
-ifeq ($(CONFIG_SBUSCHAR),y)
-SUB_DIRS += char
-O_OBJS += char/sunchar.o
+ifneq ($(ARCH),m68k)
+obj-y    := sbus.o dvma.o
 endif
 
-# Audio devices for SBUS-based machines.
-#
-ifeq ($(CONFIG_SPARCAUDIO),y)
-SUB_DIRS += audio
-O_OBJS += audio/sparcaudio.o
-endif
+subdir-y += char
+subdir-m += char
+obj-$(CONFIG_SBUSCHAR) += char/sunchar.o
+
+subdir-y += audio
+subdir-m += audio
+obj-$(CONFIG_SPARCAUDIO) += audio/sparcaudio.o
 
 include $(TOPDIR)/Rules.make