patch-2.4.3 linux/drivers/scsi/Makefile
Next file: linux/drivers/scsi/NCR53C9x.c
Previous file: linux/drivers/scsi/Config.in
Back to the patch index
Back to the overall index
- Lines: 74
- Date:
Mon Mar 26 15:36:30 2001
- Orig file:
v2.4.2/linux/drivers/scsi/Makefile
- Orig date:
Sat Dec 30 11:23:14 2000
diff -u --recursive --new-file v2.4.2/linux/drivers/scsi/Makefile linux/drivers/scsi/Makefile
@@ -14,6 +14,8 @@
MOD_IN_SUB_DIRS :=
ALL_SUB_DIRS := $(SUB_DIRS) pcmcia
+subdir-$(CONFIG_SCSI_AIC7XXX) += aic7xxx
+
ifeq ($(CONFIG_PCMCIA),y)
SUB_DIRS += pcmcia
MOD_IN_SUB_DIRS += pcmcia
@@ -24,7 +26,6 @@
endif
export-objs := scsi_syms.o
-list-multi := scsi_mod.o initio.o a100u2w.o
CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF
CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS
@@ -63,7 +64,7 @@
obj-$(CONFIG_SCSI_AHA152X) += aha152x.o
obj-$(CONFIG_SCSI_AHA1542) += aha1542.o
obj-$(CONFIG_SCSI_AHA1740) += aha1740.o
-obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx.o
+obj-$(CONFIG_SCSI_AIC7XXX_OLD) += aic7xxx_old.o
obj-$(CONFIG_SCSI_IPS) += ips.o
obj-$(CONFIG_SCSI_FD_MCS) += fd_mcs.o
obj-$(CONFIG_SCSI_FUTURE_DOMAIN)+= fdomain.o
@@ -112,20 +113,25 @@
obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o
obj-$(CONFIG_SCSI_FCAL) += fcal.o
+ifeq ($(CONFIG_ARCH_ACORN),y)
+mod-subdirs += ../acorn/scsi
+subdir-y += ../acorn/scsi
+obj-y += ../acorn/scsi/acorn-scsi.o
+endif
+
obj-$(CONFIG_CHR_DEV_ST) += st.o
obj-$(CONFIG_CHR_DEV_OSST) += osst.o
obj-$(CONFIG_BLK_DEV_SD) += sd_mod.o
obj-$(CONFIG_BLK_DEV_SR) += sr_mod.o
obj-$(CONFIG_CHR_DEV_SG) += sg.o
-
-
+list-multi := scsi_mod.o sd_mod.o sr_mod.o initio.o a100u2w.o
scsi_mod-objs := scsi.o hosts.o scsi_ioctl.o constants.o \
scsicam.o scsi_proc.o scsi_error.o \
scsi_obsolete.o scsi_queue.o scsi_lib.o \
scsi_merge.o scsi_dma.o scsi_scan.o \
scsi_syms.o
-
+sd_mod-objs := sd.o
sr_mod-objs := sr.o sr_ioctl.o sr_vendor.o
initio-objs := ini9100u.o i91uscsi.o
a100u2w-objs := inia100.o i60uscsi.o
@@ -136,8 +142,8 @@
scsi_mod.o: $(scsi_mod-objs)
$(LD) -r -o $@ $(scsi_mod-objs)
-sd_mod.o: sd.o
- $(LD) -r -o $@ sd.o
+sd_mod.o: $(sd_mod-objs)
+ $(LD) -r -o $@ $(sd_mod-objs)
sr_mod.o: $(sr_mod-objs)
$(LD) -r -o $@ $(sr_mod-objs)
@@ -147,7 +153,6 @@
a100u2w.o: $(a100u2w-objs)
$(LD) -r -o $@ $(a100u2w-objs)
-
53c8xx_d.h: 53c7,8xx.scr script_asm.pl
ln -sf 53c7,8xx.scr fake8.c
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)