X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=include%2Fsubdir.mk;h=afc95a4427667083e63a5795a0c0b7b31f956f6f;hb=9dd40f163d25c4e4262d21e4da5120e2e1560050;hp=b8094afb2e86188f69f54a949fe03ad6142133c7;hpb=7a13c34dc66cce53a64c35dd95eb8a8ffc668779;p=openwrt.git diff --git a/include/subdir.mk b/include/subdir.mk index b8094afb2e..afc95a4427 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -39,16 +39,18 @@ define subdir +$(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 $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target)) - - # legacy targets - $(call warn_eval,$(1)/$(bd),l,T,$(1)/$(bd)-$(target): $(1)/$(bd)/$(target)) - # aliases - $(if $(call diralias,$(bd)),$(call warn_eval,$(1)/$(bd),l,T,$(1)/$(call diralias,$(bd))/$(target): $(1)/$(bd)/$(target))) + $(if $(DUMP_TARGET_DB),, + # legacy targets + $(call warn_eval,$(1)/$(bd),l,T,$(1)/$(bd)-$(target): $(1)/$(bd)/$(target)) + # aliases + $(if $(call diralias,$(bd)),$(call warn_eval,$(1)/$(bd),l,T,$(1)/$(call diralias,$(bd))/$(target): $(1)/$(bd)/$(target))) + ) ) ) $(foreach target,$(SUBTARGETS),$(call subtarget,$(1),$(target))) endef +ifndef DUMP_TARGET_DB # Parameters: define stampfile $(1)/stamp-$(3):=$(if $(6),$(6),$(STAGING_DIR))/stamp/.$(2)_$(3)$(if $(5),_$(call confvar,$(5))) @@ -67,3 +69,4 @@ define stampfile @rm -f $$($(1)/stamp-$(3)) endef +endif