patch-2.4.2 linux/drivers/acorn/scsi/Makefile

• Lines: 43
• Date: Thu Feb 8 16:32:44 2001
• Orig file: v2.4.1/linux/drivers/acorn/scsi/Makefile
• Orig date: Sun Aug 13 09:54:15 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/acorn/scsi/Makefile linux/drivers/acorn/scsi/Makefile
@@ -4,7 +4,7 @@
 
 USE_STANDARD_AS_RULE := true
 
-L_TARGET	:= acorn-scsi.a
+O_TARGET	:= acorn-scsi.o
 
 obj-y		:=
 obj-m		:=
@@ -24,31 +24,7 @@
 obj-$(CONFIG_SCSI_POWERTECSCSI)	+= powertec.o fas216.o queue.o msgqueue.o
 obj-$(CONFIG_SCSI_EESOXSCSI)	+= eesox.o fas216.o queue.o msgqueue.o
 
-# Extract lists of the multi-part drivers.
-# The 'int-*' lists are intermediate files used to build the multi's.
-
-multi-y		:= $(filter $(list-multi), $(obj-y))
-multi-m		:= $(filter $(list-multi), $(obj-m))
-int-y		:= $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
-int-m		:= $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
-
-# Files that are both resident and modular; remove from modular.
-
-obj-m		:= $(filter-out $(obj-y), $(obj-m))
-int-m		:= $(filter-out $(int-y), $(int-m))
-
-# Take multi-part drivers out of obj-y and put components in.
-
-obj-y		:= $(filter-out $(list-multi), $(obj-y)) $(int-y)
-
-# Translate to Rules.make lists.
-
-L_OBJS		:= $(filter-out $(export-objs), $(obj-y))
-LX_OBJS		:= $(filter     $(export-objs), $(obj-y))
-M_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-m)))
-MX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-m)))
-
 include $(TOPDIR)/Rules.make
 
-acornscsi_mod.o: acornscsi.o acornscsi-io.o
-	$(LD) $(LD_RFLAG) -r -o $@ acornscsi.o acornscsi-io.o
+acornscsi_mod.o: $(acornscsi_mod-objs)
+	$(LD) -r -o $@ $(acornscsi_mod-objs)