Makefile variables $(*-dir) should not have a trailing slash

As a general rule, Makefile variables that are directories should not have
a trailing slash, and should be used as: $(some-dir)/some-file rather than
$(some-dir)some-file. This is more readable.

5 files changed, 39 insertions, 39 deletions

diff --git a/core/arch/arm32/plat-stm/conf.mk b/core/arch/arm32/plat-stm/conf.mk
index b841f2bd..0bb965fd 100644
--- a/core/arch/arm32/plat-stm/conf.mk
+++ b/core/arch/arm32/plat-stm/conf.mk
@@ -9,7 +9,7 @@ platform-cflags	 = -mcpu=$(platform-cpuarch) -mthumb
 platform-cflags	+= -pipe -mthumb-interwork -mlong-calls
 platform-cflags += -fno-short-enums -mno-apcs-float -fno-common
 platform-aflags	 = -mcpu=$(platform-cpuarch)
-core-platform-cppflags	 = -I$(arch-dir)include
+core-platform-cppflags	 = -I$(arch-dir)/include
 core-platform-cppflags	+= -DNUM_THREADS=2
 core-platform-cppflags	+= -DWITH_STACK_CANARIES=1
 user_ta-platform-cflags = -fpie
@@ -24,13 +24,13 @@ platform-cflags += -g
 platform-aflags += -g
 
 core-platform-subdirs += \
-	$(addprefix $(arch-dir), kernel mm sm tee sta) $(patsubst %/,%,$(platform-dir))
+	$(addprefix $(arch-dir)/, kernel mm sm tee sta) $(platform-dir)
 
 libutil_with_isoc := y
 WITH_PL310 := y
 
 include mk/config.mk
-include $(platform-dir)system_config.in
+include $(platform-dir)/system_config.in
 
 core-platform-cppflags += -DCFG_TEE_CORE_NB_CORE=$(CFG_TEE_CORE_NB_CORE)
 
@@ -77,10 +77,10 @@ SECONDARY_STARTUP_PHYS	 = $(shell echo $$((\
 else ifeq ($(PLATFORM_FLAVOR),orly2)
 
 PRIMARY_STARTUP_PHYS	 = \
-	0x$(shell grep stext $(platform-dir)System.map | grep -v _stext | \
+	0x$(shell grep stext $(platform-dir)/System.map | grep -v _stext | \
 		cut -d' ' -f 1)
 SECONDARY_STARTUP_PHYS	 = \
-	0x$(shell grep stm_secondary_startup $(platform-dir)System.map | \
+	0x$(shell grep stm_secondary_startup $(platform-dir)/System.map | \
 		cut -d' ' -f 1)
 else
 $(error PLATFORM_FLAVOR=$(PLATFORM_FLAVOR) is not supported)
diff --git a/core/arch/arm32/plat-stm/link.mk b/core/arch/arm32/plat-stm/link.mk
index 4e7a7c02..17a4352f 100644
--- a/core/arch/arm32/plat-stm/link.mk
+++ b/core/arch/arm32/plat-stm/link.mk
@@ -1,17 +1,17 @@
-link-out-dir = $(out-dir)core/
+link-out-dir = $(out-dir)/core
 
-link-script = $(platform-dir)tz-template.lds
-link-script-pp = $(link-out-dir)tz.lds
+link-script = $(platform-dir)/tz-template.lds
+link-script-pp = $(link-out-dir)/tz.lds
 
-all: $(link-out-dir)tee.elf $(link-out-dir)tee.dmp $(link-out-dir)tee.bin
-all: $(link-out-dir)tee.symb_sizes
-cleanfiles += $(link-out-dir)tee.elf $(link-out-dir)tee.dmp $(link-out-dir)tee.map
-cleanfiles += $(link-out-dir)tee.bin
-cleanfiles += $(link-out-dir)tee.symb_sizes
+all: $(link-out-dir)/tee.elf $(link-out-dir)/tee.dmp $(link-out-dir)/tee.bin
+all: $(link-out-dir)/tee.symb_sizes
+cleanfiles += $(link-out-dir)/tee.elf $(link-out-dir)/tee.dmp $(link-out-dir)/tee.map
+cleanfiles += $(link-out-dir)/tee.bin
+cleanfiles += $(link-out-dir)/tee.symb_sizes
 cleanfiles += $(link-script-pp)
 
 link-ldflags  = $(LDFLAGS)
-link-ldflags += -T $(link-script-pp) -Map=$(link-out-dir)tee.map
+link-ldflags += -T $(link-script-pp) -Map=$(link-out-dir)/tee.map
 link-ldflags += --sort-section=alignment
 
 link-ldadd  = $(LDADD)
@@ -24,18 +24,18 @@ $(link-script-pp): $(link-script) $(MAKEFILE_LIST)
 	$(q)sed -e "s/%in_TEE_SCATTER_START%/$(TEE_SCATTER_START)/g" < $< > $@
 
 
-$(link-out-dir)tee.elf: $(objs) $(libdeps) $(link-script-pp)
+$(link-out-dir)/tee.elf: $(objs) $(libdeps) $(link-script-pp)
 	@echo '  LD      $@'
 	$(q)$(LD) $(ldargs-tee.elf) -o $@
 
-$(link-out-dir)tee.dmp: $(link-out-dir)tee.elf
+$(link-out-dir)/tee.dmp: $(link-out-dir)/tee.elf
 	@echo '  OBJDUMP $@'
 	$(q)$(OBJDUMP) -l -x -d $< > $@
 
-$(link-out-dir)tee.bin: $(link-out-dir)tee.elf
+$(link-out-dir)/tee.bin: $(link-out-dir)/tee.elf
 	@echo '  OBJCOPY $@'
 	$(q)$(OBJCOPY) -O binary $< $@
 
-$(link-out-dir)tee.symb_sizes: $(link-out-dir)tee.elf
+$(link-out-dir)/tee.symb_sizes: $(link-out-dir)/tee.elf
 	@echo '  GEN     $@'
 	$(q)$(NM) --print-size --reverse-sort --size-sort $< > $@
diff --git a/core/arch/arm32/plat-vexpress/conf.mk b/core/arch/arm32/plat-vexpress/conf.mk
index 50dba3a7..2be0d037 100644
--- a/core/arch/arm32/plat-vexpress/conf.mk
+++ b/core/arch/arm32/plat-vexpress/conf.mk
@@ -10,7 +10,7 @@ platform-cflags	+= -pipe -mthumb-interwork -mlong-calls
 platform-cflags += -fno-short-enums -mno-apcs-float -fno-common
 platform-cflags += -mno-unaligned-access
 platform-aflags	 = -mcpu=$(platform-cpuarch)
-core-platform-cppflags	 = -I$(arch-dir)include
+core-platform-cppflags	 = -I$(arch-dir)/include
 core-platform-cppflags	+= -DNUM_THREADS=2
 core-platform-cppflags	+= -DWITH_STACK_CANARIES=1
 user_ta-platform-cflags = -fpie
@@ -35,9 +35,9 @@ platform-aflags += -g3
 endif
 
 core-platform-subdirs += \
-	$(addprefix $(arch-dir), kernel mm tee sta) $(patsubst %/,%,$(platform-dir))
+	$(addprefix $(arch-dir)/, kernel mm tee sta) $(platform-dir)
 ifneq ($(PLATFORM_FLAVOR),fvp)
-core-platform-subdirs += $(arch-dir)sm
+core-platform-subdirs += $(arch-dir)/sm
 core-platform-cppflags += -DWITH_SEC_MON=1
 else
 core-platform-cppflags += -DWITH_ARM_TRUSTED_FW=1
diff --git a/core/arch/arm32/plat-vexpress/link.mk b/core/arch/arm32/plat-vexpress/link.mk
index 2e327b1d..3ff1f059 100644
--- a/core/arch/arm32/plat-vexpress/link.mk
+++ b/core/arch/arm32/plat-vexpress/link.mk
@@ -1,20 +1,20 @@
-link-out-dir = $(out-dir)core/
+link-out-dir = $(out-dir)/core
 
-link-script = $(platform-dir)kern.ld.S
-link-script-pp = $(link-out-dir)kern.ld
-link-script-dep = $(link-out-dir).kern.ld.d
+link-script = $(platform-dir)/kern.ld.S
+link-script-pp = $(link-out-dir)/kern.ld
+link-script-dep = $(link-out-dir)/.kern.ld.d
 
 AWK	 = awk
 
-all: $(link-out-dir)tee.elf $(link-out-dir)tee.dmp $(link-out-dir)tee.bin
-all: $(link-out-dir)tee.symb_sizes
-cleanfiles += $(link-out-dir)tee.elf $(link-out-dir)tee.dmp $(link-out-dir)tee.map
-cleanfiles += $(link-out-dir)tee.bin
-cleanfiles += $(link-out-dir)tee.symb_sizes
+all: $(link-out-dir)/tee.elf $(link-out-dir)/tee.dmp $(link-out-dir)/tee.bin
+all: $(link-out-dir)/tee.symb_sizes
+cleanfiles += $(link-out-dir)/tee.elf $(link-out-dir)/tee.dmp $(link-out-dir)/tee.map
+cleanfiles += $(link-out-dir)/tee.bin
+cleanfiles += $(link-out-dir)/tee.symb_sizes
 cleanfiles += $(link-script-pp) $(link-script-dep)
 
 link-ldflags  = $(LDFLAGS)
-link-ldflags += -T $(link-script-pp) -Map=$(link-out-dir)tee.map
+link-ldflags += -T $(link-script-pp) -Map=$(link-out-dir)/tee.map
 link-ldflags += --sort-section=alignment
 
 link-ldadd  = $(LDADD)
@@ -37,18 +37,18 @@ $(link-script-pp): $(link-script)
 		$(link-script-cppflags) $< > $@
 
 
-$(link-out-dir)tee.elf: $(objs) $(libdeps) $(link-script-pp)
+$(link-out-dir)/tee.elf: $(objs) $(libdeps) $(link-script-pp)
 	@echo '  LD      $@'
 	$(q)$(LD) $(ldargs-tee.elf) -o $@
 
-$(link-out-dir)tee.dmp: $(link-out-dir)tee.elf
+$(link-out-dir)/tee.dmp: $(link-out-dir)/tee.elf
 	@echo '  OBJDUMP $@'
 	$(q)$(OBJDUMP) -l -x -d $< > $@
 
-$(link-out-dir)tee.bin: $(link-out-dir)tee.elf
+$(link-out-dir)/tee.bin: $(link-out-dir)/tee.elf
 	@echo '  OBJCOPY $@'
 	$(q)$(OBJCOPY) -O binary $< $@
 
-$(link-out-dir)tee.symb_sizes: $(link-out-dir)tee.elf
+$(link-out-dir)/tee.symb_sizes: $(link-out-dir)/tee.elf
 	@echo '  GEN     $@'
 	$(q)$(NM) --print-size --reverse-sort --size-sort $< > $@
diff --git a/core/core.mk b/core/core.mk
index 200f1ef4..6a6ba5df 100644
--- a/core/core.mk
+++ b/core/core.mk
@@ -4,9 +4,9 @@ include mk/cleanvars.mk
 sm := core
 sm-$(sm) := y
 
-arch-dir	:= core/arch/$(ARCH)/
-platform-dir	:= $(arch-dir)plat-$(PLATFORM)/
-include $(platform-dir)conf.mk
+arch-dir	:= core/arch/$(ARCH)
+platform-dir	:= $(arch-dir)/plat-$(PLATFORM)
+include $(platform-dir)/conf.mk
 
 PLATFORM_FLAVOR ?= default
 platform_$(PLATFORM) := y
@@ -51,6 +51,6 @@ include mk/lib.mk
 subdirs = $(core-platform-subdirs) core
 include mk/subdir.mk
 include mk/compile.mk
-include $(platform-dir)link.mk
+include $(platform-dir)/link.mk