Skip to content

Commit

Permalink
Revise samples + component-samples build targets
Browse files Browse the repository at this point in the history
Add `make submodules` as things could break there too.
Merge make targets using %.built
  • Loading branch information
mikee47 committed Dec 28, 2021
1 parent 9917934 commit 9b989ee
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions Sming/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,9 @@ SAMPLE_NAMES = $(notdir $(SAMPLE_PATHS))
samples: $(SAMPLES_BUILT) ##Build all sample applications

# Build any samples which haven't yet been marked
$(SAMPLES_BUILT):
@printf "\n\n** Building $(notdir $(call dirx,$@)) **\n\n"
%.built:
@printf "\n\n** Building $(@D) **\n\n"
$(Q) $(MAKE) --no-print-directory -C $(@D) submodules
$(Q) $(MAKE) --no-print-directory -C $(@D) PIP_ARGS=-q python-requirements sample
$(Q) touch $@

Expand All @@ -143,10 +144,6 @@ COMPONENT_SAMPLES_BUILT = $(addsuffix $(BUILT_SUFFIX),$(COMPONENT_SAMPLE_PATHS))
.PHONY: build-component-samples
build-component-samples: $(COMPONENT_SAMPLES_BUILT)

$(COMPONENT_SAMPLES_BUILT):
@printf "\n\n** Building $(@D) **\n\n"
$(Q) $(MAKE) --no-print-directory -C $(@D) PIP_ARGS=-q python-requirements sample
$(Q) touch $@

# This file is generated on failure during test phase
export TEST_FAILURE_FILE := $(SMING_HOME)/.test-failure
Expand Down

0 comments on commit 9b989ee

Please sign in to comment.