Merge branch 'bugfix/spiffs_readdir_recursion' into 'master'

[esp-idf] / make / common.mk

diff --git a/make/common.mk b/make/common.mk
index ea39421cb0dbfa1576ffb63ab9f7212a15492f0d..2eb0f0d3c0a8072effdd0ed1c10478144c8cfa73 100644 (file)
--- a/make/common.mk
+++ b/make/common.mk
@@ -27,10 +27,10 @@ details := @echo
 else
 summary := @echo
 details := @true
-endif
 
 # disable echoing of commands, directory names
 MAKEFLAGS += --silent
+endif  # $(V)==1
 
 ifdef CONFIG_MAKE_WARN_UNDEFINED_VARIABLES
 MAKEFLAGS += --warn-undefined-variables
@@ -62,7 +62,7 @@ endef
 #
 # example $(call resolvepath,$(CONFIG_PATH),$(CONFIG_DIR))
 define resolvepath
-$(foreach dir,$(1),$(if $(filter /%,$(dir)),$(dir),$(subst //,/,$(2)/$(dir))))
+$(abspath $(foreach dir,$(1),$(if $(filter /%,$(dir)),$(dir),$(subst //,/,$(2)/$(dir)))))
 endef
 
 
@@ -86,3 +86,11 @@ endef
 define uniq
 $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 endef
+
+# macro to strip leading ../s from a path
+# Given $(1) which is a directory, remove any leading ../s from it
+# (recursively keeps removing ../ until not found)
+# if the path contains nothing but ../.., a single . is returned (cwd)
+define stripLeadingParentDirs
+$(foreach path,$(1),$(if $(subst ..,,$(path)),$(if $(filter ../%,$(path)),$(call stripLeadingParentDirs,$(patsubst ../%,%,$(path))),$(path)),.))
+endef