From bc4b6a88944034872d9fcc8d4f86d4dbab65d4ae Mon Sep 17 00:00:00 2001
From: SPRESENSE <41312067+SPRESENSE@users.noreply.github.com>
Date: Tue, 28 Jul 2020 11:57:30 +0900
Subject: [PATCH] Application.mk: Fix minor bugs

- Add .config to depend to update Make.dep by config changed
- Fix mkdep error in some Makefiles

Originally, ROOTDEPPATH should be used, but DEPPATH has been already
written in some Makefiles such as littlevgl and pdcur34. This commit
allows the description of DEPPATH instead of ROOTDEPPATH.
---
 Application.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Application.mk b/Application.mk
index 9549f7ace..855434b69 100644
--- a/Application.mk
+++ b/Application.mk
@@ -88,6 +88,7 @@ ifneq ($(BUILD_MODULE),y)
 endif
 
 ROOTDEPPATH += --dep-path .
+ROOTDEPPATH += $(DEPPATH)
 ROOTDEPPATH += --obj-path .
 ROOTDEPPATH += --obj-suffix $(SUFFIX)$(OBJEXT)
 
@@ -223,11 +224,11 @@ else
 context::
 endif
 
-.depend: Makefile $(wildcard $(foreach SRC, $(SRCS), $(addsuffix /$(SRC), $(subst :, ,$(VPATH)))))
+.depend: Makefile $(wildcard $(foreach SRC, $(SRCS), $(addsuffix /$(SRC), $(subst :, ,$(VPATH))))) $(DEPCONFIG)
 ifeq ($(filter %$(CXXEXT),$(SRCS)),)
-	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$^) >Make.dep
+	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
 else
-	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$^) >Make.dep
+	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
 endif
 	$(Q) touch $@