@@ -25,9 +25,9 @@ override RIOTBOARD := $(abspath $(RIOTBOARD))
25
25
override RIOTPKG := $(abspath $(RIOTPKG))
26
26
override RIOTPROJECT := $(abspath $(RIOTPROJECT))
27
27
override GITCACHE := $(abspath $(GITCACHE))
28
- override APPDIR := $(abspath $(APPDIR))/
28
+ override APPDIR := $(abspath $(APPDIR))
29
29
override BINDIRBASE := $(abspath $(BINDIRBASE))
30
- override BINDIR := $(abspath $(BINDIR))/
30
+ override BINDIR := $(abspath $(BINDIR))
31
31
32
32
# Ensure that all directories are set and don't contain spaces.
33
33
ifneq (, $(filter-out 1, $(foreach v,${__DIRECTORY_VARIABLES},$(words ${${v}}))))
@@ -50,7 +50,7 @@ include $(RIOTBASE)/Makefile.docker
50
50
# Static code analysis tools provided by LLVM
51
51
include $(RIOTBASE)/Makefile.scan-build
52
52
53
- export RIOTBUILD_CONFIG_HEADER_C = $(BINDIR)riotbuild/riotbuild.h
53
+ export RIOTBUILD_CONFIG_HEADER_C = $(BINDIR)/ riotbuild/riotbuild.h
54
54
55
55
COLOR_GREEN :=
56
56
COLOR_RED :=
@@ -213,8 +213,8 @@ CFLAGS += -DCPU_$(CPUDEF)=\"$(CPU)\" -DRIOT_CPU=CPU_$(CPUDEF)
213
213
CFLAGS += -DMCU_$(MCUDEF)=\"$(MCU)\" -DRIOT_MCU=MCU_$(MCUDEF)
214
214
215
215
# OSX fails to create empty archives. Provide a wrapper to catch that error.
216
- ifneq (0, $(shell mkdir -p $(BINDIR); $(AR) rc $(BINDIR)empty-archive.a 2> /dev/null; \
217
- echo $$?; rm -f $(BINDIR)empty-archive.a 2>&1 > /dev/null))
216
+ ifneq (0, $(shell mkdir -p $(BINDIR); $(AR) rc $(BINDIR)/ empty-archive.a 2> /dev/null; \
217
+ echo $$?; rm -f $(BINDIR)/ empty-archive.a 2>&1 > /dev/null))
218
218
AR := $(RIOTBASE)/dist/ar-wrapper $(AR)
219
219
endif
220
220
@@ -237,13 +237,13 @@ ifeq ($(origin RIOT_VERSION), undefined)
237
237
endif
238
238
239
239
# the binaries to link
240
- BASELIBS += $(BINDIR)${APPLICATION}.a
240
+ BASELIBS += $(BINDIR)/ ${APPLICATION}.a
241
241
BASELIBS += $(APPDEPS)
242
242
243
243
.PHONY: all clean flash term doc debug debug-server reset objdump help info-modules
244
244
.PHONY: ..in-docker-container
245
245
246
- ELFFILE ?= $(BINDIR)$(APPLICATION).elf
246
+ ELFFILE ?= $(BINDIR)/ $(APPLICATION).elf
247
247
HEXFILE ?= $(ELFFILE:.elf=.hex)
248
248
249
249
# variables used to compile and link c++
@@ -258,13 +258,13 @@ ifeq ($(BUILD_IN_DOCKER),1)
258
258
all: ..in-docker-container
259
259
else
260
260
## make script for your application. Build RIOT-base here!
261
- all: ..compiler-check ..build-message $(RIOTBUILD_CONFIG_HEADER_C) $(USEPKG:%=${BINDIR}%.a) $(APPDEPS)
261
+ all: ..compiler-check ..build-message $(RIOTBUILD_CONFIG_HEADER_C) $(USEPKG:%=${BINDIR}/ %.a) $(APPDEPS)
262
262
$(AD)DIRS="$(DIRS)" "$(MAKE)" -C $(APPDIR) -f $(RIOTBASE)/Makefile.application
263
263
ifeq (,$(RIOTNOLINK))
264
264
ifeq ($(BUILDOSXNATIVE),1)
265
265
$(AD)$(if $(CPPMIX),$(CXX),$(LINK)) $(UNDEF) -o $(ELFFILE) $$(find $(BASELIBS) -size +8c) $(LINKFLAGS) $(LINKFLAGPREFIX)-no_pie
266
266
else
267
- $(AD)$(if $(CPPMIX),$(CXX),$(LINK)) $(UNDEF) -o $(ELFFILE) $(LINKFLAGPREFIX)--start-group $(BASELIBS) -lm $(LINKFLAGPREFIX)--end-group $(LINKFLAGPREFIX)-Map=$(BINDIR)$(APPLICATION).map $(LINKFLAGPREFIX)--cref $(LINKFLAGS)
267
+ $(AD)$(if $(CPPMIX),$(CXX),$(LINK)) $(UNDEF) -o $(ELFFILE) $(LINKFLAGPREFIX)--start-group $(BASELIBS) -lm $(LINKFLAGPREFIX)--end-group $(LINKFLAGPREFIX)-Map=$(BINDIR)/ $(APPLICATION).map $(LINKFLAGPREFIX)--cref $(LINKFLAGS)
268
268
endif
269
269
$(AD)$(SIZE) $(ELFFILE)
270
270
$(AD)$(OBJCOPY) $(OFLAGS) $(ELFFILE) $(HEXFILE)
@@ -303,10 +303,10 @@ USEMODULE_INCLUDES_ = $(shell echo $(USEMODULE_INCLUDES) | tr ' ' '\n' | awk '!a
303
303
304
304
INCLUDES += $(USEMODULE_INCLUDES_:%=-I%)
305
305
306
- .PHONY: $(USEPKG:%=${BINDIR}%.a)
307
- $(USEPKG:%=${BINDIR}%.a): $(RIOTBUILD_CONFIG_HEADER_C)
306
+ .PHONY: $(USEPKG:%=${BINDIR}/ %.a)
307
+ $(USEPKG:%=${BINDIR}/ %.a): $(RIOTBUILD_CONFIG_HEADER_C)
308
308
@mkdir -p ${BINDIR}
309
- "$(MAKE)" -C $(RIOTPKG)/$(patsubst ${BINDIR}%.a,%,$@)
309
+ "$(MAKE)" -C $(RIOTPKG)/$(patsubst ${BINDIR}/ %.a,%,$@)
310
310
311
311
clean:
312
312
-@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTPKG)/$$i clean ; done
@@ -469,12 +469,12 @@ else # RIOT_VERSION
469
469
clean:
470
470
-$(AD)rm -rf $(BINDIR)
471
471
472
- $(BINDIR)riot-version/$(NUM_RIOT_VERSION)/Makefile.include:
472
+ $(BINDIR)/ riot-version/$(NUM_RIOT_VERSION)/Makefile.include:
473
473
$(AD)rm -rf $(@D)
474
474
$(AD)mkdir -p $(@D)
475
475
$(AD)cd $(RIOTBASE) && git archive --format=tar $(NUM_RIOT_VERSION) | ( cd $(@D) && tar x 1>&2 )
476
476
477
- ..delegate: $(BINDIR)riot-version/$(NUM_RIOT_VERSION)/Makefile.include
477
+ ..delegate: $(BINDIR)/ riot-version/$(NUM_RIOT_VERSION)/Makefile.include
478
478
@$(COLOR_ECHO) '$(COLOR_GREEN)Using RIOT_VERSION=${NUM_RIOT_VERSION}$(COLOR_RESET)' 1>&2
479
479
@$(COLOR_ECHO)
480
480
$(MAKE) RIOTBASE=$(<D) $(filter-out clean, ${MAKECMDGOALS})
0 commit comments