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

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

diff -u --recursive --new-file v2.4.1/linux/drivers/acorn/block/Makefile linux/drivers/acorn/block/Makefile
@@ -11,7 +11,7 @@
 
 USE_STANDARD_AS_RULE := true
 
-L_TARGET	:= acorn-block.a
+O_TARGET	:= acorn-block.o
 
 obj-y		:=
 obj-m		:=
@@ -24,36 +24,12 @@
 mfmhd_mod-objs	:= mfmhd.o mfm.o
 
 obj-$(CONFIG_BLK_DEV_FD1772)	+= fd1772_mod.o
-obj-$(CONFIG_BLK_DEV_MFM)	+= mfmhd.o mfm.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)))
+obj-$(CONFIG_BLK_DEV_MFM)	+= mfmhd_mod.o
 
 include $(TOPDIR)/Rules.make
 
-fd1772_mod.o: $(FLOPPY)
-	$(LD) -r -o $@ $(FLOPPY)
+fd1772_mod.o: $(fd1772_mod-objs)
+	$(LD) -r -o $@ $(fd1772_mod-objs)
 
-mfmhd_mod.o: mfmhd.o mfm.o
-	$(LD) -r -o $@ mfmhd.o mfm.o
+mfmhd_mod.o: $(mfmhd_mod-objs)
+	$(LD) -r -o $@ $(mfmhd_mod-objs)