From c706f5f20deabd680106ecaaf8047a03cf1d02ef Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Tue, 13 Mar 2018 14:06:05 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11729
 110e8d01-0319-4d1e-a829-52ad28d1bb01

---
 os/common/startup/ARM/compilers/GCC/rules.mk       | 5 +++--
 os/common/startup/ARMCAx-TZ/compilers/GCC/rules.mk | 5 +++--
 os/common/startup/ARMCMx/compilers/GCC/rules.mk    | 5 +++--
 os/common/startup/SIMIA32/compilers/GCC/rules.mk   | 5 +++--
 os/common/startup/e200/compilers/GCC/rules.mk      | 5 +++--
 os/common/startup/e200/compilers/GHS/rules.mk      | 3 ++-
 testhal/STM32/multi/PAL/make/stm32f051_discovery   | 2 +-
 testhal/STM32/multi/PAL/make/stm32f103_olimex      | 2 +-
 8 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/os/common/startup/ARM/compilers/GCC/rules.mk b/os/common/startup/ARM/compilers/GCC/rules.mk
index 0b98a5334..e8ffb1c49 100644
--- a/os/common/startup/ARM/compilers/GCC/rules.mk
+++ b/os/common/startup/ARM/compilers/GCC/rules.mk
@@ -308,7 +308,8 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 
 clean: CLEAN_RULE_HOOK
 	@echo Cleaning
-	-rm -fR $(DEPDIR) $(BUILDDIR)
+	-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null
+	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) $(subst ./,,$(BUILDDIR)) 2>/dev/null
 	@echo
 	@echo Done
 
@@ -317,6 +318,6 @@ CLEAN_RULE_HOOK:
 #
 # Include the dependency files, should be the last of the makefile
 #
--include $(shell mkdir $(DEPDIR) 2>/dev/null) $(wildcard $(DEPDIR)/*)
+-include $(shell mkdir -p $(DEPDIR) 2>/dev/null)
 
 # *** EOF ***
diff --git a/os/common/startup/ARMCAx-TZ/compilers/GCC/rules.mk b/os/common/startup/ARMCAx-TZ/compilers/GCC/rules.mk
index 1be8cfa36..06bed68ed 100644
--- a/os/common/startup/ARMCAx-TZ/compilers/GCC/rules.mk
+++ b/os/common/startup/ARMCAx-TZ/compilers/GCC/rules.mk
@@ -315,7 +315,8 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 
 clean: CLEAN_RULE_HOOK
 	@echo Cleaning
-	-rm -fR $(DEPDIR) $(BUILDDIR)
+	-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null
+	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) $(subst ./,,$(BUILDDIR)) 2>/dev/null
 	@echo
 	@echo Done
 
@@ -324,6 +325,6 @@ CLEAN_RULE_HOOK:
 #
 # Include the dependency files, should be the last of the makefile
 #
--include $(shell mkdir $(DEPDIR) 2>/dev/null) $(wildcard $(DEPDIR)/*)
+-include $(shell mkdir -p $(DEPDIR) 2>/dev/null)
 
 # *** EOF ***
diff --git a/os/common/startup/ARMCMx/compilers/GCC/rules.mk b/os/common/startup/ARMCMx/compilers/GCC/rules.mk
index f726df57d..c917cd11d 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/rules.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/rules.mk
@@ -315,7 +315,8 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 
 clean: CLEAN_RULE_HOOK
 	@echo Cleaning
-	-rm -fR $(DEPDIR) $(BUILDDIR)
+	-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null
+	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) $(subst ./,,$(BUILDDIR)) 2>/dev/null
 	@echo
 	@echo Done
 
@@ -324,6 +325,6 @@ CLEAN_RULE_HOOK:
 #
 # Include the dependency files, should be the last of the makefile
 #
--include $(shell mkdir $(DEPDIR) 2>/dev/null) $(wildcard $(DEPDIR)/*)
+-include $(shell mkdir -p $(DEPDIR) 2>/dev/null)
 
 # *** EOF ***
diff --git a/os/common/startup/SIMIA32/compilers/GCC/rules.mk b/os/common/startup/SIMIA32/compilers/GCC/rules.mk
index 600f8d5e9..1dfea462e 100644
--- a/os/common/startup/SIMIA32/compilers/GCC/rules.mk
+++ b/os/common/startup/SIMIA32/compilers/GCC/rules.mk
@@ -169,7 +169,8 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 
 clean: CLEAN_RULE_HOOK
 	@echo Cleaning
-	-rm -fR $(DEPDIR) $(BUILDDIR)
+	-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null
+	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) $(subst ./,,$(BUILDDIR)) 2>/dev/null
 	@echo
 	@echo Done
 
@@ -182,6 +183,6 @@ gcov:
 #
 # Include the dependency files, should be the last of the makefile
 #
--include $(shell mkdir $(DEPDIR) 2>/dev/null) $(wildcard $(DEPDIR)/*)
+-include $(shell mkdir -p $(DEPDIR) 2>/dev/null) $(wildcard $(DEPDIR)/*)
 
 # *** EOF ***
diff --git a/os/common/startup/e200/compilers/GCC/rules.mk b/os/common/startup/e200/compilers/GCC/rules.mk
index b7432aefc..1591867cc 100644
--- a/os/common/startup/e200/compilers/GCC/rules.mk
+++ b/os/common/startup/e200/compilers/GCC/rules.mk
@@ -239,7 +239,8 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 
 clean: CLEAN_RULE_HOOK
 	@echo Cleaning
-	-rm -fR $(DEPDIR) $(BUILDDIR)
+	-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null
+	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) $(subst ./,,$(BUILDDIR)) 2>/dev/null
 	@echo
 	@echo Done
 
@@ -248,6 +249,6 @@ CLEAN_RULE_HOOK:
 #
 # Include the dependency files, should be the last of the makefile
 #
--include $(shell mkdir $(DEPDIR) 2>/dev/null) $(wildcard $(DEPDIR)/*)
+-include $(shell mkdir -p $(DEPDIR) 2>/dev/null)
 
 # *** EOF ***
diff --git a/os/common/startup/e200/compilers/GHS/rules.mk b/os/common/startup/e200/compilers/GHS/rules.mk
index dcaab3b91..c32c23218 100644
--- a/os/common/startup/e200/compilers/GHS/rules.mk
+++ b/os/common/startup/e200/compilers/GHS/rules.mk
@@ -232,7 +232,8 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 
 clean: CLEAN_RULE_HOOK
 	@echo Cleaning
-	-rm -fR $(BUILDDIR)
+	-rm -fR $(BUILDDIR)/* 2>/dev/null
+	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(BUILDDIR)) 2>/dev/null
 	@echo
 	@echo Done
 
diff --git a/testhal/STM32/multi/PAL/make/stm32f051_discovery b/testhal/STM32/multi/PAL/make/stm32f051_discovery
index c86e143bd..e8bb01915 100644
--- a/testhal/STM32/multi/PAL/make/stm32f051_discovery
+++ b/testhal/STM32/multi/PAL/make/stm32f051_discovery
@@ -84,7 +84,7 @@ PROJECT = ch
 CHIBIOS  := ../../../..
 CONFDIR  := ./cfg/stm32f051_discovery
 BUILDDIR := ./build/stm32f051_discovery
-DEPDIR   := ./.dep-stm32f051_discovery
+DEPDIR   := ./.dep/stm32f051_discovery
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/STM32/multi/PAL/make/stm32f103_olimex b/testhal/STM32/multi/PAL/make/stm32f103_olimex
index eaad9bd1c..b5da54fdc 100644
--- a/testhal/STM32/multi/PAL/make/stm32f103_olimex
+++ b/testhal/STM32/multi/PAL/make/stm32f103_olimex
@@ -84,7 +84,7 @@ PROJECT = ch
 CHIBIOS  := ../../../..
 CONFDIR  := ./cfg/stm32f103_olimex
 BUILDDIR := ./build/stm32f103_olimex
-DEPDIR   := ./.dep-stm32f103_olimex
+DEPDIR   := ./.dep/stm32f103_olimex
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk