diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 4b642ab1..d37fc50a 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -53,7 +53,10 @@ else PROJECTS ?= $(shell ls -d */GNUmakefile */Makefile 2>/dev/null | sed 's%/[^/]*%%' | sort -u) endif -BUILD_ORDER_DEP_FLAVOURS ?= run,build,test,release +BUILD_DEP_FLAVOURS ?= run,build,test,release +BUILD_DEP_FLAVOURS_LINT ?= run,build,test,release +BUILD_DEP_FLAVOURS_TEST ?= run,build,test,release +BUILD_DEP_FLAVOURS_ORDER ?= run,build,test,release ifeq ($(JW_PKG_VERBOSE),true) SSH_WRAPPER_TRACE ?= -x @@ -158,8 +161,14 @@ PROJECTS_WITH_PROJECT_CONF = $(patsubst %/make/project.conf,%,$(wildcard $(add # --- mandatory targets all: -all test check check-pre check-post: $(filter-out $(UNAVAILABLE_TARGETS),pull.done) - $(JW_PKG_PY_BUILD) $@ $(TARGET_PROJECTS) +all: $(filter-out $(UNAVAILABLE_TARGETS),pull.done) + $(JW_PKG_PY_BUILD) --dep-flavours="$(BUILD_DEP_FLAVOURS)" $@ $(TARGET_PROJECTS) +check check-pre check-post: $(filter-out $(UNAVAILABLE_TARGETS),pull.done) + $(JW_PKG_PY_BUILD) --dep-flavours="$(BUILD_DEP_FLAVOURS_LINT)" $@ $(TARGET_PROJECTS) +test: $(filter-out $(UNAVAILABLE_TARGETS),pull.done) + $(JW_PKG_PY_BUILD) --dep-flavours="$(BUILD_DEP_FLAVOURS_TEST)" $@ $(TARGET_PROJECTS) + + clean: clean-dirs distclean: clean-all-dirs done.clean install: @@ -184,7 +193,7 @@ help doc-project doc-module: status: $(SSH_WRAPPER_SH) build-order-%: $(filter-out $(UNAVAILABLE_TARGETS),pull.done) - @JW_DEFAULT_LOG_LEVEL=WARNING $(JW_PKG_PY_BUILD) --build-order --dep-flavours="$(BUILD_ORDER_DEP_FLAVOURS)" $* $(TARGET_PROJECTS) | sed 's/ */\n/g' + @JW_DEFAULT_LOG_LEVEL=WARNING $(JW_PKG_PY_BUILD) --build-order --dep-flavours="$(BUILD_DEP_FLAVOURS_ORDER)" $* $(TARGET_PROJECTS) | sed 's/ */\n/g' build-order: build-order-all