[Scst-svn] SF.net SVN: scst: [443] trunk

[<vl...@us...>]

Revision: 443
          http://scst.svn.sourceforge.net/scst/?rev=443&view=rev
Author:   vlnb
Date:     2008-07-09 09:58:56 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
 - Forgotten piece of changes for returning to the release mode
 - QLA_ISP targets in the main Makefile temporary disabled, since they don't support building with specified kernel version

Modified Paths:
--------------
    trunk/Makefile
    trunk/iscsi-scst/Makefile
    trunk/qla2x00t/qla2x00-target/Makefile
    trunk/usr/fileio/Makefile

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-07-09 16:44:01 UTC (rev 442)
+++ trunk/Makefile	2008-07-09 16:58:56 UTC (rev 443)
@@ -94,7 +94,7 @@
 all:
 	cd $(SCST_DIR) && $(MAKE) $@
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
+#	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -103,7 +103,7 @@
 install: 
 	cd $(SCST_DIR) && $(MAKE) $@
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
+#	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) DISTDIR=$(ISCSI_DISTDIR) $@; fi
@@ -112,7 +112,7 @@
 uninstall: 
 	cd $(SCST_DIR) && $(MAKE) $@
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
+#	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -122,7 +122,7 @@
 	cd $(SCST_DIR) && $(MAKE) $@
 	@if [ -d $(QLA_INI_DIR) ]; then cd $(QLA_INI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
+#	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -132,7 +132,7 @@
 	cd $(SCST_DIR) && $(MAKE) $@
 	@if [ -d $(QLA_INI_DIR) ]; then cd $(QLA_INI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
-	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
+#	@if [ -d $(QLA_ISP_DIR) ]; then cd $(QLA_ISP_DIR) && $(MAKE) $@; fi
 #	@if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
 	@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
 	@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi

Modified: trunk/iscsi-scst/Makefile
===================================================================
--- trunk/iscsi-scst/Makefile	2008-07-09 16:44:01 UTC (rev 442)
+++ trunk/iscsi-scst/Makefile	2008-07-09 16:58:56 UTC (rev 443)
@@ -5,13 +5,13 @@
 # removes any old dependencies. DON'T put your own dependencies here
 # unless it's something special (not a .c file).
 
-SCST_INC_DIR := /usr/local/include/scst
-#SCST_INC_DIR := $(SUBDIRS)/../../scst/include
-SCST_DIR := $(SCST_INC_DIR)
-#SCST_DIR := $(shell pwd)/../scst/src
-
 SUBDIRS := $(shell pwd)
 
+#SCST_INC_DIR := /usr/local/include/scst
+SCST_INC_DIR := $(SUBDIRS)/../scst/include
+#SCST_DIR := $(SCST_INC_DIR)
+SCST_DIR := $(shell pwd)/../scst/src
+
 ifeq ($(KVER),)
   ifeq ($(KDIR),)
     KVER = $(shell uname -r)

Modified: trunk/qla2x00t/qla2x00-target/Makefile
===================================================================
--- trunk/qla2x00t/qla2x00-target/Makefile	2008-07-09 16:44:01 UTC (rev 442)
+++ trunk/qla2x00t/qla2x00-target/Makefile	2008-07-09 16:58:56 UTC (rev 443)
@@ -26,10 +26,10 @@
 #    - install and uninstall must be made as root
 #
 
-SCST_INC_DIR := /usr/local/include/scst
-SCST_DIR := $(SCST_INC_DIR)
-#SCST_INC_DIR := $(SUBDIRS)/../../scst/include
-#SCST_DIR := $(shell pwd)/../../scst/src
+#SCST_INC_DIR := /usr/local/include/scst
+#SCST_DIR := $(SCST_INC_DIR)
+SCST_INC_DIR := $(SUBDIRS)/../../scst/include
+SCST_DIR := $(shell pwd)/../../scst/src
 
 EXTRA_CFLAGS += -I$(SCST_INC_DIR) -DFC_TARGET_SUPPORT
 

Modified: trunk/usr/fileio/Makefile
===================================================================
--- trunk/usr/fileio/Makefile	2008-07-09 16:44:01 UTC (rev 442)
+++ trunk/usr/fileio/Makefile	2008-07-09 16:58:56 UTC (rev 443)
@@ -20,8 +20,8 @@
 #SRCS_C = 
 #OBJS_C = $(SRCS_C:.c=.o)
 
-#SCST_INC_DIR := ../../scst/include
-SCST_INC_DIR := /usr/local/include/scst
+SCST_INC_DIR := ../../scst/include
+#SCST_INC_DIR := /usr/local/include/scst
 INSTALL_DIR := /usr/local/bin/scst
 
 CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter -Wstrict-prototypes \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.