Use $(src) instead of $(KBUILD_EXTMOD)

While $(src) is always defined, $(KBUILD_EXTMOD) is only defined when
building code as an external module.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8999 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2020-06-01 02:12:09 +00:00
parent f7fe23928f
commit 80ac4d2810
8 changed files with 10 additions and 12 deletions
+1 -1
View File
@@ -33,7 +33,7 @@ export CONFIG_FCST := m
MODULE_NAME = fcst
ifneq ($(KERNELRELEASE),)
include $(KBUILD_EXTMOD)/Makefile_in-tree
include $(src)/Makefile_in-tree
else
######### BEGIN OUT-OF-TREE RULES #########
+1 -3
View File
@@ -1,6 +1,4 @@
ifneq ($(and $(KBUILD_EXTMOD),$(if $(findstring $(abspath $(srctree)),$(abspath $(KBUILD_EXTMOD))),,true)),)
ccflags-y += -I$(KBUILD_EXTMOD)/../scst/include
endif
ccflags-y += -I$(src)/../scst/include
obj-$(CONFIG_FCST) += fcst.o
+1 -1
View File
@@ -21,7 +21,7 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
ccflags-y += -I$(src)/../../include -I$(KBUILD_EXTMOD)/../../../scst/include
ccflags-y += -I$(src)/../../include -I$(src)/../../../scst/include
ccflags-y += $(call cc-option,-Wextra) \
$(call cc-option,-Wno-old-style-declaration) \
-Wno-unused-parameter -Wno-missing-field-initializers
+2 -2
View File
@@ -54,13 +54,13 @@ endif
ifeq ($(BUILD_2X_MODULE),)
QLA2XXX_INC_DIR := $(KDIR)/drivers/scsi/qla2xxx
else
QLA2XXX_INC_DIR := $(KBUILD_EXTMOD)/..
QLA2XXX_INC_DIR := $(src)/..
QLA2XXX_DIR := $(shell pwd)/..
QLA2XXX_SCST := qla2xxx_scst
endif
ifneq ($(PATCHLEVEL),)
ccflags-y += -I$(KBUILD_EXTMOD)/../../scst/include
ccflags-y += -I$(src)/../../scst/include
ccflags-y += -W -Wno-unused-parameter -Wno-missing-field-initializers
#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_SRR
+2 -2
View File
@@ -53,13 +53,13 @@ endif
ifeq ($(BUILD_2X_MODULE),)
QLA2XXX_INC_DIR := $(KDIR)/drivers/scsi/qla2xxx
else
QLA2XXX_INC_DIR := $(KBUILD_EXTMOD)/..
QLA2XXX_INC_DIR := $(src)/..
QLA2XXX_DIR := $(shell pwd)/..
QLA2XXX_SCST := qla2xxx_scst
endif
ifneq ($(PATCHLEVEL),)
ccflags-y += -I$(KBUILD_EXTMOD)/../../scst/include
ccflags-y += -I$(src)/../../scst/include
ccflags-y += -W -Wno-unused-parameter -Wno-missing-field-initializers
#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_SRR
+1 -1
View File
@@ -38,7 +38,7 @@ DEV_HANDLERS_DIR = dev_handlers
ifneq ($(PATCHLEVEL),)
# See also Documentation/core-api/symbol-namespaces.rst for more information
# about DEFAULT_SYMBOL_NAMESPACE.
ccflags-y += -I$(KBUILD_EXTMOD)/../include $(call cc-option,-Wextra) \
ccflags-y += -I$(src)/../include $(call cc-option,-Wextra) \
-Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare\
-DDEFAULT_SYMBOL_NAMESPACE=SCST\
$(shell [ -n "${CONFIG_SCST_NO_DLM}" ] && echo -DCONFIG_SCST_NO_DLM)
+1 -1
View File
@@ -7,7 +7,7 @@ SHELL=/bin/bash
KMOD := $(shell pwd)/kernel
ifneq ($(PATCHLEVEL),)
ccflags-y += -I$(KBUILD_EXTMOD)/../scst/include
ccflags-y += -I$(src)/../scst/include
ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter\
-Wno-missing-field-initializers
+1 -1
View File
@@ -1,6 +1,6 @@
LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
CPPFLAGS := $(PRE_CFLAGS) $(CPPFLAGS)
ccflags-y += -I$(KBUILD_EXTMOD)/../../scst/include
ccflags-y += -I$(src)/../../scst/include
#ccflags-y += -Wextra -Wno-unused-parameter