فهرست منبع

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.
Angus Gratton 8 سال پیش
والد
کامیت
c275ad4ca4
2فایلهای تغییر یافته به همراه4 افزوده شده و 4 حذف شده
  1. 1 1
      components/bootloader/Makefile.projbuild
  2. 3 3
      make/project.mk

+ 1 - 1
components/bootloader/Makefile.projbuild

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

+ 3 - 3
make/project.mk

@@ -361,10 +361,10 @@ endef
 define GenerateComponentTargets
 .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
 
-component-$(2)-clean:
+component-$(2)-clean: | $(BUILD_DIR_BASE)/$(2) $(BUILD_DIR_BASE)/$(2)/component_project_vars.mk
 	$(call ComponentMake,$(1),$(2)) clean
 
 $(BUILD_DIR_BASE)/$(2):
@@ -406,7 +406,7 @@ size-components: $(APP_ELF)
 
 # NB: this ordering is deliberate (app-clean before config-clean),
 # 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
 
 # phony target to check if any git submodule listed in COMPONENT_SUBMODULES are missing