From 84f56dfa671653c5bedde0804f350aac3e269d60 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 26 Jul 2011 09:26:17 +0000
Subject: [PATCH] srpt: Change default build mode from release to debug. Add
 support for "make 2debug" / "make 2release" / "make 2perf".

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3759 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 Makefile          |  6 +++---
 srpt/Makefile     | 21 ++++++++++++++++++++-
 srpt/src/Makefile | 13 ++++++++-----
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index a81f0bcc4..712fff1d3 100644
--- a/Makefile
+++ b/Makefile
@@ -369,7 +369,7 @@ fcst_extraclean:
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
 #	patch -p0 <qla_isp-release.patch
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
-#	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
+	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
@@ -379,7 +379,7 @@ fcst_extraclean:
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
 #	patch -p0 <qla_isp-release.patch
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
-#	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
+	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
@@ -389,7 +389,7 @@ fcst_extraclean:
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
 #	patch -p0 -R <qla_isp-release.patch
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
-#	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
+	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
diff --git a/srpt/Makefile b/srpt/Makefile
index 1300517c6..4825b2822 100644
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -16,6 +16,10 @@ else
   KDIR ?= /lib/modules/$(KVER)/build
 endif
 
+# 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))
+
+
 # The file Modules.symvers has been renamed in the 2.6.18 kernel to
 # Module.symvers. Find out which name to use by looking in $(KDIR).
 MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Module.symvers ]; then \
@@ -99,4 +103,19 @@ clean:
 extraclean: clean
 	rm -f *.orig *.rej
 
-.PHONY: all install clean extraclean
+2debug:
+	-make clean
+	$(call set_var,build_mode,BUILDMODE,)
+	-cat build_mode
+
+2release:
+	-make clean
+	$(call set_var,build_mode,BUILDMODE,RELEASE)
+	-cat build_mode
+
+2perf:
+	-make clean
+	$(call set_var,build_mode,BUILDMODE,PERF)
+	-cat build_mode
+
+.PHONY: all install clean extraclean 2debug 2release 2perf
diff --git a/srpt/src/Makefile b/srpt/src/Makefile
index 4a7fda394..1e23d2b0a 100644
--- a/srpt/src/Makefile
+++ b/srpt/src/Makefile
@@ -1,10 +1,13 @@
+-include $(SUBDIRS)/../build_mode
+
 SCST_INC_DIR := $(SUBDIRS)/../../scst/include/
 
-EXTRA_CFLAGS +=  -I$(SCST_INC_DIR)
-#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
-#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG
-#EXTRA_CFLAGS += -g -fno-inline -fno-inline-functions
-#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
+SRPTFLAGS = -DCONFIG_SCST_TRACING -DCONFIG_SCST_DEBUG \
+	-DCONFIG_SCST_EXTRACHECKS -fno-inline -fno-inline-functions
+SRPTFLAGSRELEASE = -DCONFIG_SCST_TRACING
+SRPTFLAGSPERF =
+EXTRA_CFLAGS +=  -I$(SCST_INC_DIR) $(SRPTFLAGS$(BUILDMODE))
+
 #EXTRA_CFLAGS += -Wextra -Wno-unused-parameter
 
 obj-m		+= ib_srpt.o