This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 63cd701958d729cf05aea1d35618f6da122f1843
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Wed Jul 29 13:28:00 2020 +0900
Makefile: Unify ROOTDEPPATH into DEPPATH
DEPPATH is commonly used in nuttx repo, so it to be the same with them.
---
Application.mk | 11 +++++------
examples/elf/Makefile | 2 +-
examples/module/Makefile | 2 +-
examples/nxflat/Makefile | 2 +-
examples/posix_spawn/Makefile | 2 +-
examples/sotest/Makefile | 2 +-
examples/thttpd/Makefile | 2 +-
examples/thttpd/content/Makefile.binfs | 2 +-
interpreters/ficl/Makefile | 2 +-
platform/Makefile | 6 +++---
system/hexed/Makefile | 2 +-
11 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/Application.mk b/Application.mk
index 855434b..153628a 100644
--- 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
index 6cedf90..e6bf6c5 100644
--- 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
index 5267c9f..5dfc173 100644
--- 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
index 3ecf369..68ae086 100644
--- 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
index eb76777..8b84ee7 100644
--- 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
index 08802a8..edc8245 100644
--- 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
index 61faf42..38d8945 100644
--- 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
index 161751e..6df736e 100644
--- 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
index 0dd1fe3..c3991af 100644
--- 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
index ee692f1..098bf42 100644
--- 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
index 42cadc2..cce85aa 100644
--- 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
