Makefile: Unify ROOTDEPPATH into DEPPATH

DEPPATH is commonly used in nuttx repo, so it to be the same with them.
SunJun8 · Jul 29, 2020 · 63cd701 · 63cd701
1 parent 381b83e
commit 63cd701
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 18 deletions.
diff --git a/Application.mk b/Application.mk
@@ -87,10 +87,9 @@ ifneq ($(BUILD_MODULE),y)
   OBJS += $(MAINOBJ)
 endif
 
-ROOTDEPPATH += --dep-path .
-ROOTDEPPATH += $(DEPPATH)
-ROOTDEPPATH += --obj-path .
-ROOTDEPPATH += --obj-suffix $(SUFFIX)$(OBJEXT)
+DEPPATH += --dep-path .
+DEPPATH += --obj-path .
+DEPPATH += --obj-suffix $(SUFFIX)$(OBJEXT)
 
 VPATH += :.
 
@@ -226,9 +225,9 @@ endif
 
 .depend: Makefile $(wildcard $(foreach SRC, $(SRCS), $(addsuffix /$(SRC), $(subst :, ,$(VPATH))))) $(DEPCONFIG)
 ifeq ($(filter %$(CXXEXT),$(SRCS)),)
-	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
+	$(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
 else
-	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
+	$(Q) $(MKDEP) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
 endif
 	$(Q) touch $@
 

diff --git a/examples/elf/Makefile b/examples/elf/Makefile
@@ -52,7 +52,7 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
 STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
 MODULE = $(CONFIG_EXAMPLES_ELF)
 
-ROOTDEPPATH := --dep-path tests
+DEPPATH := --dep-path tests
 
 # Build targets
 

diff --git a/examples/module/Makefile b/examples/module/Makefile
@@ -54,7 +54,7 @@ CSRCS += mod_symtab.c
 MAINSRC = module_main.c
 
 VPATH += drivers
-ROOTDEPPATH += --dep-path drivers
+DEPPATH += --dep-path drivers
 
 # Build targets
 

diff --git a/examples/nxflat/Makefile b/examples/nxflat/Makefile
@@ -47,7 +47,7 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
 STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
 MODULE = $(CONFIG_EXAMPLES_NXFLAT)
 
-ROOTDEPPATH := --dep-path tests
+DEPPATH := --dep-path tests
 
 VPATH += :tests
 

diff --git a/examples/posix_spawn/Makefile b/examples/posix_spawn/Makefile
@@ -46,7 +46,7 @@ PRIORITY = SCHED_PRIORITY_DEFAULT
 STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
 MODULE = $(CONFIG_EXAMPLES_POSIXSPAWN)
 
-ROOTDEPPATH	+= --dep-path filesystem
+DEPPATH	+= --dep-path filesystem
 
 # Build targets
 

diff --git a/examples/sotest/Makefile b/examples/sotest/Makefile
@@ -50,7 +50,7 @@ endif
 CSRCS += sot_symtab.c
 MAINSRC = sotest_main.c
 
-ROOTDEPPATH += --dep-path lib
+DEPPATH += --dep-path lib
 
 # Build targets
 

diff --git a/examples/thttpd/Makefile b/examples/thttpd/Makefile
@@ -54,7 +54,7 @@ STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
 MODULE = $(CONFIG_EXAMPLES_THTTPD)
 
 VPATH += content
-ROOTDEPPATH += --dep-path content
+DEPPATH += --dep-path content
 
 content/romfs.c: build
 ifeq ($(CONFIG_THTTPD_NXFLAT),y)

diff --git a/examples/thttpd/content/Makefile.binfs b/examples/thttpd/content/Makefile.binfs
@@ -41,7 +41,7 @@ STACKSIZE = $(CONFIG_THTTPD_CGI_STACKSIZE)
 
 CSRCS = hello.c tasks.c
 
-ROOTDEPPATH += --dep-path hello --dep-path tasks
+DEPPATH += --dep-path hello --dep-path tasks
 VPATH += :hello:tasks
 
 include $(APPDIR)/Application.mk

diff --git a/interpreters/ficl/Makefile b/interpreters/ficl/Makefile
@@ -53,7 +53,7 @@ ASRCS += $(FICL_ASRCS)
 CXXSRCS += $(FICL_CXXSRCS)
 CSRCS += $(FICL_CSRCS)
 
-ROOTDEPPATH += --dep-path src
+DEPPATH += --dep-path src
 
 VPATH += :src:$(FICL_SUBDIR)
 

diff --git a/platform/Makefile b/platform/Makefile
@@ -50,9 +50,9 @@ else
 endif
 
 VPATH       += board
-ROOTDEPPATH += --obj-path bin
-ROOTDEPPATH += --obj-suffix $(OBJEXT)
-ROOTDEPPATH += --dep-path $(PLATFORMDIR)
+DEPPATH += --obj-path bin
+DEPPATH += --obj-suffix $(OBJEXT)
+DEPPATH += --dep-path $(PLATFORMDIR)
 
 # Binaries
 

diff --git a/system/hexed/Makefile b/system/hexed/Makefile
@@ -49,6 +49,6 @@ MAINSRC = hexed.c
 CFLAGS += ${shell $(INCDIR) "$(CC)" include}
 
 VPATH += :src
-ROOTDEPPATH += --dep-path src
+DEPPATH += --dep-path src
 
 include $(APPDIR)/Application.mk