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

Makefile.include: set pkg-prepare as BUILDDEPS

Browse Source 
Use BUILDDEPS to define pkg-prepare dependency
This commit is contained in:
Gaëtan Harter 2018-04-23 14:49:35 +02:00
parent 2f41244adc
commit 61f13baf14
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.include
View File

@ -366,6 +366,7 @@ DIRS += $(EXTERNAL_MODULE_DIRS)
# Define dependencies required for building (headers, downloading source files,) # Define dependencies required for building (headers, downloading source files,)
BUILDDEPS += $(RIOTBUILD_CONFIG_HEADER_C) BUILDDEPS += $(RIOTBUILD_CONFIG_HEADER_C)
BUILDDEPS += pkg-prepare
BUILDDEPS += $(APPDEPS) BUILDDEPS += $(APPDEPS)
# Save value to verify it is not modified later # Save value to verify it is not modified later
@ -429,14 +430,14 @@ endef
# The `clean` needs to be serialized before everything else. # The `clean` needs to be serialized before everything else.
ifneq (, $(filter clean, $(MAKECMDGOALS))) ifneq (, $(filter clean, $(MAKECMDGOALS)))
all $(BASELIBS) $(USEPKG:%=$(RIOTPKG)/%/Makefile.include) pkg-prepare $(BUILDDEPS): clean all $(BASELIBS) $(USEPKG:%=$(RIOTPKG)/%/Makefile.include) $(BUILDDEPS): clean
endif endif
.PHONY: pkg-prepare $(USEPKG:%=$(BINDIR)/%.a) .PHONY: pkg-prepare $(USEPKG:%=$(BINDIR)/%.a)
pkg-prepare: pkg-prepare:
-@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTPKG)/$$i prepare ; done -@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTPKG)/$$i prepare ; done
$(USEPKG:%=$(BINDIR)/%.a): pkg-prepare $(BUILDDEPS) $(USEPKG:%=$(BINDIR)/%.a): $(BUILDDEPS)
@mkdir -p $(BINDIR) @mkdir -p $(BINDIR)
$(QQ)"$(MAKE)" -C $(RIOTPKG)/$(patsubst $(BINDIR)/%.a,%,$@) $(QQ)"$(MAKE)" -C $(RIOTPKG)/$(patsubst $(BINDIR)/%.a,%,$@)