Merge of the trunk's r3504:

- Let's always do extraclean on Makefiles modifications, because they can affect data layout in header files, which could not be detected by all target drivers/dev handlers makes
 - Cleanups



git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3505 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2011-06-01 16:59:28 +00:00
parent 0dd84b41db
commit 51a96ec92d
2 changed files with 19 additions and 19 deletions
+18 -18
View File
@@ -1,15 +1,15 @@
#
# Common makefile for SCSI target mid-level and its drivers
#
#
# Copyright (C) 2004 - 2011 Vladislav Bolkhovitin <vst@vlnb.net>
# Copyright (C) 2007 - 2010 ID7 Ltd.
# Copyright (C) 2010 - 2011 SCST Ltd.
#
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation, version 2
# of the License.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -139,7 +139,7 @@ all:
@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
install:
install:
cd $(SCST_DIR) && $(MAKE) $@
# @if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
@@ -150,7 +150,7 @@ install:
@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
uninstall:
uninstall:
cd $(SCST_DIR) && $(MAKE) $@
# @if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
@@ -161,7 +161,7 @@ uninstall:
@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
clean:
clean:
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_INI_DIR) ]; then cd $(QLA_INI_DIR) && $(MAKE) $@; fi
@@ -173,7 +173,7 @@ clean:
@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
extraclean:
extraclean:
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_INI_DIR) ]; then cd $(QLA_INI_DIR) && $(MAKE) $@; fi
@@ -188,19 +188,19 @@ extraclean:
tags:
find . -type f -name "*.[ch]" | ctags --c-kinds=+p --fields=+iaS --extra=+q -e -L-
scst:
scst:
cd $(SCST_DIR) && $(MAKE) all
scst_install:
scst_install:
cd $(SCST_DIR) && $(MAKE) install
scst_uninstall:
scst_uninstall:
cd $(SCST_DIR) && $(MAKE) uninstall
scst_clean:
scst_clean:
cd $(SCST_DIR) && $(MAKE) clean
scst_extraclean:
scst_extraclean:
cd $(SCST_DIR) && $(MAKE) extraclean
docs:
@@ -364,7 +364,7 @@ fcst_clean:
fcst_extraclean:
cd $(FCST_DIR) && $(MAKE) extraclean
debug2perf:
debug2perf: extraclean
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
# patch -p0 <qla_isp-release.patch
@@ -374,7 +374,7 @@ debug2perf:
@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
debug2release:
debug2release: extraclean
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
# patch -p0 <qla_isp-release.patch
@@ -384,7 +384,7 @@ debug2release:
@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
perf2debug:
perf2debug: extraclean
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
# patch -p0 -R <qla_isp-release.patch
@@ -394,7 +394,7 @@ perf2debug:
@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
release2debug:
release2debug: extraclean
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
# patch -p0 -R <qla_isp-release.patch
@@ -404,7 +404,7 @@ release2debug:
@if [ -d $(USR_DIR) ]; then cd $(USR_DIR) && $(MAKE) $@; fi
@if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
enable_proc:
enable_proc: extraclean
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
# patch -p0 -R <qla_isp-release.patch
@@ -414,7 +414,7 @@ enable_proc:
# @if [ -d $(SCST_LOCAL_DIR) ]; then cd $(SCST_LOCAL_DIR) && $(MAKE) $@; fi
@if [ -d $(SCSTADM_DIR) ]; then cd $(SCSTADM_DIR) && $(MAKE) $@; fi
disable_proc:
disable_proc: extraclean
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
# patch -p0 -R <qla_isp-release.patch
+1 -1
View File
@@ -65,7 +65,7 @@ else
endif
uninstall:
rm -f $(INSTALL_DIR)/scst_local.kp
rm -f $(INSTALL_DIR)/scst_local.ko
-/sbin/depmod -a $(KVER)
endif