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

Next file: linux/drivers/scsi/Config.in
Previous file: linux/drivers/sbus/audio/dmy.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/sbus/char/Makefile linux/drivers/sbus/char/Makefile
@@ -8,26 +8,18 @@
 #
 
 O_TARGET := sunchar.o
-O_OBJS   := ${O_OBJ} sunkbd.o sunkbdmap.o sunmouse.o sunserial.o zs.o
 
-vfc-objs := vfc_dev.o vfc_i2c.o
+export-objs := su.o
+obj-y := sunkbd.o sunkbdmap.o sunmouse.o sunserial.o zs.o
 
-ifeq ($(CONFIG_PCI),y)
-OX_OBJS	+= su.o
-O_OBJS	+= pcikbd.o
-endif
+vfc-objs := vfc_dev.o vfc_i2c.o
 
-ifeq ($(ARCH),sparc64)
+obj-$(CONFIG_PCI) += su.o pcikbd.o
 
-ifeq ($(CONFIG_PCI),y)
 obj-$(CONFIG_SAB82532)			+= sab82532.o
 obj-$(CONFIG_ENVCTRL)			+= envctrl.o
 obj-$(CONFIG_DISPLAY7SEG)		+= display7seg.o
-endif
-
 obj-$(CONFIG_OBP_FLASH)			+= flash.o
-endif
-
 obj-$(CONFIG_SUN_OPENPROMIO)		+= openprom.o
 obj-$(CONFIG_SUN_MOSTEK_RTC)		+= rtc.o
 obj-$(CONFIG_SUN_BPP)			+= bpp.o
@@ -35,9 +27,6 @@
 obj-$(CONFIG_SUN_AURORA)		+= aurora.o
 obj-$(CONFIG_TADPOLE_TS102_UCTRL)	+= uctrl.o
 obj-$(CONFIG_SUN_JSFLASH)		+= jsflash.o
-
-O_OBJS	+= $(obj-y)
-M_OBJS	:= $(obj-m)
 
 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)