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

• Lines: 51
• Date: Tue Feb 13 14:13:44 2001
• Orig file: v2.4.1/linux/drivers/s390/block/Makefile
• Orig date: Fri May 12 11:41:44 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/s390/block/Makefile linux/drivers/s390/block/Makefile
@@ -2,30 +2,33 @@
 
 CFLAGS += 
 O_TARGET := s390-block.o
-O_OBJS   :=         
-M_OBJS   :=
 
-ifeq ($(CONFIG_DASD),y)
-  O_OBJS += dasd.o dasd_ccwstuff.o dasd_erp.o
-  ifeq ($(CONFIG_PROC_FS),y)
-   O_OBJS += dasd_proc.o dasd_profile.o
-  endif 
+DASD_OBJS := dasd.o
   ifeq ($(CONFIG_DASD_ECKD),y)
-   O_OBJS += dasd_eckd.o
-  endif 
+    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)
-   O_OBJS += dasd_mdsk.o
-  endif 
+    DASD_OBJS += dasd_mdsk.o
+  endif
 #  ifeq ($(CONFIG_DASD_CKD),y)
-#   O_OBJS += dasd_ckd.o
-#  endif 
-endif
+#    DASD_OBJS += dasd_ckd.o
+#  endif
 
-ifeq ($(CONFIG_MDISK),y)
-  O_OBJS += mdisk.o
+ifeq ($(CONFIG_DASD),y)
+  obj-y += $(DASD_OBJS)
+else
+  ifeq ($(CONFIG_DASD),m)
+    obj-m += dasd_mod.o
+    D_OBJS += $(DASD_OBJS)
+  endif
 endif
 
+obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
+
 dasd_mod.o: $(D_OBJS)
-	$(LD) $(LD_RFLAG) -r -o $@ $+
+	$(LD) $(LD_RFLAG) -r -o $@ $(D_OBJS)
 
 include $(TOPDIR)/Rules.make