kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 14:33:52 +01:00
Code Releases Activity

Makefile.include: rename MAKEFILEDIR to LAST_MAKEFILEDIR

Browse Source 
Rename the variable to make it clearer that it refers to the last Makefile
included.
Usually this is the current file, but when another Makefile is included this
changes.
This commit is contained in:
Benjamin Valentin 2020-04-28 15:45:27 +02:00
parent 6887e2f40e
commit d5dce87e1b
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.include
View File

@ -10,15 +10,15 @@ endif
# Will evaluate to the absolute path of the Makefile it's evaluated in.¹
#
# This variable MUST be immediately evaluated (tmp_var := $(MAKEFILEDIR))
# This variable MUST be immediately evaluated (tmp_var := $(LAST_MAKEFILEDIR))
# unless it is used directly.
#
# [1] Note that this will in fact return the path of the last Makefile that
# was included, so it must be evaluated before any subsequent includes.
MAKEFILEDIR = $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
LAST_MAKEFILEDIR = $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
# 'Makefile.include' directory, must be evaluated before other 'include'
_riotbase := $(MAKEFILEDIR)
_riotbase := $(LAST_MAKEFILEDIR)
# include RIOT_MAKEFILES_GLOBAL_PRE configuration files
# allows setting user specific system wide configuration parsed before the body

2
cpu/kinetis/Makefile.include
View File

@ -1,7 +1,7 @@
ifeq (,$(KINETIS_SERIES))
# Parse parameters from CPU_MODEL using the kinetis-info.mk script in the same
# directory as this Makefile.
include $(MAKEFILEDIR)/kinetis-info.mk
include $(LAST_MAKEFILEDIR)/kinetis-info.mk
endif
# "The Vector table must be naturally aligned to a power of two whose alignment

4
tests/cpp_exclude/module_exclude/Makefile.include
View File

@ -1,3 +1,3 @@
# Use an immediate variable to evaluate `MAKEFILEDIR` now
USEMODULE_INCLUDES_module_exclude := $(MAKEFILEDIR)
# Use an immediate variable to evaluate `LAST_MAKEFILEDIR` now
USEMODULE_INCLUDES_module_exclude := $(LAST_MAKEFILEDIR)
USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_module_exclude)

2
tests/cpp_ext/module/Makefile.include
View File

@ -1,3 +1,3 @@
# Use an immediate variable to evaluate `MAKEFILE_LIST` now
USEMODULE_INCLUDES_module := $(MAKEFILEDIR)
USEMODULE_INCLUDES_module := $(LAST_MAKEFILEDIR)
USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_module)

2
tests/external_module_dirs/external_module/Makefile.include
View File

@ -1,3 +1,3 @@
# Use an immediate variable to evaluate `MAKEFILE_LIST` now
USEMODULE_INCLUDES_external_module := $(MAKEFILEDIR)/include
USEMODULE_INCLUDES_external_module := $(LAST_MAKEFILEDIR)/include
USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_external_module)

2
tests/pkg_utensor/models/Makefile.include
View File

@ -1,5 +1,5 @@
# Use an immediate variable to evaluate `MAKEFILE_LIST` now
USEMODULE_INCLUDES_models := $(MAKEFILEDIR)
USEMODULE_INCLUDES_models := $(LAST_MAKEFILEDIR)
USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_models)
CXXEXFLAGS += -Wno-unused-parameter