From: nbd Date: Sun, 14 Jun 2015 17:47:16 +0000 (+0000) Subject: Makefile: move the cleaning of staging_dir/target* from dirclean to clean X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=28239659a10cf96da8a929c7bcddd3775d110ed1;p=openwrt.git Makefile: move the cleaning of staging_dir/target* from dirclean to clean Currently "make clean" only clears the build_dir/target*, but leaves staging_dir/target* intact. "make clean" should also clean the staging_dir/target* directories, as in the current situation some old packages or libraries may be linked into the firmware from staging_dir despite a "make clean". The patch reorganises clean / dirclean functionality so that * "make clean" also clears the staging_dir/target* in addition to build_dir/target*. * "make dirclean" clears toolchain and host(=tools) directories from both build_dir and staging_dir signed-off-by: Hannu Nyman git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45973 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/Makefile b/Makefile index f89527f81c..a12e3ea49a 100644 --- a/Makefile +++ b/Makefile @@ -50,10 +50,10 @@ printdb: prepare: $(target/stamp-compile) clean: FORCE - rm -rf $(BUILD_DIR) $(BIN_DIR) $(BUILD_LOG_DIR) + rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(BUILD_LOG_DIR) dirclean: clean - rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN) + rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN) rm -rf $(TMP_DIR) ifndef DUMP_TARGET_DB