From 47403656eebde6a2aa628a865de959e3c27fa446 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 5 Jul 2020 02:08:55 +0000 Subject: [PATCH] Make 'make clean' remove all build files git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9038 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- fcst/Makefile | 4 +--- iscsi-scst/Makefile | 18 +++++++----------- qla2x00t-32gbit/Makefile | 3 +-- qla2x00t-32gbit/qla2x00-target/Makefile | 7 ++++--- qla2x00t/Makefile | 3 +-- qla2x00t/qla2x00-target/Makefile | 7 ++++--- scst/Makefile | 1 + scst/src/Makefile | 7 +++---- scst/src/dev_handlers/Makefile | 4 +--- scst_local/Makefile | 3 +-- srpt/Makefile | 11 ++++++----- 11 files changed, 30 insertions(+), 38 deletions(-) diff --git a/fcst/Makefile b/fcst/Makefile index ae40f0b92..a6df05d83 100644 --- a/fcst/Makefile +++ b/fcst/Makefile @@ -83,9 +83,7 @@ uninstall: endif clean: - rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ \ - Module.symvers Module.markers modules.order - rm -rf .tmp_versions + $(MAKE) -C $(KDIR) M=$(shell pwd) $@ extraclean: clean rm -f *.orig *.rej diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index e596eaba5..6c488c141 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -176,18 +176,14 @@ uninstall: -/sbin/depmod -b $(INSTALL_MOD_PATH)/ -a $(KVER) clean: + rm -rf include/iscsi_scst_itf_ver.h + rm -rf conftest/*/{build-output,result}*.txt + for d in conftest/* kernel kernel/isert-scst; do \ + [ -d "$$d" ] && $(MAKE) -C $(KDIR) M=$(shell pwd)/$$d $@ & \ + rm -f $$d/result*.txt; \ + done; \ + wait $(MAKE) -C usr $@ - $(MAKE) -C $(KDIR) M=$(KMOD) $@ - $(MAKE) -C $(KDIR) M=$(ISERTMOD) $@ - rm -f kernel/Module.symvers \ - kernel/Module.markers kernel/modules.order \ - kernel/isert-scst/Module.symvers \ - kernel/isert-scst/Module.markers kernel/isert-scst/modules.order \ - include/iscsi_scst_itf_ver.h - rm -rf conftest/*/*.ko conftest/*/*.mod.c conftest/*/Module.symvers conftest/*/*.o \ - conftest/*/*.o.cmd conftest/*/*.ko.cmd conftest/*/.*.o.cmd conftest/*/.*.ko.cmd \ - conftest/*/*.order conftest/*/.*.o.d conftest/*/.tmp_versions/ \ - conftest/*/result*.txt extraclean: clean rm -f kernel/*.orig kernel/*.rej \ diff --git a/qla2x00t-32gbit/Makefile b/qla2x00t-32gbit/Makefile index 3c529c611..19e92048c 100644 --- a/qla2x00t-32gbit/Makefile +++ b/qla2x00t-32gbit/Makefile @@ -79,8 +79,7 @@ uninstall: endif clean: - @$(MAKE) -C $(KDIR) M=$(shell pwd) clean - @$(RM) tags Modules.symvers module.symvers Module.markers modules.order + $(MAKE) -C $(KDIR) M=$(shell pwd) $@ extraclean: clean rm -f *.orig *.rej diff --git a/qla2x00t-32gbit/qla2x00-target/Makefile b/qla2x00t-32gbit/qla2x00-target/Makefile index d45cfd5f2..793a75470 100644 --- a/qla2x00t-32gbit/qla2x00-target/Makefile +++ b/qla2x00t-32gbit/qla2x00-target/Makefile @@ -116,9 +116,10 @@ endif endif clean: - rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ \ - Module.symvers Module.markers modules.order - rm -rf .tmp_versions +ifneq ($(BUILD_2X_MODULE),) + $(MAKE) -C $(QLA2XXX_DIR) $@ +endif + $(MAKE) -C $(KDIR) M=$(shell pwd) $@ extraclean: clean rm -f *.orig *.rej diff --git a/qla2x00t/Makefile b/qla2x00t/Makefile index e51634e77..f69ec23ab 100644 --- a/qla2x00t/Makefile +++ b/qla2x00t/Makefile @@ -75,8 +75,7 @@ uninstall: endif clean: - @$(MAKE) -C $(KDIR) M=$(shell pwd) clean - @$(RM) tags Modules.symvers module.symvers Module.markers modules.order + $(MAKE) -C $(KDIR) M=$(shell pwd) $@ extraclean: clean rm -f *.orig *.rej diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile index 644d89b94..92346d452 100644 --- a/qla2x00t/qla2x00-target/Makefile +++ b/qla2x00t/qla2x00-target/Makefile @@ -115,9 +115,10 @@ endif endif clean: - rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ \ - Module.symvers Module.markers modules.order - rm -rf .tmp_versions +ifneq ($(BUILD_2X_MODULE),) + $(MAKE) -C $(QLA2XXX_DIR) $@ +endif + $(MAKE) -C $(KDIR) M=$(shell pwd) $@ extraclean: clean rm -f *.orig *.rej diff --git a/scst/Makefile b/scst/Makefile index 3c325f8c6..68b4d7378 100644 --- a/scst/Makefile +++ b/scst/Makefile @@ -42,6 +42,7 @@ uninstall: cd $(SCST_DIR) && $(MAKE) $@ clean: + rm -f include/build_mode.h cd $(SCST_DIR) && $(MAKE) $@ extraclean: diff --git a/scst/src/Makefile b/scst/src/Makefile index ffa701c31..f5f618ae9 100644 --- a/scst/src/Makefile +++ b/scst/src/Makefile @@ -179,10 +179,9 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra INSTALL_DIR_H := $(DESTDIR)$(PREFIX)/include/scst clean: - rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \ - Module.symvers Module.markers modules.order - rm -rf .tmp_versions - cd $(DEV_HANDLERS_DIR) && $(MAKE) $@ + rm -f $(SCST_INTF_VER_FILE) + $(MAKE) -C $(KDIR) M=$(shell pwd) $@ + $(MAKE) -C $(DEV_HANDLERS_DIR) $@ extraclean: clean rm -f $(SCST_INTF_VER_FILE) diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile index 157aaacd2..afd74d533 100644 --- a/scst/src/dev_handlers/Makefile +++ b/scst/src/dev_handlers/Makefile @@ -81,9 +81,7 @@ uninstall: endif clean: - rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \ - Module.symvers Module.markers modules.order - rm -rf .tmp_versions + $(MAKE) -C $(KDIR) M=$(shell pwd) $@ extraclean: clean rm -f *.orig *.rej diff --git a/scst_local/Makefile b/scst_local/Makefile index 80a8056bc..982a1becf 100644 --- a/scst_local/Makefile +++ b/scst_local/Makefile @@ -58,8 +58,7 @@ uninstall: endif clean: - @$(MAKE) -C $(KDIR) M=$(shell pwd) clean - @$(RM) tags Module.symvers Module.markers modules.order + $(MAKE) -C $(KDIR) M=$(shell pwd) $@ extraclean: clean rm -f *.orig *.rej diff --git a/srpt/Makefile b/srpt/Makefile index 7876ecb9a..d96d6df9b 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -143,11 +143,12 @@ check: clean: rm -rf conftest/pre_cflags conftest/kcflags - for d in conftest/* src; do \ - [ -d "$$d" ] && $(MAKE) -C $(KDIR) M=$(shell pwd)/$$d clean; \ - rm -f $$d/result*.txt; \ - done - rm -f src/Module.symvers src/Module.markers src/modules.order + rm -rf conftest/*/{build-output,result}*.txt + for d in conftest/* src; do \ + [ -d "$$d" ] && $(MAKE) -C $(KDIR) M=$(shell pwd)/$$d $@ & \ + rm -f $$d/result*.txt; \ + done; \ + wait extraclean: clean rm -f *.orig *.rej