build system: Add dependencies to component clean steps

Build directory must exist, component_project_vars.mk must be generated if it is going to be.
This commit is contained in:
Angus Gratton
2017-09-01 17:28:13 +10:00
committed by Angus Gratton
parent 2544355301
commit c275ad4ca4
2 changed files with 4 additions and 4 deletions

View File

@@ -118,6 +118,6 @@ ifndef CONFIG_SECURE_BOOT_ENABLED
all_binaries: $(BOOTLOADER_BIN) all_binaries: $(BOOTLOADER_BIN)
endif endif
bootloader-clean: bootloader-clean: $(SDKCONFIG_MAKEFILE)
$(BOOTLOADER_MAKE) app-clean $(BOOTLOADER_MAKE) app-clean
rm -f $(SECURE_BOOTLOADER_KEY) $(BOOTLOADER_DIGEST_BIN) rm -f $(SECURE_BOOTLOADER_KEY) $(BOOTLOADER_DIGEST_BIN)

View File

@@ -361,10 +361,10 @@ endef
define GenerateComponentTargets define GenerateComponentTargets
.PHONY: component-$(2)-build component-$(2)-clean .PHONY: component-$(2)-build component-$(2)-clean
component-$(2)-build: check-submodules component-$(2)-build: check-submodules $(call prereq_if_explicit, component-$(2)-clean) | $(BUILD_DIR_BASE)/$(2)
$(call ComponentMake,$(1),$(2)) build $(call ComponentMake,$(1),$(2)) build
component-$(2)-clean: component-$(2)-clean: | $(BUILD_DIR_BASE)/$(2) $(BUILD_DIR_BASE)/$(2)/component_project_vars.mk
$(call ComponentMake,$(1),$(2)) clean $(call ComponentMake,$(1),$(2)) clean
$(BUILD_DIR_BASE)/$(2): $(BUILD_DIR_BASE)/$(2):
@@ -406,7 +406,7 @@ size-components: $(APP_ELF)
# NB: this ordering is deliberate (app-clean before config-clean), # NB: this ordering is deliberate (app-clean before config-clean),
# so config remains valid during all component clean targets # so config remains valid during all component clean targets
config-clean: app-clean config-clean: app-clean $(call prereq_if_explicit,bootloader-clean)
clean: config-clean clean: config-clean
# phony target to check if any git submodule listed in COMPONENT_SUBMODULES are missing # phony target to check if any git submodule listed in COMPONENT_SUBMODULES are missing