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

fcst, srpt: Move the build_mode file to the top level

Browse Source 
Additionally, rename BUILDMODE into BUILD_MODE and FCST/SRPTFLAGS into
BUILD_MODE_CFLAGS_.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8073 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-03-25 19:46:24 +00:00
parent 50bb06cc55
commit ef99fe40be
5 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -54,6 +54,15 @@ EMULEX_DIR=emulex
ISCSI_DIR=iscsi-scst
# Set variable $(2) to value $(3) in file $(1) if $(2)=$(3) does not yet occur
# in file $(1).
set_var = $(shell if grep -q '^$(2)=' '$(1)'; then \
grep -q '^$(2)=$(3)$$' '$(1)' || \
sed -i 's/^$(2)=.*/$(2)=$(3)/' '$(1)'; \
else \
echo '$(2)=$(3)' >> '$(1)'; \
fi)
REVISION ?= $(shell if [ -e .svn ]; then \
svn info | sed -n 's/^Revision:[[:blank:]]*/./p'; \
elif [ -e .git ]; then \
@@ -544,6 +553,7 @@ release-archive:
$(MAKE) 2debug
2perf: extraclean
$(call set_var,build_mode,BUILD_MODE,PERF)
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
@@ -555,6 +565,7 @@ release-archive:
@if [ -d $(FCST_DIR) ]; then cd $(FCST_DIR) && $(MAKE) $@; fi
2release: extraclean
$(call set_var,build_mode,BUILD_MODE,RELEASE)
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
@@ -566,6 +577,7 @@ release-archive:
@if [ -d $(FCST_DIR) ]; then cd $(FCST_DIR) && $(MAKE) $@; fi
2debug: extraclean
$(call set_var,build_mode,BUILD_MODE,)
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi

14
fcst/Makefile
View File

@@ -30,17 +30,6 @@
export PWD := $(shell pwd)
export CONFIG_FCST := m
# Set variable $(2) to value $(3) in file $(1).
set_var = $(shell { if [ -e "$(1)" ]; then grep -v '^$(2)=' "$(1)"; fi; echo "$(2)=$(3)"; } >/tmp/$(1)-$$$$.tmp && mv /tmp/$(1)-$$$$.tmp $(1))
FCSTFLAGS = -DDEBUG_WORK_IN_THREAD -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \
-DCONFIG_SCST_EXTRACHECKS -fno-inline -fno-inline-functions
FCSTFLAGSRELEASE = -DCONFIG_SCST_TRACING
FCSTFLAGSPERF =
EXTRA_CFLAGS += -I$(SCST_INC_DIR) $(FCSTFLAGS$(BUILDMODE))
MODULE_NAME = fcst
ifneq ($(KERNELRELEASE),)
@@ -128,15 +117,12 @@ extraclean: clean
2debug:
-$(MAKE) clean
$(call set_var,build_mode,BUILDMODE,)
2release:
-$(MAKE) clean
$(call set_var,build_mode,BUILDMODE,RELEASE)
2perf:
-$(MAKE) clean
$(call set_var,build_mode,BUILDMODE,PERF)
release-archive:
../scripts/generate-release-archive fcst "$$(sed -n 's/^#define[[:blank:]]FT_VERSION[[:blank:]]*\"\([^\"]*\)\".*/\1/p' fcst.h)"

11
fcst/Makefile_in-tree
View File

@@ -1,3 +1,14 @@
-include $(KBUILD_EXTMOD)/../build_mode
echo := $(shell echo "fcst build mode: $(BUILD_MODE)" >& 2)
BUILD_MODE_CFLAGS_ = -DDEBUG_WORK_IN_THREAD -DCONFIG_SCST_TRACING \
-DCONFIG_SCST_DEBUG -DCONFIG_SCST_EXTRACHECKS \
-fno-inline -fno-inline-functions
BUILD_MODE_CFLAGS_RELEASE = -DCONFIG_SCST_TRACING
BUILD_MODE_CFLAGS_PERF =
EXTRA_CFLAGS += -I$(SCST_INC_DIR) $(BUILD_MODE_CFLAGS_$(BUILD_MODE))
obj-$(CONFIG_FCST) += fcst.o
fcst-objs := \

7
srpt/Makefile
View File

@@ -42,10 +42,6 @@ endif
INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
# Set variable $(2) to value $(3) in file $(1).
set_var = $(shell { if [ -e "$(1)" ]; then grep -v '^$(2)=' "$(1)"; fi; echo "$(2)=$(3)"; } >/tmp/$(1)-$$$$.tmp && mv /tmp/$(1)-$$$$.tmp $(1))
SRC_FILES=$(wildcard */*.[ch])
# The file Modules.symvers has been renamed in the 2.6.18 kernel to
@@ -297,15 +293,12 @@ conftest/use_pre_440_wr_structure/result-$(KVER).txt: \
2debug:
-$(MAKE) clean
$(call set_var,build_mode,BUILDMODE,)
2release:
-$(MAKE) clean
$(call set_var,build_mode,BUILDMODE,RELEASE)
2perf:
-$(MAKE) clean
$(call set_var,build_mode,BUILDMODE,PERF)
release-archive:
../scripts/generate-release-archive srpt "$$(sed -n 's/^#define[[:blank:]]DRV_VERSION[[:blank:]]*\"\([^\"]*\)\".*/\1/p' src/ib_srpt.c)"

12
srpt/src/Makefile
View File

@@ -2,13 +2,15 @@ LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
CPPFLAGS := $(PRE_CFLAGS) $(CPPFLAGS)
EXTRA_CFLAGS += -I$(SCST_INC_DIR)
-include $(KBUILD_EXTMOD)/../build_mode
-include $(KBUILD_EXTMOD)/../../build_mode
SRPTFLAGS = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \
echo := $(shell echo "srpt build mode: $(BUILD_MODE)" >& 2)
BUILD_MODE_CFLAGS_ = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \
-DCONFIG_SCST_EXTRACHECKS -fno-inline -fno-inline-functions
SRPTFLAGSRELEASE = -DCONFIG_SCST_TRACING
SRPTFLAGSPERF =
EXTRA_CFLAGS += $(SRPTFLAGS$(BUILDMODE))
BUILD_MODE_CFLAGS_RELEASE = -DCONFIG_SCST_TRACING
BUILD_MODE_CFLAGS_PERF =
EXTRA_CFLAGS += $(BUILD_MODE_CFLAGS_$(BUILD_MODE))
#EXTRA_CFLAGS += -Wextra -Wno-unused-parameter