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

Merge pull request #8492 from cladmi/pr/prepend_app_module_by_application

Browse Source 
makefiles: Add an APPLICATION_MODULE variable
This commit is contained in:
Francisco Acosta 2018-02-28 12:13:14 +01:00 committed by GitHub
commit 2e066e8693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.include
View File

@ -296,8 +296,12 @@ ifeq ($(origin RIOT_VERSION), undefined)
endif endif
endif endif
# Set module by prepending APPLICATION name with 'application_'.
# It prevents conflict with application and modules with the same name.
APPLICATION_MODULE ?= application_$(APPLICATION)
# the binaries to link # the binaries to link
BASELIBS += $(BINDIR)/${APPLICATION}.a BASELIBS += $(BINDIR)/$(APPLICATION_MODULE).a
BASELIBS += $(APPDEPS) BASELIBS += $(APPDEPS)
.PHONY: all link clean flash flash-only term doc debug debug-server reset objdump help info-modules .PHONY: all link clean flash flash-only term doc debug debug-server reset objdump help info-modules

4
examples/bindist/Makefile
View File

@ -22,8 +22,8 @@ QUIET ?= 1
# to flag that the directory should only be included when doing a normal build, # to flag that the directory should only be included when doing a normal build,
# and that the resulting .a should be saved when doing "make bindist" # and that the resulting .a should be saved when doing "make bindist"
BIN_DIRS += abc BIN_DIRS += abc
BIN_USEMODULE += abc # include "abc" module BIN_USEMODULE += abc # include "abc" module
BIN_USEMODULE += bindist # include application module (named $APPLICATION) BIN_USEMODULE += $(APPLICATION_MODULE) # include application module
# list of extra files to include in binary distribution # list of extra files to include in binary distribution
DIST_FILES += Makefile DIST_FILES += Makefile

2
makefiles/application.inc.mk
View File

@ -1,4 +1,4 @@
MODULE = $(APPLICATION) MODULE = $(APPLICATION_MODULE)
DIRS += $(RIOTCPU)/$(CPU) $(RIOTBOARD)/$(BOARD) DIRS += $(RIOTCPU)/$(CPU) $(RIOTBOARD)/$(BOARD)
DIRS += $(RIOTBASE)/core $(RIOTBASE)/drivers $(RIOTBASE)/sys DIRS += $(RIOTBASE)/core $(RIOTBASE)/drivers $(RIOTBASE)/sys

1
makefiles/vars.inc.mk
View File

@ -6,6 +6,7 @@ export QQ # as Q, but be more quiet
export QUIET # The parameter to use whether to show verbose makefile commands or not. export QUIET # The parameter to use whether to show verbose makefile commands or not.
export APPLICATION # The application, set in the Makefile which is run by the user. export APPLICATION # The application, set in the Makefile which is run by the user.
export APPLICATION_MODULE # The application module name.
export BOARD # The board to compile the application for. export BOARD # The board to compile the application for.
export CPU # The CPU, set by the board's Makefile.include. export CPU # The CPU, set by the board's Makefile.include.
export CPU_MODEL # The specific identifier of the used CPU, used for some CPU implementations to differentiate between different memory layouts export CPU_MODEL # The specific identifier of the used CPU, used for some CPU implementations to differentiate between different memory layouts