X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d4aba41503ffb5c40681d74b76732668e8c8b064..075c5a3ddc18e00190319a0fa7a44aefa670b6d4:/openwrt/package/rules.mk

diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index cd63983bd..18f53bdc3 100644
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -37,7 +37,7 @@ endef
 
 ifneq ($(strip $(PKG_SOURCE)),)
 $(DL_DIR)/$(PKG_SOURCE):
-	@$(PKG_TRACE) Downloading...
+	@$(CMD_TRACE) "downloading... "
 	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE) 
 endif
 
@@ -55,50 +55,46 @@ endif
 all: compile
 
 source: $(DL_DIR)/$(PKG_SOURCE)
-prepare:
+prepare: source
 	@[ -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); \
 	fi
 	$(MAKE) compile $(MAKE_TRACE)
 
-$(PKG_BUILD_DIR)/.configured: prepare
-$(PKG_BUILD_DIR)/.built: configure
+$(PKG_BUILD_DIR)/.configured:
+$(PKG_BUILD_DIR)/.built:
 
 $(PACKAGE_DIR):
 	mkdir -p $@
 
 clean-targets:
 clean: 
-	@$(PKG_TRACE) Cleaning...
+	@$(CMD_TRACE) "cleaning... " 
 	@$(MAKE) clean-targets $(MAKE_TRACE)
 	rm -rf $(PKG_BUILD_DIR)