sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile: Unify ROOTDEPPATH into DEPPATH

Browse Source 
DEPPATH is commonly used in nuttx repo, so it to be the same with them.
This commit is contained in:
SPRESENSE 2020-07-29 13:28:00 +09:00 committed by Alin Jerpelea
parent 381b83ea90
commit 63cd701958
11 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Application.mk
View File

@ -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 $@

2
examples/elf/Makefile
View File

@ -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

2
examples/module/Makefile
View File

@ -54,7 +54,7 @@ CSRCS += mod_symtab.c
MAINSRC = module_main.c
VPATH += drivers
ROOTDEPPATH += --dep-path drivers
DEPPATH += --dep-path drivers
# Build targets

2
examples/nxflat/Makefile
View File

@ -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

2
examples/posix_spawn/Makefile
View File

@ -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

2
examples/sotest/Makefile
View File

@ -50,7 +50,7 @@ endif
CSRCS += sot_symtab.c
MAINSRC = sotest_main.c
ROOTDEPPATH += --dep-path lib
DEPPATH += --dep-path lib
# Build targets

2
examples/thttpd/Makefile
View File

@ -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)

2
examples/thttpd/content/Makefile.binfs
View File

@ -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

2
interpreters/ficl/Makefile
View File

@ -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)

6
platform/Makefile
View File

@ -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

2
system/hexed/Makefile
View File

@ -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