remove old trace/verbose junk

SVN-Revision: 3755

2 files changed, 16 insertions, 73 deletions

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index d213200..e0bd23c 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -8,53 +8,15 @@ clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 compile: $(COMPILE_PACKAGES)
 install: base-files-install $(INSTALL_PACKAGES)
 
-$(COMPILE_PACKAGES): base-files-compile
-$(INSTALL_PACKAGES): base-files-install
-
-$(STAMP_DIR):
+$(STAMP_DIR) $(TARGET_DIR):
 	mkdir -p $@
 
-$(TARGET_DIR):
-	mkdir -p $(TARGET_DIR)
-
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)
-	@[ -f $(STAMP_DIR)/.$@ ] || { \
-		$(START_TRACE) "package/$(patsubst %-prepare,%,$@)-prepare: "; \
-		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
-			touch $(STAMP_DIR)/.$@; \
-			$(CMD_TRACE) " done"; \
-			$(END_TRACE); \
-		} \
-	}
-
-%-compile:
-	@[ -f $(STAMP_DIR)/.$@ ] || { \
-		$(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "; \
-		$(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
-			touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
-			touch $(STAMP_DIR)/.$@; \
-			$(CMD_TRACE) " done"; \
-			$(END_TRACE); \
-		} \
-	}
-
-%-install: %-compile
-	@$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: "
-	@$(MAKE) -C $(patsubst %-install,%,$@) install
-	@$(CMD_TRACE) " done"
-	@$(END_TRACE)
+	$(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 
-%-rebuild: 
-	@$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: "
-	@rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
-	$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
-	@$(CMD_TRACE) " done"
-	@$(END_TRACE)
+%-compile: $(STAMP_DIR) $(TARGET_DIR)
+	$(MAKE) -C $(patsubst %-compile,%,$@) compile
 
-%-clean:
-	@$(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: "
-	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
-	@rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
-	@$(CMD_TRACE) " done"
-	@$(END_TRACE)
+%-clean: $(STAMP_DIR) $(TARGET_DIR)
+	$(MAKE) -C $(patsubst %-clean,%,$@) clean
 
diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index 81bac08..540b14f 100644
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -164,8 +164,7 @@ endef
 
 ifneq ($(strip $(PKG_SOURCE)),)
 $(DL_DIR)/$(PKG_SOURCE):
-	@$(CMD_TRACE) "downloading... "
-	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE) 
+	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
 	
 $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
 endif
@@ -237,42 +236,24 @@ ifneq ($(DUMP),)
 dumpinfo:
 	$(DUMPINFO)
 else
+		
+$(PACKAGE_DIR):
+	mkdir -p $@
 
 source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: source
-	@[ -f $(PKG_BUILD_DIR)/.prepared ] || { \
-		$(CMD_TRACE) "preparing... "; \
-		$(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \
-	}
-
-configure: prepare
-	@[ -f $(PKG_BUILD_DIR)/.configured ] || { \
-		$(CMD_TRACE) "configuring... "; \
-		$(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \
-	}
+prepare: $(PKG_BUILD_DIR)/.prepared
+configure: $(PKG_BUILD_DIR)/.configured
 
 compile-targets:
-compile: configure
-	@$(CMD_TRACE) "compiling... " 
-	@$(MAKE) compile-targets $(MAKE_TRACE)
+compile: compile-targets
 
 install-targets:
-install:
-	@$(CMD_TRACE) "installing... "
-	@$(MAKE) install-targets $(MAKE_TRACE)
-
-rebuild:
-	$(CMD_TRACE) "rebuilding... "
-	$(MAKE) package-clean compile $(MAKE_TRACE)
-
-$(PACKAGE_DIR):
-	mkdir -p $@
+install: install-targets
 
 clean-targets:
 clean: 
-	@$(CMD_TRACE) "cleaning... " 
-	@$(MAKE) clean-targets $(MAKE_TRACE)
+	@$(MAKE) clean-targets
 	rm -rf $(PKG_BUILD_DIR)
 endif
 
-.PHONY: all source prepare compile install clean rebuild dumpinfo compile-targets install-targets clean-targets
+.PHONY: all source prepare compile install clean dumpinfo compile-targets install-targets clean-targets