Fixed a problem in the new clean rule.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11837 110e8d01-0319-4d1e-a829-52ad28d1bb01

6 files changed, 60 insertions, 24 deletions

diff --git a/os/common/startup/ARM/compilers/GCC/rules.mk b/os/common/startup/ARM/compilers/GCC/rules.mk
index e8ffb1c49..b68e39b21 100644
--- a/os/common/startup/ARM/compilers/GCC/rules.mk
+++ b/os/common/startup/ARM/compilers/GCC/rules.mk
@@ -183,7 +183,7 @@ PRE_MAKE_ALL_RULE_HOOK:
 

 POST_MAKE_ALL_RULE_HOOK:

 

-$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR)

+$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR) $(DEPDIR)

 

 $(BUILDDIR):

 ifneq ($(USE_VERBOSE_COMPILE),yes)

@@ -199,6 +199,9 @@ $(OBJDIR):
 $(LSTDIR):

 	@mkdir -p $(LSTDIR)

 

+$(DEPDIR):

+	@mkdir -p $(DEPDIR)

+

 $(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)

 ifeq ($(USE_VERBOSE_COMPILE),yes)

 	@echo

@@ -308,8 +311,11 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 

 clean: CLEAN_RULE_HOOK

 	@echo Cleaning

-	-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

-	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) $(subst ./,,$(BUILDDIR)) 2>/dev/null

+	@echo - $(DEPDIR)

+	@-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

+	@-if [ -d "$(DEPDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) 2>/dev/null; fi

+	@echo - $(BUILDDIR)

+	@-if [ -d "$(BUILDDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(BUILDDIR)) 2>/dev/null; fi

 	@echo

 	@echo Done

 

@@ -318,6 +324,6 @@ CLEAN_RULE_HOOK:
 #

 # Include the dependency files, should be the last of the makefile

 #

--include $(shell mkdir -p $(DEPDIR) 2>/dev/null)

+-include $(wildcard $(DEPDIR)/*)

 

 # *** EOF ***

diff --git a/os/common/startup/ARMCAx-TZ/compilers/GCC/rules.mk b/os/common/startup/ARMCAx-TZ/compilers/GCC/rules.mk
index 06bed68ed..4c0c3af57 100644
--- a/os/common/startup/ARMCAx-TZ/compilers/GCC/rules.mk
+++ b/os/common/startup/ARMCAx-TZ/compilers/GCC/rules.mk
@@ -190,7 +190,7 @@ PRE_MAKE_ALL_RULE_HOOK:
 

 POST_MAKE_ALL_RULE_HOOK:

 

-$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR)

+$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR) $(DEPDIR)

 

 $(BUILDDIR):

 ifneq ($(USE_VERBOSE_COMPILE),yes)

@@ -206,6 +206,9 @@ $(OBJDIR):
 $(LSTDIR):

 	@mkdir -p $(LSTDIR)

 

+$(DEPDIR):

+	@mkdir -p $(DEPDIR)

+

 $(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)

 ifeq ($(USE_VERBOSE_COMPILE),yes)

 	@echo

@@ -315,8 +318,11 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 

 clean: CLEAN_RULE_HOOK

 	@echo Cleaning

-	-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

-	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) $(subst ./,,$(BUILDDIR)) 2>/dev/null

+	@echo - $(DEPDIR)

+	@-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

+	@-if [ -d "$(DEPDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) 2>/dev/null; fi

+	@echo - $(BUILDDIR)

+	@-if [ -d "$(BUILDDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(BUILDDIR)) 2>/dev/null; fi

 	@echo

 	@echo Done

 

@@ -325,6 +331,6 @@ CLEAN_RULE_HOOK:
 #

 # Include the dependency files, should be the last of the makefile

 #

--include $(shell mkdir -p $(DEPDIR) 2>/dev/null)

+-include $(wildcard $(DEPDIR)/*)

 

 # *** EOF ***

diff --git a/os/common/startup/ARMCMx/compilers/GCC/rules.mk b/os/common/startup/ARMCMx/compilers/GCC/rules.mk
index c917cd11d..eb7574bbb 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/rules.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/rules.mk
@@ -180,7 +180,7 @@ PRE_MAKE_ALL_RULE_HOOK:
 

 POST_MAKE_ALL_RULE_HOOK:

 

-$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR)

+$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR) $(DEPDIR)

 

 $(BUILDDIR):

 ifneq ($(USE_VERBOSE_COMPILE),yes)

@@ -196,6 +196,9 @@ $(OBJDIR):
 $(LSTDIR):

 	@mkdir -p $(LSTDIR)

 

+$(DEPDIR):

+	@mkdir -p $(DEPDIR)

+

 $(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)

 ifeq ($(USE_VERBOSE_COMPILE),yes)

 	@echo

@@ -315,8 +318,11 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 

 clean: CLEAN_RULE_HOOK

 	@echo Cleaning

-	-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

-	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) $(subst ./,,$(BUILDDIR)) 2>/dev/null

+	@echo - $(DEPDIR)

+	@-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

+	@-if [ -d "$(DEPDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) 2>/dev/null; fi

+	@echo - $(BUILDDIR)

+	@-if [ -d "$(BUILDDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(BUILDDIR)) 2>/dev/null; fi

 	@echo

 	@echo Done

 

@@ -325,6 +331,6 @@ CLEAN_RULE_HOOK:
 #

 # Include the dependency files, should be the last of the makefile

 #

--include $(shell mkdir -p $(DEPDIR) 2>/dev/null)

+-include $(wildcard $(DEPDIR)/*)

 

 # *** EOF ***

diff --git a/os/common/startup/SIMIA32/compilers/GCC/rules.mk b/os/common/startup/SIMIA32/compilers/GCC/rules.mk
index 1dfea462e..06494762c 100644
--- a/os/common/startup/SIMIA32/compilers/GCC/rules.mk
+++ b/os/common/startup/SIMIA32/compilers/GCC/rules.mk
@@ -99,7 +99,7 @@ PRE_MAKE_ALL_RULE_HOOK:
 

 POST_MAKE_ALL_RULE_HOOK:

 

-$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR)

+$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR) $(DEPDIR)

 

 $(BUILDDIR):

 ifneq ($(USE_VERBOSE_COMPILE),yes)

@@ -115,6 +115,9 @@ $(OBJDIR):
 $(LSTDIR):

 	@mkdir -p $(LSTDIR)

 

+$(DEPDIR):

+	@mkdir -p $(DEPDIR)

+

 $(CPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)

 ifeq ($(USE_VERBOSE_COMPILE),yes)

 	@echo

@@ -169,8 +172,11 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 

 clean: CLEAN_RULE_HOOK

 	@echo Cleaning

-	-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

-	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) $(subst ./,,$(BUILDDIR)) 2>/dev/null

+	@echo - $(DEPDIR)

+	@-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

+	@-if [ -d "$(DEPDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) 2>/dev/null; fi

+	@echo - $(BUILDDIR)

+	@-if [ -d "$(BUILDDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(BUILDDIR)) 2>/dev/null; fi

 	@echo

 	@echo Done

 

@@ -183,6 +189,6 @@ gcov:
 #

 # Include the dependency files, should be the last of the makefile

 #

--include $(shell mkdir -p $(DEPDIR) 2>/dev/null) $(wildcard $(DEPDIR)/*)

+-include $(wildcard $(DEPDIR)/*)

 

 # *** EOF ***

diff --git a/os/common/startup/e200/compilers/GCC/rules.mk b/os/common/startup/e200/compilers/GCC/rules.mk
index 1591867cc..84fbc1d77 100644
--- a/os/common/startup/e200/compilers/GCC/rules.mk
+++ b/os/common/startup/e200/compilers/GCC/rules.mk
@@ -125,7 +125,7 @@ PRE_MAKE_ALL_RULE_HOOK:
 

 POST_MAKE_ALL_RULE_HOOK:

 

-$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR)

+$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR) $(DEPDIR)

 

 $(BUILDDIR):

 ifneq ($(USE_VERBOSE_COMPILE),yes)

@@ -141,6 +141,9 @@ $(OBJDIR):
 $(LSTDIR):

 	@mkdir -p $(LSTDIR)

 

+$(DEPDIR):

+	@mkdir -p $(DEPDIR)

+

 $(CPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)

 ifeq ($(USE_VERBOSE_COMPILE),yes)

 	@echo

@@ -239,8 +242,11 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 

 clean: CLEAN_RULE_HOOK

 	@echo Cleaning

-	-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

-	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) $(subst ./,,$(BUILDDIR)) 2>/dev/null

+	@echo - $(DEPDIR)

+	@-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

+	@-if [ -d "$(DEPDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) 2>/dev/null; fi

+	@echo - $(BUILDDIR)

+	@-if [ -d "$(BUILDDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(BUILDDIR)) 2>/dev/null; fi

 	@echo

 	@echo Done

 

@@ -249,6 +255,6 @@ CLEAN_RULE_HOOK:
 #

 # Include the dependency files, should be the last of the makefile

 #

--include $(shell mkdir -p $(DEPDIR) 2>/dev/null)

+-include $(wildcard $(DEPDIR)/*)

 

 # *** EOF ***

diff --git a/os/common/startup/e200/compilers/GHS/rules.mk b/os/common/startup/e200/compilers/GHS/rules.mk
index c32c23218..4108b7061 100644
--- a/os/common/startup/e200/compilers/GHS/rules.mk
+++ b/os/common/startup/e200/compilers/GHS/rules.mk
@@ -126,7 +126,7 @@ PRE_MAKE_ALL_RULE_HOOK:
 

 POST_MAKE_ALL_RULE_HOOK:

 

-$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR)

+$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR) $(DEPDIR)

 

 $(BUILDDIR):

 ifneq ($(USE_VERBOSE_COMPILE),yes)

@@ -142,6 +142,9 @@ $(OBJDIR):
 $(LSTDIR):

 	@mkdir -p $(LSTDIR)

 

+$(DEPDIR):

+	@mkdir -p $(DEPDIR)

+

 $(CPPOBJS) : $(OBJDIR)/%.o : %.cpp $(MAKEFILE_LIST)

 ifeq ($(USE_VERBOSE_COMPILE),yes)

 	@echo

@@ -232,8 +235,11 @@ $(BUILDDIR)/lib$(PROJECT).a: $(OBJS)
 

 clean: CLEAN_RULE_HOOK

 	@echo Cleaning

-	-rm -fR $(BUILDDIR)/* 2>/dev/null

-	-rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(BUILDDIR)) 2>/dev/null

+	@echo - $(DEPDIR)

+	@-rm -fR $(DEPDIR)/* $(BUILDDIR)/* 2>/dev/null

+	@-if [ -d "$(DEPDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(DEPDIR)) 2>/dev/null; fi

+	@echo - $(BUILDDIR)

+	@-if [ -d "$(BUILDDIR)" ]; then rmdir -p --ignore-fail-on-non-empty $(subst ./,,$(BUILDDIR)) 2>/dev/null; fi

 	@echo

 	@echo Done

 

@@ -242,6 +248,6 @@ CLEAN_RULE_HOOK:
 #

 # Include the dependency files, should be the last of the makefile

 #

--include $(wildcard $(OBJDIR)/*.d)

+-include $(wildcard $(DEPDIR)/*)

 

 # *** EOF ***