diff --git a/README.buildenv b/README.buildenv index c7ea22dfa..fd6830005 100644 --- a/README.buildenv +++ b/README.buildenv @@ -239,7 +239,7 @@ COMPONENT_EXTRA_CLEAN := test_tjpgd_logo.h graphics_lib.o: logo.h logo.h: $(COMPONENT_PATH)/logo.bmp - $(vecho) BMP2H $@ + $(summary) BMP2H $@ $(Q) bmp2h -i $^ -o $@ include $(IDF_PATH)/make/component.mk diff --git a/make/common.mk b/make/common.mk index 064408dcf..7f372cc30 100644 --- a/make/common.mk +++ b/make/common.mk @@ -35,13 +35,18 @@ CXXFLAGS = -DESP_PLATFORM -Og -std=gnu++11 -g3 \ endif #Handling of V=1/VERBOSE=1 flag +# +# if V=1, $(summary) does nothing and $(details) will echo extra details +# if V is unset or not 1, $(summary) echoes a summary and $(details) does nothing V ?= $(VERBOSE) ifeq ("$(V)","1") Q := -vecho := @true +summary := @true +details := @echo else Q := @ -vecho := @echo +summary := @echo +details := @true endif # General make utilities diff --git a/make/component.mk b/make/component.mk index 9c0e5d602..ae897b009 100644 --- a/make/component.mk +++ b/make/component.mk @@ -71,14 +71,14 @@ build: $(COMPONENT_LIBRARY) #Build the archive. We remove the archive first, otherwise ar will get confused if we update #an archive when multiple filenames have the same name (src1/test.o and src2/test.o) $(COMPONENT_LIBRARY): $(COMPONENT_OBJS) - $(vecho) AR $@ + $(summary) AR $@ $(Q) rm -f $@ $(Q) $(AR) cru $@ $(COMPONENT_OBJS) endif ifeq ("$(COMPONENT_OWNCLEANTARGET)", "") clean: - $(vecho) RM $(COMPONENT_LIBRARY) $(COMPONENT_OBJS) $(COMPONENT_OBJS:.o=.d) $(COMPONENT_EXTRA_CLEAN) + $(summary) RM $(COMPONENT_LIBRARY) $(COMPONENT_OBJS) $(COMPONENT_OBJS:.o=.d) $(COMPONENT_EXTRA_CLEAN) $(Q) rm -f $(COMPONENT_LIBRARY) $(COMPONENT_OBJS) $(COMPONENT_OBJS:.o=.d) $(COMPONENT_EXTRA_CLEAN) endif @@ -92,15 +92,15 @@ CXXFLAGS+=-MMD define GenerateCompileTargets # $(1) - directory containing source files, relative to $(COMPONENT_PATH) $(1)/%.o: $$(COMPONENT_PATH)/$(1)/%.c | $(1) - $$(vecho) CC $$@ + $$(summary) CC $$@ $$(Q) $$(CC) $$(CFLAGS) $$(addprefix -I ,$$(COMPONENT_INCLUDES)) $$(addprefix -I ,$$(COMPONENT_EXTRA_INCLUDES)) -I$(1) -c $$< -o $$@ $(1)/%.o: $$(COMPONENT_PATH)/$(1)/%.cpp | $(1) - $$(vecho) CC $$@ + $$(summary) CC $$@ $$(Q) $$(CXX) $$(CXXFLAGS) $$(addprefix -I,$$(COMPONENT_INCLUDES)) $$(addprefix -I,$$(COMPONENT_EXTRA_INCLUDES)) -I$(1) -c $$< -o $$@ $(1)/%.o: $$(COMPONENT_PATH)/$(1)/%.S | $(1) - $$(vecho) CC $$@ + $$(summary) CC $$@ $$(Q) $$(CC) $$(CFLAGS) $$(addprefix -I ,$$(COMPONENT_INCLUDES)) $$(addprefix -I ,$$(COMPONENT_EXTRA_INCLUDES)) -I$(1) -c $$< -o $$@ # CWD is build dir, create the build subdirectory if it doesn't exist diff --git a/make/project.mk b/make/project.mk index 99fa1c1a1..7b3a86733 100644 --- a/make/project.mk +++ b/make/project.mk @@ -203,7 +203,7 @@ $(foreach component,$(COMPONENT_PATHS_BUILDABLE),$(eval $(call GenerateComponent $(foreach component,$(COMPONENT_PATHS_BUILDABLE),$(eval $(call GenerateComponentTarget,$(component),clean))) app-clean: $(addsuffix -clean,$(notdir $(COMPONENT_PATHS_BUILDABLE))) - $(vecho) RM $(APP_ELF) + $(summary) RM $(APP_ELF) $(Q) rm -f $(APP_ELF) $(APP_BIN) $(APP_MAP) clean: app-clean diff --git a/make/project_config.mk b/make/project_config.mk index c813ac584..e39fdac3b 100644 --- a/make/project_config.mk +++ b/make/project_config.mk @@ -16,7 +16,7 @@ $(KCONFIG_TOOL_DIR)/mconf $(KCONFIG_TOOL_DIR)/conf: $(MAKE) -C $(KCONFIG_TOOL_DIR) menuconfig: $(KCONFIG_TOOL_DIR)/mconf $(IDF_PATH)/Kconfig $(BUILD_DIR_BASE) - $(vecho) MENUCONFIG + $(summary) MENUCONFIG $(Q) KCONFIG_AUTOHEADER=$(PROJECT_PATH)/build/include/sdkconfig.h \ KCONFIG_CONFIG=$(PROJECT_PATH)/sdkconfig \ COMPONENT_KCONFIGS="$(COMPONENT_KCONFIGS)" \ @@ -29,7 +29,7 @@ $(PROJECT_PATH)/sdkconfig: menuconfig endif defconfig: $(KCONFIG_TOOL_DIR)/mconf $(IDF_PATH)/Kconfig $(BUILD_DIR_BASE) - $(vecho) DEFCONFIG + $(summary) DEFCONFIG $(Q) mkdir -p $(PROJECT_PATH)/build/include/config $(Q) KCONFIG_AUTOHEADER=$(PROJECT_PATH)/build/include/sdkconfig.h \ KCONFIG_CONFIG=$(PROJECT_PATH)/sdkconfig \ @@ -53,7 +53,7 @@ endif endif $(AUTO_CONF_REGEN_TARGET) $(PROJECT_PATH)/build/include/sdkconfig.h: $(PROJECT_PATH)/sdkconfig $(KCONFIG_TOOL_DIR)/conf $(COMPONENT_KCONFIGS) $(COMPONENT_KCONFIGS_PROJBUILD) - $(vecho) GENCONFIG + $(summary) GENCONFIG $(Q) mkdir -p $(PROJECT_PATH)/build/include/config $(Q) cd build; KCONFIG_AUTOHEADER="$(PROJECT_PATH)/build/include/sdkconfig.h" \ KCONFIG_CONFIG=$(PROJECT_PATH)/sdkconfig \ @@ -68,6 +68,6 @@ $(AUTO_CONF_REGEN_TARGET) $(PROJECT_PATH)/build/include/sdkconfig.h: $(PROJECT_P clean: config-clean .PHONY: config-clean config-clean: - $(vecho RM CONFIG) + $(summary RM CONFIG) $(MAKE) -C $(KCONFIG_TOOL_DIR) clean $(Q) rm -rf $(PROJECT_PATH)/build/include/config $(PROJECT_PATH)/build/include/sdkconfig.h