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

• Lines: 55
• Date: Sun Mar 25 11:37:35 2001
• Orig file: v2.2.18/drivers/s390/block/Makefile
• Orig date: Sun Mar 25 11:28:27 2001

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.18/drivers/s390/block/Makefile linux/drivers/s390/block/Makefile
@@ -4,10 +4,11 @@
 O_TARGET := s390-block.o
 O_OBJS   := 
 M_OBJS   :=
-D_OBJS   :=
+MI_OBJS  :=
+MIX_OBJS :=
 
 ifeq ($(CONFIG_DASD),y)
-  O_OBJS += dasd.o
+  OX_OBJS += dasd.o
   ifeq ($(CONFIG_DASD_ECKD),y)
    O_OBJS += dasd_eckd.o  dasd_3990_erp.o dasd_9343_erp.o
   endif 
@@ -17,26 +18,20 @@
   ifeq ($(CONFIG_DASD_MDSK),y)
    O_OBJS += dasd_diag.o
   endif 
-#  ifeq ($(CONFIG_DASD_CKD),y)
-#   O_OBJS += dasd_ckd.o
-#  endif 
 endif
 
 ifeq ($(CONFIG_DASD),m)
   M_OBJS += dasd_mod.o
-  D_OBJS += dasd.o 
+  MIX_OBJS += dasd.o 
   ifeq ($(CONFIG_DASD_ECKD),y)
-   D_OBJS += dasd_eckd.o  dasd_3990_erp.o dasd_9343_erp.o
+   MI_OBJS += dasd_eckd.o  dasd_3990_erp.o dasd_9343_erp.o
   endif 
   ifeq ($(CONFIG_DASD_FBA),y)
-   D_OBJS += dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o
+   MI_OBJS += dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o
   endif 
   ifeq ($(CONFIG_DASD_MDSK),y)
-   D_OBJS += dasd_diag.o
+   MI_OBJS += dasd_diag.o
   endif 
-#  ifeq ($(CONFIG_DASD_CKD),y)
-#   O_OBJS += dasd_ckd.o
-#  endif 
 endif
 
 ifeq ($(CONFIG_MDISK),y)
@@ -51,7 +46,7 @@
  endif
 endif
 
-dasd_mod.o: $(D_OBJS)
-	$(LD) $(LD_RFLAG) -r -o $@ $(D_OBJS)
+dasd_mod.o: $(MI_OBJS) $(MIX_OBJS)
+	$(LD) $(LD_RFLAG) -r -o $@ $(MI_OBJS) $(MIX_OBJS)
 
 include $(TOPDIR)/Rules.make