Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
98d33a5e
Unverified
Commit
98d33a5e
authored
7 years ago
by
Gaëtan Harter
Browse files
Options
Downloads
Patches
Plain Diff
Makefile.include: use RIOTTOOLS variable
parent
7f83c450
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile.include
+6
-6
6 additions, 6 deletions
Makefile.include
with
6 additions
and
6 deletions
Makefile.include
+
6
−
6
View file @
98d33a5e
...
...
@@ -13,12 +13,12 @@ RIOTMAKE ?= $(RIOTBASE)/makefiles
RIOTPKG
?=
$(
RIOTBASE
)
/pkg
RIOTTOOLS
?=
$(
RIOTBASE
)
/dist/tools
RIOTPROJECT
?=
$(
shell git rev-parse
--show-toplevel
2>/dev/null
||
pwd
)
GITCACHE
?=
$(
RIOT
BASE
)
/dist/tools
/git/git-cache
GITCACHE
?=
$(
RIOT
TOOLS
)
/git/git-cache
APPDIR
?=
$(
CURDIR
)
BINDIRBASE
?=
$(
APPDIR
)
/bin
BINDIR
?=
$(
BINDIRBASE
)
/
$(
BOARD
)
PKGDIRBASE
?=
$(
BINDIRBASE
)
/pkg/
$(
BOARD
)
DLCACHE
?=
$(
RIOT
BASE
)
/dist/tools
/dlcache/dlcache.sh
DLCACHE
?=
$(
RIOT
TOOLS
)
/dlcache/dlcache.sh
DLCACHE_DIR
?=
$(
RIOTBASE
)
/.dlcache
__DIRECTORY_VARIABLES
:=
\
...
...
@@ -457,7 +457,7 @@ term: $(filter flash, $(MAKECMDGOALS)) $(TERMDEPS)
$(
TERMPROG
)
$(
TERMFLAGS
)
list-ttys
:
$(
Q
)$(
RIOT
BASE
)
/dist/tools
/usb-serial/list-ttys.sh
$(
Q
)$(
RIOT
TOOLS
)
/usb-serial/list-ttys.sh
doc
:
make
-BC
$(
RIOTBASE
)
doc
...
...
@@ -493,7 +493,7 @@ eclipsesym.xml: $(CURDIR)/eclipsesym.xml
$(CURDIR)/eclipsesym.xml
:
$(
Q
)
printf
"%s
\n
"
$(
CC
)
$(
CFLAGS_WITH_MACROS
)
$(
INCLUDES
)
|
\
$(
RIOT
BASE
)
/dist/tools
/eclipsesym/cmdline2xml.sh
>
$@
$(
RIOT
TOOLS
)
/eclipsesym/cmdline2xml.sh
>
$@
# Export variables used throughout the whole make system:
include
$(RIOTMAKE)/vars.inc.mk
...
...
@@ -597,7 +597,7 @@ ifneq (,$(filter iotlab-m3 wsn430-v1_3b wsn430-v1_4,$(BOARD)))
endif
# Include desvirt Makefile
include
$(RIOT
BASE)/dist/tools
/desvirt/Makefile.desvirt
include
$(RIOT
TOOLS)
/desvirt/Makefile.desvirt
# include bindist target
include
$(RIOTMAKE)/bindist.inc.mk
...
...
@@ -611,7 +611,7 @@ include $(RIOTMAKE)/modules.inc.mk
.PHONY
:
$(RIOTBUILD_CONFIG_HEADER_C)
$(RIOTBUILD_CONFIG_HEADER_C)
:
@
mkdir
-p
'
$(
dir $@
)
'
$(
Q
)
'
$(
RIOT
BASE
)
/dist/tools
/genconfigheader/genconfigheader.sh'
'$@'
$(
CFLAGS_WITH_MACROS
)
$(
Q
)
'
$(
RIOT
TOOLS
)
/genconfigheader/genconfigheader.sh'
'$@'
$(
CFLAGS_WITH_MACROS
)
CFLAGS_WITH_MACROS
:=
$(
CFLAGS
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment