diff --git a/make/clean.mk b/make/clean.mk index 9b43fa2b..c369f0da 100644 --- a/make/clean.mk +++ b/make/clean.mk @@ -3,40 +3,44 @@ # # ----------------------------------------------------------------------------- -rebuild-clean: - -rm -rf $(BUILD_TMP) - -rm -rf $(TARGET_DIR) - -rm -rf $(D) +cross-base-clean: + -rm -rf $(CROSS_BASE) + +cross-clean: + -rm -rf $(CROSS_DIR) + +deps-clean: + -rm -rf $(DEPS_DIR) + +host-clean: + -rm -rf $(HOST_DIR) staging-clean: -rm -rf $(STAGING_DIR) -static-clean: - -rm -rf $(STATIC_DIR) - static-base-clean: -rm -rf $(STATIC_BASE) -cross-clean: - -rm -rf $(CROSS_DIR) - -cross-base-clean: - -rm -rf $(CROSS_BASE) +static-clean: + -rm -rf $(STATIC_DIR) -host-clean: - -rm -rf $(HOST_DIR) +target-clean: + -rm -rf $(TARGET_DIR) ccache-clean: @echo "Clearing $$CCACHE_DIR" @$(CCACHE) -C +rebuild-clean: target-clean deps-clean + -rm -rf $(BUILD_TMP) + all-clean: rebuild-clean staging-clean host-clean static-base-clean @echo -e "\n$(TERM_RED_BOLD)Any other key then CTRL-C will now remove CROSS_BASE$(TERM_NORMAL)" @read make cross-base-clean %-clean: - cd $(D) && find . -name $(subst -clean,,$@) -delete + @cd $(D) && find . -name $(subst -clean,,$@) -delete clean: rebuild-clean bootstrap @@ -47,14 +51,16 @@ clean-all: # ----------------------------------------------------------------------------- -PHONY += rebuild-clean -PHONY += staging-clean -PHONY += static-clean -PHONY += static-base-clean -PHONY += cross-clean PHONY += cross-base-clean +PHONY += cross-clean +PHONY += deps-clean PHONY += host-clean +PHONY += staging-clean +PHONY += static-base-clean +PHONY += static-clean +PHONY += target-clean PHONY += ccache-clean +PHONY += rebuild-clean PHONY += all-clean PHONY += %-clean PHONY += clean diff --git a/make/environment-build.mk b/make/environment-build.mk index 48044f6a..fea0e398 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -137,6 +137,7 @@ PARALLEL_JOBS := $$(expr `grep -c ^processor /proc/cpuinfo`) override MAKE = make $(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS)) MAKEFLAGS += --no-print-directory +#MAKEFLAGS += --silent # ----------------------------------------------------------------------------- @@ -146,8 +147,8 @@ WHOAMI := $(shell id -un) ARCHIVE = $(BASE_DIR)/download BUILD_TMP = $(BASE_DIR)/build_tmp ROOTFS = $(BUILD_TMP)/rootfs -D = $(BASE_DIR)/deps -DEPDIR = $(D) +DEPS_DIR = $(BASE_DIR)/deps +D = $(DEPS_DIR) HOST_DIR = $(BASE_DIR)/host TARGET_DIR ?= $(BASE_DIR)/root SOURCE_DIR = $(BASE_DIR)/source