patch-2.4.4 linux/drivers/s390/block/Makefile

• Lines: 50
• Date: Wed Apr 11 19:02:28 2001
• Orig file: v2.4.3/linux/drivers/s390/block/Makefile
• Orig date: Tue Feb 13 14:13:44 2001

diff -u --recursive --new-file v2.4.3/linux/drivers/s390/block/Makefile linux/drivers/s390/block/Makefile
@@ -1,34 +1,22 @@
-all: s390-block.o
+#
+# S/390 block devices
+#
 
-CFLAGS += 
 O_TARGET := s390-block.o
 
-DASD_OBJS := dasd.o
-  ifeq ($(CONFIG_DASD_ECKD),y)
-    DASD_OBJS += dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o
-  endif
-  ifeq ($(CONFIG_DASD_FBA),y)
-    DASD_OBJS += dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o
-  endif
-  ifeq ($(CONFIG_DASD_MDSK),y)
-    DASD_OBJS += dasd_mdsk.o
-  endif
-#  ifeq ($(CONFIG_DASD_CKD),y)
-#    DASD_OBJS += dasd_ckd.o
-#  endif
-
-ifeq ($(CONFIG_DASD),y)
-  obj-y += $(DASD_OBJS)
-else
-  ifeq ($(CONFIG_DASD),m)
-    obj-m += dasd_mod.o
-    D_OBJS += $(DASD_OBJS)
-  endif
-endif
+list-multi := dasd_mod.o
+export-objs := dasd.o
 
-obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
+dasd_mod-$(CONFIG_DASD_ECKD) += dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o
+dasd_mod-$(CONFIG_DASD_FBA) += dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o
+dasd_mod-$(CONFIG_DASD_DIAG) += dasd_diag.o
+dasd_mod-objs := dasd.o $(dasd_mod-y)
 
-dasd_mod.o: $(D_OBJS)
-	$(LD) $(LD_RFLAG) -r -o $@ $(D_OBJS)
+obj-$(CONFIG_DASD) += dasd_mod.o
+obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
 
 include $(TOPDIR)/Rules.make
+
+dasd_mod.o: $(dasd_mod-objs)
+	$(LD) -r -o $@ $(dasd_mod-objs)
+