mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-10-01 12:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefiles: Remove most instances of $(SCST_INC_DIR)

Browse Source 
Move the $(SCST_INC_DIR) definitions from the out-of-tree sections into
the in-kernel sections. Since SCST is now distributed as a single tar
archive, only support in-tree builds with $(SCST_INC_DIR) and $(SCST_DIR).


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8079 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-03-25 22:10:21 +00:00
parent bd373cfa6e
commit dc7e039124
13 changed files with 31 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fcst/Makefile
+4 -10
View File
@@ -60,24 +60,18 @@ endif
INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
SCST_INC_DIR := $(shell if [ -e "$$PWD/../scst" ]; \
then echo "$$PWD/../scst/include"; \
else echo "$(DESTDIR)$(PREFIX)/include/scst"; fi)
SCST_DIR := $(shell if [ -e "$$PWD/../scst" ]; then echo "$$PWD/../scst/src"; \
else echo "$(DESTDIR)$(PREFIX)/include/scst"; fi)
SCST_DIR := $(shell echo "$$PWD")/../scst
all: Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
SCST_INC_DIR=$(SCST_INC_DIR)
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m
tgt: Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=n \
SCST_INC_DIR=$(SCST_INC_DIR)
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=n
install: all
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
SCST_INC_DIR=$(SCST_INC_DIR) modules_install
modules_install
ins:
./config
fcst/Makefile_in-tree
+2 -1
View File
@@ -7,7 +7,8 @@ BUILD_MODE_CFLAGS_ = -DDEBUG_WORK_IN_THREAD -DCONFIG_SCST_TRACING \
-fno-inline -fno-inline-functions
BUILD_MODE_CFLAGS_RELEASE = -DCONFIG_SCST_TRACING
BUILD_MODE_CFLAGS_PERF =
ccflags-y += -I$(SCST_INC_DIR) $(BUILD_MODE_CFLAGS_$(BUILD_MODE))
ccflags-y += -I$(KBUILD_EXTMOD)/../scst/include
ccflags-y += $(BUILD_MODE_CFLAGS_$(BUILD_MODE))
obj-$(CONFIG_FCST) += fcst.o