From 026f51b0fb682833e7603e00ac41c1ff74aa3472 Mon Sep 17 00:00:00 2001 From: alexrayne Date: Thu, 15 Feb 2018 17:12:53 +0300 Subject: [PATCH] *Makefile.include - ommits '.' dir in SOURCEDIRS if one alredy provided PROJECTDIRS --- Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.include b/Makefile.include index 67b0ff595ae..3b694f00f23 100644 --- a/Makefile.include +++ b/Makefile.include @@ -181,7 +181,9 @@ CONTIKI_TARGET_DIRS_CONCAT = ${addprefix ${dir $(target_makefile)}, \ CONTIKI_CPU_DIRS_CONCAT = ${addprefix $(CONTIKI_CPU)/, \ $(CONTIKI_CPU_DIRS)} -SOURCEDIRS = . $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) \ + +SOURCEDIRS = ${if ${findstring ., $(PROJECTDIRS) }, , . } \ + $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) \ $(CONTIKI_CPU_DIRS_CONCAT) $(CONTIKIDIRS) $(APPDS) $(EXTERNALDIRS) ${dir $(target_makefile)} vpath %.c $(SOURCEDIRS)