From 2211857c67f1674bcfdc50b603aefef87af8525d Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Sat, 5 Jul 2008 20:19:11 +0000 Subject: [PATCH] Copy Modules.symvers stuff from qla2x00t makefiles to avoid undefined symbols warrning. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@429 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla_isp/linux-2.6/Makefile | 26 ++++++++++++++++++++++++-- qla_isp/linux-2.6/build/Makefile | 5 ++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/qla_isp/linux-2.6/Makefile b/qla_isp/linux-2.6/Makefile index 76831f6e5..76a887f40 100644 --- a/qla_isp/linux-2.6/Makefile +++ b/qla_isp/linux-2.6/Makefile @@ -33,11 +33,16 @@ else LINUX = ${KDIR} endif +M ?= $(CURDIR) +TDIR = $(M)/../ +SCST_INC = ${TDIR}/../scst/include +SCST_DIR = ${TDIR}/../scst/src + all: links @$(MAKE) -C ${LINUX} M=${CURDIR}/build -tgt: links - @$(MAKE) -C ${LINUX} M=${CURDIR}/build ISP_TARGET_MODE=1 +tgt: links Modules.symvers Module.symvers + @$(MAKE) -C ${LINUX} M=${CURDIR}/build SCST_INC=$(SCST_INC) ISP_TARGET_MODE=1 clean: @$(MAKE) -C ${LINUX} M=${CURDIR}/build clean @@ -63,3 +68,20 @@ tags: FRC FRC: +SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null) +ifneq ($(SCST_MOD_VERS),) +Modules.symvers: $(SCST_DIR)/Modules.symvers + cp $(SCST_DIR)/Modules.symvers ${CURDIR}/build +else +.PHONY: Modules.symvers +endif + +# It's renamed in 2.6.18 +SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Module.symvers 2>/dev/null) +ifneq ($(SCST_MOD_VERS),) +Module.symvers: $(SCST_DIR)/Module.symvers + cp $(SCST_DIR)/Module.symvers ${CURDIR}/build +else +.PHONY: Module.symvers +endif + diff --git a/qla_isp/linux-2.6/build/Makefile b/qla_isp/linux-2.6/build/Makefile index 490b0017f..96ba94801 100644 --- a/qla_isp/linux-2.6/build/Makefile +++ b/qla_isp/linux-2.6/build/Makefile @@ -30,12 +30,11 @@ COM_OBJ = isp.o isp_library.o isp_target.o LNX_OBJ = isp_cb_ops.o isp_linux.o isp_pci.o COM_DIR = ${TDIR}/common LNX_DIR = ${TDIR}/linux -SCST_DIR = ${TDIR}/../scst/include STG_SRC = isp_scst.c -#EXTRA_CFLAGS += -Wall -Werror -Idrivers/scsi -I${COM_DIR} -I${LNX_DIR} -I${TDIR}/firmware -I${SCST_DIR} -EXTRA_CFLAGS += -Wall -Idrivers/scsi -I${COM_DIR} -I${LNX_DIR} -I${TDIR}/firmware -I${SCST_DIR} +#EXTRA_CFLAGS += -Wall -Werror -Idrivers/scsi -I${COM_DIR} -I${LNX_DIR} -I${TDIR}/firmware -I${SCST_INC} +EXTRA_CFLAGS += -Wall -Idrivers/scsi -I${COM_DIR} -I${LNX_DIR} -I${TDIR}/firmware -I${SCST_INC} clean-files := *.o scsi_target_ctl Module.symvers