From f518cd150caecd08e79f3a05cf0c477b91c88337 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 10 Mar 2011 20:07:23 +0000 Subject: [PATCH] Let's remove *.orig and *.rej files on extraclean git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3277 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- Makefile | 1 - doc/Makefile | 1 + fcst/Makefile | 1 + ibmvstgt/Makefile | 1 + iscsi-scst/Makefile | 12 +++++++++--- iscsi-scst/usr/Makefile | 3 +++ mpt/Makefile | 1 + mvsas_tgt/Makefile | 1 + qla2x00t/Makefile | 1 + qla2x00t/qla2x00-target/Makefile | 1 + qla_isp/linux-2.6/Makefile | 1 + scst/src/Makefile | 1 + scst/src/dev_handlers/Makefile | 1 + scst_local/Makefile | 1 + scstadmin/scstadmin.procfs/Makefile | 1 + scstadmin/scstadmin.sysfs/Makefile | 1 + srpt/Makefile | 1 + usr/fileio/Makefile | 1 + 18 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f90ad4d60..f2a8f7e04 100644 --- a/Makefile +++ b/Makefile @@ -349,7 +349,6 @@ fcst_clean: fcst_extraclean: cd $(FCST_DIR) && $(MAKE) extraclean - debug2perf: cd $(SCST_DIR) && $(MAKE) $@ @if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi diff --git a/doc/Makefile b/doc/Makefile index b0d083167..d625a55d4 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -61,5 +61,6 @@ clean: @mv sgv_cache.tx sgv_cache.txt extraclean: clean + rm -f *.orig *.rej .PHONY: all default html txt pdf tex dvi ps info lyx rtf clean extraclean diff --git a/fcst/Makefile b/fcst/Makefile index 72bd2b879..9acf310e2 100644 --- a/fcst/Makefile +++ b/fcst/Makefile @@ -102,5 +102,6 @@ clean: rm -rf .tmp_versions extraclean: clean + rm -f *.orig *.rej .PHONY: all tgt install uninstall clean extraclean diff --git a/ibmvstgt/Makefile b/ibmvstgt/Makefile index 784db8c64..bcfa95657 100644 --- a/ibmvstgt/Makefile +++ b/ibmvstgt/Makefile @@ -41,5 +41,6 @@ clean: src/modules.order extraclean: clean + rm -f *.orig *.rej .PHONY: all install clean extraclean diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index e94fbcc39..48074f8d1 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -83,13 +83,19 @@ else endif clean: - $(MAKE) -C usr clean - $(MAKE) -C $(KDIR) SUBDIRS=$(KMOD) clean + $(MAKE) -C usr $@ + $(MAKE) -C $(KDIR) SUBDIRS=$(KMOD) $@ rm -f kernel/Modules.symvers kernel/Module.symvers \ kernel/Module.markers kernel/modules.order \ include/iscsi_scst_itf_ver.h -extraclean: clean +extraclean: + $(MAKE) -C usr $@ + $(MAKE) -C $(KDIR) SUBDIRS=$(KMOD) clean + rm -f kernel/Modules.symvers kernel/Module.symvers \ + kernel/Module.markers kernel/modules.order \ + include/iscsi_scst_itf_ver.h \ + kernel/*.orig kernel/*.rej debug2release: sed -i.aa s/"^EXTRA_CFLAGS += \-DCONFIG_SCST_EXTRACHECKS"/"#EXTRA_CFLAGS += \-DCONFIG_SCST_EXTRACHECKS"/ $(KMOD)/Makefile diff --git a/iscsi-scst/usr/Makefile b/iscsi-scst/usr/Makefile index 68e8c265a..8e0fa14f3 100644 --- a/iscsi-scst/usr/Makefile +++ b/iscsi-scst/usr/Makefile @@ -60,3 +60,6 @@ endif clean: rm -f *.o $(PROGRAMS) .depend* + +extraclean: clean + rm -f *.orig *.rej diff --git a/mpt/Makefile b/mpt/Makefile index f2cbd0b97..d99ef8540 100644 --- a/mpt/Makefile +++ b/mpt/Makefile @@ -88,5 +88,6 @@ clean: rm -rf .tmp_versions extraclean: clean + rm -f *.orig *.rej .PHONY: all tgt install uninstall clean extraclean diff --git a/mvsas_tgt/Makefile b/mvsas_tgt/Makefile index b9b1b8775..153f65cdc 100644 --- a/mvsas_tgt/Makefile +++ b/mvsas_tgt/Makefile @@ -108,5 +108,6 @@ clean: rm -rf .tmp_versions extraclean: clean + rm -f *.orig *.rej .PHONY: all tgt install uninstall clean extraclean diff --git a/qla2x00t/Makefile b/qla2x00t/Makefile index 2d9fefea5..16055d4a5 100644 --- a/qla2x00t/Makefile +++ b/qla2x00t/Makefile @@ -9,5 +9,6 @@ clean: rm -rf .tmp_versions extraclean: clean + rm -f *.orig *.rej .PHONY: clean extraclean diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile index 75b459084..766c98279 100644 --- a/qla2x00t/qla2x00-target/Makefile +++ b/qla2x00t/qla2x00-target/Makefile @@ -104,6 +104,7 @@ clean: rm -rf .tmp_versions extraclean: clean + rm -f *.orig *.rej debug2release: sed -i.aa s/"^EXTRA_CFLAGS += \-DCONFIG_SCST_EXTRACHECKS"/"#EXTRA_CFLAGS += \-DCONFIG_SCST_EXTRACHECKS"/ Makefile diff --git a/qla_isp/linux-2.6/Makefile b/qla_isp/linux-2.6/Makefile index ea0ee0b17..5c669c9e1 100644 --- a/qla_isp/linux-2.6/Makefile +++ b/qla_isp/linux-2.6/Makefile @@ -50,6 +50,7 @@ clean: @$(RM) tags Modules.symvers Module.symvers extraclean: clean + rm -f *.orig *.rej install: @$(MAKE) -C ${LINUX} M=${CURDIR}/build modules_install diff --git a/scst/src/Makefile b/scst/src/Makefile index 071b69735..bcf9a01b1 100644 --- a/scst/src/Makefile +++ b/scst/src/Makefile @@ -157,6 +157,7 @@ clean: cd $(DEV_HANDLERS_DIR) && $(MAKE) $@ extraclean: clean + rm -f *.orig *.rej debug2release: sed -i.aa s/"^EXTRA_CFLAGS += \-DCONFIG_SCST_EXTRACHECKS"/"#EXTRA_CFLAGS += \-DCONFIG_SCST_EXTRACHECKS"/ Makefile diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile index 827c5884e..14b81021a 100644 --- a/scst/src/dev_handlers/Makefile +++ b/scst/src/dev_handlers/Makefile @@ -86,6 +86,7 @@ clean: rm -rf .tmp_versions extraclean: clean + rm -f *.orig *.rej debug2release: sed -i.aa s/"^EXTRA_CFLAGS += \-DCONFIG_SCST_EXTRACHECKS"/"#EXTRA_CFLAGS += \-DCONFIG_SCST_EXTRACHECKS"/ Makefile diff --git a/scst_local/Makefile b/scst_local/Makefile index 9c82aaf09..ccbfb9bd6 100644 --- a/scst_local/Makefile +++ b/scst_local/Makefile @@ -74,6 +74,7 @@ clean: @$(RM) tags Modules.symvers module.symvers Module.markers modules.order extraclean: clean + rm -f *.orig *.rej debug2release: sed -i.aa s/"^EXTRA_CFLAGS += \-DCONFIG_SCST_EXTRACHECKS"/"#EXTRA_CFLAGS += \-DCONFIG_SCST_EXTRACHECKS"/ Makefile diff --git a/scstadmin/scstadmin.procfs/Makefile b/scstadmin/scstadmin.procfs/Makefile index 72e3b3555..90d6d4493 100644 --- a/scstadmin/scstadmin.procfs/Makefile +++ b/scstadmin/scstadmin.procfs/Makefile @@ -24,6 +24,7 @@ clean: distclean: clean -rm -f scst-$(MODULE_VERSION)/Makefile.old + rm -f *.orig *.rej extraclean: distclean diff --git a/scstadmin/scstadmin.sysfs/Makefile b/scstadmin/scstadmin.sysfs/Makefile index afc6006b5..f9967c885 100644 --- a/scstadmin/scstadmin.sysfs/Makefile +++ b/scstadmin/scstadmin.sysfs/Makefile @@ -24,6 +24,7 @@ clean: distclean: clean -rm -f scst-$(MODULE_VERSION)/Makefile.old + rm -f *.orig *.rej extraclean: distclean diff --git a/srpt/Makefile b/srpt/Makefile index 146245b48..1300517c6 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -97,5 +97,6 @@ clean: src/modules.order extraclean: clean + rm -f *.orig *.rej .PHONY: all install clean extraclean diff --git a/usr/fileio/Makefile b/usr/fileio/Makefile index 8e3c85bbc..099a484c2 100644 --- a/usr/fileio/Makefile +++ b/usr/fileio/Makefile @@ -81,6 +81,7 @@ clean: rm -f *.o $(PROGS) .depend* extraclean: clean + rm -f *.orig *.rej debug2release: sed -i.aa s/"^CFLAGS += \-DEXTRACHECKS"/"#CFLAGS += \-DEXTRACHECKS"/ Makefile