riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13846 from benpicco/Makefile-THISDIR

Browse Source 
Makefile.include: add $(MAKEFILEDIR) helper and use it
This commit is contained in:
Francisco 2020-04-21 11:00:52 +02:00 committed by GitHub
commit 3d8f71768c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.include
View File

@ -8,8 +8,11 @@ ifeq (,$(filter $(MATCH_MAKE_VERSION),$(MAKE_VERSION)))
$(MATCH_MAKE_VERSION) or later.) $(MATCH_MAKE_VERSION) or later.)
endif endif
# will evaluate to the absolute path of the Makefile it's evaluated in
MAKEFILEDIR = $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
# 'Makefile.include' directory, must be evaluated before other 'include' # 'Makefile.include' directory, must be evaluated before other 'include'
_riotbase := $(dir $(lastword $(MAKEFILE_LIST))) _riotbase := $(MAKEFILEDIR)
# include RIOT_MAKEFILES_GLOBAL_PRE configuration files # include RIOT_MAKEFILES_GLOBAL_PRE configuration files
# allows setting user specific system wide configuration parsed before the body # 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)) ifeq (,$(KINETIS_SERIES))
# Parse parameters from CPU_MODEL using the kinetis-info.mk script in the same # Parse parameters from CPU_MODEL using the kinetis-info.mk script in the same
# directory as this Makefile. # directory as this Makefile.
include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/kinetis-info.mk include $(MAKEFILEDIR)/kinetis-info.mk
endif endif
# "The Vector table must be naturally aligned to a power of two whose alignment # "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 `MAKEFILE_LIST` now # Use an immediate variable to evaluate `MAKEFILEDIR` now
USEMODULE_INCLUDES_module_exclude := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) USEMODULE_INCLUDES_module_exclude := $(MAKEFILEDIR)
USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_module_exclude) 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 # Use an immediate variable to evaluate `MAKEFILE_LIST` now
USEMODULE_INCLUDES_module := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) USEMODULE_INCLUDES_module := $(MAKEFILEDIR)
USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_module) 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 # Use an immediate variable to evaluate `MAKEFILE_LIST` now
USEMODULE_INCLUDES_external_module := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))/include USEMODULE_INCLUDES_external_module := $(MAKEFILEDIR)/include
USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_external_module) 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 # Use an immediate variable to evaluate `MAKEFILE_LIST` now
USEMODULE_INCLUDES_models := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) USEMODULE_INCLUDES_models := $(MAKEFILEDIR)
USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_models) USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_models)
CXXEXFLAGS += -Wno-unused-parameter CXXEXFLAGS += -Wno-unused-parameter