X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1ae73b4f488e605d02b6918d1c15e2c600beeae9..5aa1413d8920f9c9796b9923bb222c1d52a02a38:/include/subdir.mk diff --git a/include/subdir.mk b/include/subdir.mk index 72fec8944..cbdd68b6b 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -5,7 +5,12 @@ # See /LICENSE for more information. # -SUBTARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure +ifeq ($(MAKECMDGOALS),prereq) + SUBTARGETS:=prereq + PREREQ_ONLY:=1 +else + SUBTARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure +endif subtarget-default = $(filter-out ., \ $(if $($(1)/builddirs-$(2)),$($(1)/builddirs-$(2)), \ @@ -37,9 +42,7 @@ define subdir $(foreach variant,$(if $(BUILD_VARIANT),$(BUILD_VARIANT),$(if $(strip $($(1)/$(bd)/variants)),$($(1)/$(bd)/variants),$(if $($(1)/$(bd)/default-variant),$($(1)/$(bd)/default-variant),__default))), $(if $(call debug,$(1)/$(bd),v),,@)+$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -C $(1)/$(bd) $(target) BUILD_VARIANT="$(filter-out __default,$(variant))" $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build$(if $(filter-out __default,$(variant)), (build variant: $(variant))).)) ) - $(if $(DUMP_TARGET_DB),, - # legacy targets - $(call warn_eval,$(1)/$(bd),l,T,$(1)/$(bd)-$(target): $(1)/$(bd)/$(target)) + $(if $(PREREQ_ONLY)$(DUMP_TARGET_DB),, # aliases $(if $(call diralias,$(bd)),$(call warn_eval,$(1)/$(bd),l,T,$(1)/$(call diralias,$(bd))/$(target): $(1)/$(bd)/$(target))) ) @@ -54,7 +57,7 @@ define stampfile $(1)/stamp-$(3):=$(if $(6),$(6),$(STAGING_DIR))/stamp/.$(2)_$(3)$(if $(5),_$(call confvar,$(5))) $$($(1)/stamp-$(3)): $(TMP_DIR)/.build $(4) @+$(SCRIPT_DIR)/timestamp.pl -n $$($(1)/stamp-$(3)) $(1) $(4) || \ - $(MAKE) $$($(1)/flags-$(3)) $(1)/$(3) + $(MAKE) $(if $(QUIET),--no-print-directory) $$($(1)/flags-$(3)) $(1)/$(3) @mkdir -p $$$$(dirname $$($(1)/stamp-$(3))) @touch $$($(1)/stamp-$(3))