Import of Linux/MIPS 1.3.0

1 files changed, 41 insertions, 11 deletions

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index d4500bee3..860ac40dc 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -2,14 +2,18 @@
 # Makefile for kernel/blk_drv/scsi
 #
 # Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DONT put your own dependencies here
-# unless its something special (ie not a .c file).
+# removes any old dependencies. DON'T put your own dependencies here
+# unless it's something special (ie not a .c file).
 #
 
-#AHA152X	= -DDEBUG -DAUTOCONF -DIRQ=11 -DSCSI_ID=7 -DRECONNECT=0 \
-#          -DPORTBASE=0x340 -DSKIP_BIOSTEST -DDONT_SNARF
+.c.s:
+	$(CC) $(CFLAGS) -S $<
+.s.o:
+	$(AS) -c -o $*.o $<
+.c.o:
+	$(CC) $(CFLAGS) -c $<
 
-AHA152X	= -DDEBUG_AHA152X -DAUTOCONF
+AHA152X	= -DDEBUG_AHA152X -DAUTOCONF -DSKIP_BIOSTEST -DIRQ=11
 
 ifeq (${CFLAGS},)
 CFLAGS = -D__KERNEL__=1 \
@@ -21,6 +25,7 @@ endif
 
 SCSI_OBJS =
 SCSI_SRCS =
+SCSI_MODULE_OBJS =
 
 ifdef CONFIG_SCSI
 
@@ -47,9 +52,11 @@ SCSI_OBJS := $(SCSI_OBJS) sg.o
 SCSI_SRCS := $(SCSI_SRCS) sg.c
 endif
 
+SCSI_SRCS := $(SCSI_SRCS) qlogic.c
 ifdef CONFIG_SCSI_QLOGIC
 SCSI_OBJS := $(SCSI_OBJS) qlogic.o
-SCSI_SRCS := $(SCSI_SRCS) qlogic.c
+else
+SCSI_MODULE_OBJS := $(SCSI_MODULE_OBJS) qlogic.o
 endif
 
 ifdef CONFIG_SCSI_AHA152X
@@ -58,8 +65,10 @@ SCSI_SRCS := $(SCSI_SRCS) aha152x.c
 endif
 
 ifdef CONFIG_SCSI_AHA1542
-SCSI_OBJS := $(SCSI_OBJS) aha1542.o
 SCSI_SRCS := $(SCSI_SRCS) aha1542.c
+SCSI_OBJS := $(SCSI_OBJS) aha1542.o
+else
+SCSI_MODULE_OBJS := $(SCSI_MODULE_OBJS) aha1542.o
 endif
 
 ifdef CONFIG_SCSI_AHA1740
@@ -77,14 +86,25 @@ SCSI_OBJS := $(SCSI_OBJS) buslogic.o
 SCSI_SRCS := $(SCSI_SRCS) buslogic.c
 endif
 
+SCSI_SRCS := $(SCSI_SRCS) eata_dma.c
+ifdef CONFIG_SCSI_EATA_DMA
+SCSI_OBJS := $(SCSI_OBJS) eata_dma.o
+else
+SCSI_MODULE_OBJS := $(SCSI_MODULE_OBJS) eata_dma.o
+endif
+
 ifdef CONFIG_SCSI_U14_34F
 SCSI_OBJS := $(SCSI_OBJS) u14-34f.o
 SCSI_SRCS := $(SCSI_SRCS) u14-34f.c
+else
+SCSI_MODULE_OBJS := $(SCSI_MODULE_OBJS) u14-34f.o
 endif
 
 ifdef CONFIG_SCSI_DEBUG
-SCSI_OBJS := $(SCSI_OBJS) scsi_debug.o
 SCSI_SRCS := $(SCSI_SRCS) scsi_debug.c
+SCSI_OBJS := $(SCSI_OBJS) scsi_debug.o
+else
+SCSI_MODULE_OBJS := $(SCSI_MODULE_OBJS) scsi_debug.o
 endif
 
 ifdef CONFIG_SCSI_FUTURE_DOMAIN
@@ -93,8 +113,10 @@ SCSI_SRCS := $(SCSI_SRCS) fdomain.c
 endif
 
 ifdef CONFIG_SCSI_IN2000
-SCSI_OBJS := $(SCSI_OBJS) in2000.o
 SCSI_SRCS := $(SCSI_SRCS) in2000.c
+SCSI_OBJS := $(SCSI_OBJS) in2000.o
+else
+SCSI_MODULE_OBJS := $(SCSI_MODULE_OBJS) in2000.o
 endif
 
 ifdef CONFIG_SCSI_GENERIC_NCR5380
@@ -105,6 +127,8 @@ endif
 ifdef CONFIG_SCSI_NCR53C7xx
 SCSI_OBJS := $(SCSI_OBJS) 53c7,8xx.o 
 SCSI_SRCS := $(SCSI_SRCS) 53c7,8xx.c
+else
+SCSI_MODULE_OBJS := $(SCSI_MODULE_OBJS) 53c7,8xx.o
 endif
 
 ifdef CONFIG_SCSI_PAS16
@@ -140,6 +164,8 @@ endif
 ifdef CONFIG_SCSI_EATA
 SCSI_OBJS := $(SCSI_OBJS) eata.o
 SCSI_SRCS := $(SCSI_SRCS) eata.c
+else
+SCSI_MODULE_OBJS := $(SCSI_MODULE_OBJS) eata.o
 endif
 
 
@@ -166,13 +192,18 @@ seagate.o: seagate.c
 
 53c8xx_d.h 53c8xx_u.h : 53c7,8xx.scr script_asm.pl
 	ln 53c7,8xx.scr fake.c
-	$(CPP) -DCHIP=810 fake.c | grep -v ^# | perl script_asm.pl 
+	$(CPP) -traditional -DCHIP=810 fake.c | grep -v '^#' | perl script_asm.pl 
 	mv script.h 53c8xx_d.h
 	mv scriptu.h 53c8xx_u.h
 	rm fake.c
 
+modules: $(SCSI_MODULE_OBJS)
+	echo $(SCSI_MODULE_OBJS) > ../../modules/SCSI_MODULES
+	(cd ../../modules;for i in $(SCSI_MODULE_OBJS); do ln -sf ../drivers/scsi/$$i .; done)
+
 dep:
 	$(CPP) -M $(AHA152X) $(SCSI_SRCS) > .depend
+	$(CPP) -M -DMODULE $(SCSI_MODULE_OBJS:.o=.c) >> .depend
 
 else
 
@@ -185,7 +216,6 @@ dep:
 
 endif
 
-
 #
 # include a dependency file if one exists
 #