RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 04:52:59 +01:00
Code Releases Activity

Makefile.include: use RIOTTOOLS variable

Browse Source
This commit is contained in:
Gaëtan Harter 2018-03-22 17:15:52 +01:00
parent 7f83c450c8
commit 98d33a5eca
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.include
View File

@ -13,12 +13,12 @@ RIOTMAKE ?= $(RIOTBASE)/makefiles
RIOTPKG ?= $(RIOTBASE)/pkg RIOTPKG ?= $(RIOTBASE)/pkg
RIOTTOOLS ?= $(RIOTBASE)/dist/tools RIOTTOOLS ?= $(RIOTBASE)/dist/tools
RIOTPROJECT ?= $(shell git rev-parse --show-toplevel 2>/dev/null || pwd) RIOTPROJECT ?= $(shell git rev-parse --show-toplevel 2>/dev/null || pwd)
GITCACHE ?= $(RIOTBASE)/dist/tools/git/git-cache GITCACHE ?= $(RIOTTOOLS)/git/git-cache
APPDIR ?= $(CURDIR) APPDIR ?= $(CURDIR)
BINDIRBASE ?= $(APPDIR)/bin BINDIRBASE ?= $(APPDIR)/bin
BINDIR ?= $(BINDIRBASE)/$(BOARD) BINDIR ?= $(BINDIRBASE)/$(BOARD)
PKGDIRBASE ?= $(BINDIRBASE)/pkg/$(BOARD) PKGDIRBASE ?= $(BINDIRBASE)/pkg/$(BOARD)
DLCACHE ?= $(RIOTBASE)/dist/tools/dlcache/dlcache.sh DLCACHE ?= $(RIOTTOOLS)/dlcache/dlcache.sh
DLCACHE_DIR ?= $(RIOTBASE)/.dlcache DLCACHE_DIR ?= $(RIOTBASE)/.dlcache
__DIRECTORY_VARIABLES := \ __DIRECTORY_VARIABLES := \
@ -457,7 +457,7 @@ term: $(filter flash, $(MAKECMDGOALS)) $(TERMDEPS)
$(TERMPROG) $(TERMFLAGS) $(TERMPROG) $(TERMFLAGS)
list-ttys: list-ttys:
$(Q)$(RIOTBASE)/dist/tools/usb-serial/list-ttys.sh $(Q)$(RIOTTOOLS)/usb-serial/list-ttys.sh
doc: doc:
make -BC $(RIOTBASE) doc make -BC $(RIOTBASE) doc
@ -493,7 +493,7 @@ eclipsesym.xml: $(CURDIR)/eclipsesym.xml
$(CURDIR)/eclipsesym.xml: $(CURDIR)/eclipsesym.xml:
$(Q)printf "%s\n" $(CC) $(CFLAGS_WITH_MACROS) $(INCLUDES) | \ $(Q)printf "%s\n" $(CC) $(CFLAGS_WITH_MACROS) $(INCLUDES) | \
$(RIOTBASE)/dist/tools/eclipsesym/cmdline2xml.sh > $@ $(RIOTTOOLS)/eclipsesym/cmdline2xml.sh > $@
# Export variables used throughout the whole make system: # Export variables used throughout the whole make system:
include $(RIOTMAKE)/vars.inc.mk include $(RIOTMAKE)/vars.inc.mk
@ -597,7 +597,7 @@ ifneq (,$(filter iotlab-m3 wsn430-v1_3b wsn430-v1_4,$(BOARD)))
endif endif
# Include desvirt Makefile # Include desvirt Makefile
include $(RIOTBASE)/dist/tools/desvirt/Makefile.desvirt include $(RIOTTOOLS)/desvirt/Makefile.desvirt
# include bindist target # include bindist target
include $(RIOTMAKE)/bindist.inc.mk include $(RIOTMAKE)/bindist.inc.mk
@ -611,7 +611,7 @@ include $(RIOTMAKE)/modules.inc.mk
.PHONY: $(RIOTBUILD_CONFIG_HEADER_C) .PHONY: $(RIOTBUILD_CONFIG_HEADER_C)
$(RIOTBUILD_CONFIG_HEADER_C): $(RIOTBUILD_CONFIG_HEADER_C):
@mkdir -p '$(dir $@)' @mkdir -p '$(dir $@)'
$(Q)'$(RIOTBASE)/dist/tools/genconfigheader/genconfigheader.sh' '$@' $(CFLAGS_WITH_MACROS) $(Q)'$(RIOTTOOLS)/genconfigheader/genconfigheader.sh' '$@' $(CFLAGS_WITH_MACROS)
CFLAGS_WITH_MACROS := $(CFLAGS) CFLAGS_WITH_MACROS := $(CFLAGS)