patch-2.4.19 linux-2.4.19/drivers/scsi/aic7xxx/Makefile

Next file: linux-2.4.19/drivers/scsi/aic7xxx/aic7770.c
Previous file: linux-2.4.19/drivers/scsi/aic7xxx/Config.in
Back to the patch index
Back to the overall index

diff -urN linux-2.4.18/drivers/scsi/aic7xxx/Makefile linux-2.4.19/drivers/scsi/aic7xxx/Makefile
@@ -6,35 +6,38 @@
 
 O_TARGET := aic7xxx_drv.o
 
-list-multi	:= aic7xxx_mod.o
+list-multi	:= aic7xxx.o
 
-obj-$(CONFIG_SCSI_AIC7XXX)	+= aic7xxx_mod.o
+obj-$(CONFIG_SCSI_AIC7XXX)	+= aic7xxx.o
 
 #EXTRA_CFLAGS += -g
 
 # Platform Specific Files
-AIC7XXX_OBJS = aic7xxx_linux.o 
-AIC7XXX_OBJS += aic7xxx_proc.o aic7770_linux.o
+obj-aic7xxx = aic7xxx_osm.o aic7xxx_proc.o aic7770_osm.o
 #PCI Specific Platform Files
 ifeq ($(CONFIG_PCI),y)
-AIC7XXX_OBJS += aic7xxx_linux_pci.o
+obj-aic7xxx += aic7xxx_osm_pci.o
 endif
 # Core Files
-AIC7XXX_OBJS += aic7xxx.o aic7xxx_93cx6.o aic7770.o
+obj-aic7xxx += aic7xxx_core.o aic7xxx_93cx6.o aic7770.o
 #PCI Specific Core Files
 ifeq ($(CONFIG_PCI),y)
-AIC7XXX_OBJS += aic7xxx_pci.o
+obj-aic7xxx += aic7xxx_pci.o
 endif
 
 # Override our module desitnation
-MOD_TARGET = aic7xxx.o
+MOD_DESTDIR = $(shell cd .. && $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)
 
 include $(TOPDIR)/Rules.make
 
-aic7xxx_mod.o: aic7xxx_seq.h aic7xxx_reg.h $(AIC7XXX_OBJS)
-	$(LD) $(LD_RFLAG) -r -o $@ $(AIC7XXX_OBJS)
+aic7xxx.o: $(obj-aic7xxx)
+	$(LD) $(LD_RFLAG) -r -o $@ $(obj-aic7xxx)
 
 ifeq ($(CONFIG_AIC7XXX_BUILD_FIRMWARE),y)
+aic7xxx_core.o: aic7xxx_seq.h
+
+$(obj-aic7xxx): aic7xxx_reg.h
+
 aic7xxx_seq.h aic7xxx_reg.h: aic7xxx.seq aic7xxx.reg aicasm/aicasm
 	aicasm/aicasm -I. -r aic7xxx_reg.h -o aic7xxx_seq.h aic7xxx.seq
 endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)