make log output a bit nicer

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2241 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 24 insertions, 18 deletions

diff --git a/package/Makefile b/package/Makefile
index 0bddabbc8..9053acb37 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -442,30 +442,40 @@ $(TARGET_DIR):
 
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)
 	@[ -f $(STAMP_DIR)/.$@ ] || { \
-		$(TRACE) package/$(patsubst %-prepare,%,$@)/prepare; \
+		$(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \
 		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
+		$(CMD_TRACE) " done"; \
+		$(END_TRACE); \
 	}
 	@touch $(STAMP_DIR)/.$@
 
 %-compile:
 	@[ -f $(STAMP_DIR)/.$@ ] || { \
-		$(TRACE) package/$(patsubst %-compile,%,$@)/compile; \
+		$(START_TRACE) "package/$(patsubst %-compile,%,$@)/compile: "; \
 		$(MAKE) -C $(patsubst %-compile,%,$@) compile; \
+		$(CMD_TRACE) " done"; \
+		$(END_TRACE); \
 	}
 	@touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare
 	@touch $(STAMP_DIR)/.$@
 
 %-install: %-compile
-	@$(TRACE) package/$(patsubst %-install,%,$@)/install
+	@$(START_TRACE) "package/$(patsubst %-install,%,$@)/install: "
 	@$(MAKE) -C $(patsubst %-install,%,$@) install
+	@$(CMD_TRACE) " done"
+	@$(END_TRACE)
 
 %-rebuild: 
-	@$(TRACE) package/$(patsubst %-rebuild,%,$@)/rebuild
+	@$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)/rebuild: "
 	@rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
 	$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
+	@$(CMD_TRACE) " done"
+	@$(END_TRACE)
 
 %-clean:
-	@$(TRACE) package/$(patsubst %-clean,%,$@)/clean
+	@$(START_TRACE) "package/$(patsubst %-clean,%,$@)/clean: "
 	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
 	@rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
+	@$(CMD_TRACE) " done"
+	@$(END_TRACE)
 
diff --git a/package/rules.mk b/package/rules.mk
index cd63983bd..504eb1518 100644
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -37,7 +37,7 @@ endef
 
 ifneq ($(strip $(PKG_SOURCE)),)
 $(DL_DIR)/$(PKG_SOURCE):
-	@$(PKG_TRACE) Downloading...
+	@$(PKG_TRACE) "downloading... "
 	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE) 
 endif
 
@@ -57,33 +57,29 @@ all: compile
 source: $(DL_DIR)/$(PKG_SOURCE)
 prepare:
 	@[ -f $(PKG_BUILD_DIR)/.prepared ] || { \
-		$(PKG_TRACE) Preparing...; \
+		$(CMD_TRACE) "preparing... "; \
 		$(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \
 	}
 
-configure:
+configure: prepare
 	@[ -f $(PKG_BUILD_DIR)/.configured ] || { \
-		$(PKG_TRACE) Configuring...; \
+		$(CMD_TRACE) "configuring... "; \
 		$(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \
 	}
 
 compile-targets:
-compile: prepare
-	@[ -f $(PKG_BUILD_DIR)/.configured ] || { \
-		$(PKG_TRACE) Configuring...; \
-		$(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \
-	}
-	@$(PKG_TRACE) Compiling...
+compile: configure
+	@$(CMD_TRACE) "compiling... " 
 	@$(MAKE) compile-targets $(MAKE_TRACE)
 
 install-targets:
 install:
-	@$(PKG_TRACE) Installing...
+	@$(CMD_TRACE) "installing... "
 	@$(MAKE) install-targets $(MAKE_TRACE)
 
 mostlyclean:
 rebuild:
-	$(PKG_TRACE) Rebuilding...
+	$(CMD_TRACE) "rebuilding... "
 	@-$(MAKE) mostlyclean 2>&1 >/dev/null
 	if [ -f $(PKG_BUILD_DIR)/.built ]; then \
 		$(MAKE) clean $(MAKE_TRACE); \
@@ -98,7 +94,7 @@ $(PACKAGE_DIR):
 
 clean-targets:
 clean: 
-	@$(PKG_TRACE) Cleaning...
+	@$(CMD_TRACE) "cleaning... " 
 	@$(MAKE) clean-targets $(MAKE_TRACE)
 	rm -rf $(PKG_BUILD_DIR)