kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-17 18:43:50 +01:00
Code Releases Activity

make: treat packages like modules when it comes to linking

Browse Source
This commit is contained in:
Kaspar Schleiser 2016-07-20 19:58:17 +02:00
parent fef429e16b
commit 1b0d9ef14b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.include
View File

@ -236,7 +236,6 @@ endif
# the binaries to link # the binaries to link
BASELIBS += $(BINDIR)${APPLICATION}.a BASELIBS += $(BINDIR)${APPLICATION}.a
BASELIBS += $(USEPKG:%=${BINDIR}%.a)
BASELIBS += $(APPDEPS) BASELIBS += $(APPDEPS)
.PHONY: all clean flash term doc debug debug-server reset objdump help info-modules .PHONY: all clean flash term doc debug debug-server reset objdump help info-modules

2
Makefile.modules
View File

@ -3,7 +3,7 @@ USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL
ED = $(addprefix FEATURE_,$(sort $(filter $(FEATURES_PROVIDED), $(FEATURES_REQUIRED)))) ED = $(addprefix FEATURE_,$(sort $(filter $(FEATURES_PROVIDED), $(FEATURES_REQUIRED))))
ED += $(addprefix MODULE_,$(sort $(USEMODULE) $(USEPKG))) ED += $(addprefix MODULE_,$(sort $(USEMODULE) $(USEPKG)))
EXTDEFINES = $(addprefix -D,$(shell echo '$(ED)' | tr 'a-z-' 'A-Z_')) EXTDEFINES = $(addprefix -D,$(shell echo '$(ED)' | tr 'a-z-' 'A-Z_'))
REALMODULES = $(filter-out $(PSEUDOMODULES), $(sort $(USEMODULE))) REALMODULES = $(filter-out $(PSEUDOMODULES), $(sort $(USEMODULE) $(USEPKG)))
export BASELIBS += $(REALMODULES:%=$(BINDIR)%.a) export BASELIBS += $(REALMODULES:%=$(BINDIR)%.a)
CFLAGS += $(EXTDEFINES) CFLAGS += $(EXTDEFINES)