From 35754e7f26762b6336ac212c51e629e474e01fe7 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Thu, 2 Oct 2008 10:46:47 +0000
Subject: [PATCH] Minor fixes and changes

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@508 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 Makefile                          | 15 ++++++++-------
 scripts/generate-kernel-patch     | 14 ++++----------
 scst/kernel/in-tree/Makefile.scst |  2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 68de2f883..92ce912cd 100644
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,7 @@ extraclean:
 	@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
 
 scst: 
-	cd $(SCST_DIR) && $(MAKE)
+	cd $(SCST_DIR) && $(MAKE) all
 
 scst_install: 
 	cd $(SCST_DIR) && $(MAKE) install
@@ -154,7 +154,7 @@ scst_extraclean:
 	cd $(SCST_DIR) && $(MAKE) extraclean
 
 scstadm:
-	cd $(SCSTADM_DIR) && $(MAKE)
+	cd $(SCSTADM_DIR) && $(MAKE) all
 
 scstadm_install: 
 	cd $(SCSTADM_DIR) && $(MAKE) install
@@ -169,7 +169,7 @@ scstadm_extraclean:
 	cd $(SCSTADM_DIR) && $(MAKE) extraclean
 
 qla:
-	cd $(QLA_DIR) && $(MAKE)
+	cd $(QLA_DIR) && $(MAKE) all
 
 qla_install:
 	cd $(QLA_DIR) && $(MAKE) install
@@ -186,7 +186,7 @@ qla_extraclean:
 	cd $(QLA_DIR) && $(MAKE) extraclean
 
 qla_isp:
-	cd $(QLA_ISP_DIR) && $(MAKE)
+	cd $(QLA_ISP_DIR) && $(MAKE) all
 
 qla_isp_install:
 	cd $(QLA_ISP_DIR) && $(MAKE) install
@@ -201,7 +201,7 @@ qla_isp_extraclean:
 	cd $(QLA_ISP_DIR) && $(MAKE) extraclean
 
 iscsi:
-	cd $(ISCSI_DIR) && $(MAKE)
+	cd $(ISCSI_DIR) && $(MAKE) all
 
 iscsi_install:
 	cd $(ISCSI_DIR) && $(MAKE) DISTDIR=$(ISCSI_DISTDIR) install
@@ -216,7 +216,7 @@ iscsi_extraclean:
 	cd $(ISCSI_DIR) && $(MAKE) extraclean
 
 lsi:
-	cd $(LSI_DIR) && $(MAKE)
+	cd $(LSI_DIR) && $(MAKE) all
 
 lsi_install:
 	cd $(LSI_DIR) && $(MAKE) install
@@ -231,7 +231,7 @@ lsi_extraclean:
 	cd $(LSI_DIR) && $(MAKE) extraclean
 
 srpt:
-	cd $(SRP_DIR) && $(MAKE)
+	cd $(SRP_DIR) && $(MAKE) all
 
 srpt_install:
 	cd $(SRP_DIR) && $(MAKE) install
@@ -299,5 +299,6 @@ release2debug:
 	iscsi iscsi_install iscsi_uninstall iscsi_clean iscsi_extraclean \
 	scst scst_install scst_uninstall scst_clean scst_extraclean \
 	scstadm scstadm_install scstadm_uninstall scstadm_clean scstadm_extraclean \
+	srpt srpt_install srpt_uninstall srpt_clean srpt_extraclean \
 	usr usr_install usr_uninstall usr_clean usr_extraclean \
 	debug2perf, debug2release, perf2debug, release2debug
diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index 146ff6f90..e045abfd6 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -94,7 +94,7 @@ while [ "$1" != "${1#-}" ]
 do
   case "$1" in
     '-q') qla2x00t="true"; shift;;
-    '-s') srptt="true"; shift;;
+    '-s') srpt="true"; shift;;
     '-m') mpt_scst="true"; shift;;
     '--') shift;;
     *)    usage; exit 1;;
@@ -232,21 +232,15 @@ fi
 
 if [ "$srpt" = "true" ]; then
 
-  add_patch "srpt/src/Kconfig.infiniband.Linux-${kernel_version}.patch" \
-          "drivers/infiniband/Kconfig"
+  add_file  "srpt/src/Kconfig"            "drivers/scst/srpt/Kconfig"
 
-  add_patch "srpt/src/Makefile.infiniband.Linux-${kernel_version}.patch" \
-          "drivers/infiniband/Makefile"
-
-  add_file  "srpt/src/Kconfig"            "drivers/infiniband/ulp/srpt/Kconfig"
-
-  add_file  "srpt/src/Makefile.in_kernel" "drivers/infiniband/ulp/srpt/Makefile"
+  add_file  "srpt/src/Makefile.in_kernel" "drivers/scst/srpt/Makefile"
 
   add_file  "srpt/README"                 "Documentation/scst/README.srpt"
 
   for f in srpt/src/*.[ch]
   do
-    add_file "${f}" "drivers/infiniband/ulp/srpt/${f#srpt/src/}"
+    add_file "${f}" "drivers/scst/srpt/${f#srpt/src/}"
   done
 
 fi
diff --git a/scst/kernel/in-tree/Makefile.scst b/scst/kernel/in-tree/Makefile.scst
index b5b1b5a9d..ef080e1ad 100644
--- a/scst/kernel/in-tree/Makefile.scst
+++ b/scst/kernel/in-tree/Makefile.scst
@@ -7,5 +7,5 @@ scst-y        += scst_proc.o
 scst-y        += scst_mem.o
 scst-y        += scst_debug.o
 
-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/