summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Hempel <ralph.hempel@lantiq.com>2009-05-28 16:30:04 +0000
committerRalph Hempel <ralph.hempel@lantiq.com>2009-05-28 16:30:04 +0000
commitc4d7af70948fb173132c4cd632421547d95bf305 (patch)
treee9037bc7ddf252f96ce8c6bd58c79ff39c4b212a
parent72e25b07b8cacd76265f39db048f740407663ddf (diff)
downloadmtk-20170518-c4d7af70948fb173132c4cd632421547d95bf305.zip
mtk-20170518-c4d7af70948fb173132c4cd632421547d95bf305.tar.gz
mtk-20170518-c4d7af70948fb173132c4cd632421547d95bf305.tar.bz2
added BUILD_LOG_DIR variable, make clean will delete the ./logs dir
SVN-Revision: 16148
-rw-r--r--Makefile2
-rw-r--r--include/subdir.mk4
-rw-r--r--rules.mk1
3 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 05a2c2b..6cf4a4b 100644
--- a/Makefile
+++ b/Makefile
@@ -49,8 +49,8 @@ $(BUILD_DIR)/.prepared: Makefile
@touch $@
clean: FORCE
- rm -rf $(BUILD_DIR) $(BIN_DIR)
$(_SINGLE)$(SUBMAKE) target/linux/clean
+ rm -rf $(BUILD_DIR) $(BIN_DIR) $(BUILD_LOG_DIR)
dirclean: clean
rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)
diff --git a/include/subdir.mk b/include/subdir.mk
index 26a8626..be8c308 100644
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -34,8 +34,8 @@ define subdir
$(if $(call diralias,$(bd)),$(call warn_eval,$(1)/$(bd),l,T,$(1)/$(call diralias,$(bd))/$(btype)/$(target): $(1)/$(bd)/$(btype)/$(target)))
)
$(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $(if $(QUILT),,$($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd))))
- $(if $(BUILD_LOG),@mkdir -p $(TOPDIR)/logs/$(1)/$(bd))
- +$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -C $(1)/$(bd) $(target) $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(TOPDIR)/logs/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build.))
+ $(if $(BUILD_LOG),@mkdir -p $(BUILD_LOG_DIR)/$(1)/$(bd))
+ +$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -C $(1)/$(bd) $(target) $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build.))
$$(if $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target))
# legacy targets
diff --git a/rules.mk b/rules.mk
index 965265d..c3adb1d 100644
--- a/rules.mk
+++ b/rules.mk
@@ -64,6 +64,7 @@ STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp
TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(BUILD_DIR))
TARGET_DIR:=$(TARGET_ROOTFS_DIR)/root-$(BOARD)
DEBUG_DIR:=$(BUILD_DIR)/debug-$(BOARD)
+BUILD_LOG_DIR:=$(TOPDIR)/logs
TARGET_PATH:=$(TOOLCHAIN_DIR)/usr/bin:$(STAGING_DIR_HOST)/bin:$(PATH)
TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(TARGET_PATH)