# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1226597684 0
# Node ID b534a133daf45d5a681577888e5321e177d59553
# Parent  33f695f7773ade373cec08befdc8ca60eaa54818
Make the 'updatetools' rule conform to the V={,0,1,2} verbosity level.

 /trunk/tools/tools.mk |   28    20     8     0 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff -r 33f695f7773a -r b534a133daf4 tools/tools.mk
--- a/tools/tools.mk	Fri Nov 07 08:09:42 2008 +0000
+++ b/tools/tools.mk	Thu Nov 13 17:34:44 2008 +0000
@@ -16,25 +16,37 @@
 # The tools are: config.guess and config.sub
 
 CONFIG_SUB_SRC="http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
-CONFIG_SUB_DEST="$(CT_TOP_DIR)/tools/config.sub"
+CONFIG_SUB_DEST=tools/config.sub
 CONFIG_GUESS_SRC="http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD"
-CONFIG_GUESS_DEST="$(CT_TOP_DIR)/tools/config.guess"
+CONFIG_GUESS_DEST=tools/config.guess
 
+# Kludge: we have a step that is called 'tools', and thus we can not define a
+# rule here that is named 'tools'. Naming it 'tools/' does not help either.
+# Thus, prepend the top directory to have a single rule description. This is
+# not as bad as it seems, because it is only refered to by teo rules in this
+# file, but still it is a kludge...
 $(CT_TOP_DIR)/tools:
-	$(SILENT)mkdir -p $(CT_TOP_DIR)/tools
+	$(SILENT)mkdir -p tools
 
 PHONY += updatetools
-updatetools: $(CT_TOP_DIR)/tools $(CONFIG_SUB_DEST) $(CONFIG_GUESS_DEST)
+updatetools: $(CONFIG_SUB_DEST) $(CONFIG_GUESS_DEST)
 
 # ----------------------------------------------------------
 # How to retrieve the tools
 
-$(CONFIG_SUB_DEST):
-	$(SILENT)wget $(CONFIG_SUB_SRC) -O $@
+wget_opt=-o /dev/null
+ifeq ($(strip $(V)),2)
+  wget_opt=
+endif
+
+$(CONFIG_SUB_DEST): .FORCE $(CT_TOP_DIR)/tools
+	@$(ECHO) '  WGET  $@'
+	$(SILENT)wget $(wget_opt) -O $@ $(CONFIG_SUB_SRC)
 	$(SILENT)chmod u+rwx,go+rx-w $@
 
-$(CONFIG_GUESS_DEST):
-	$(SILENT)wget $(CONFIG_GUESS_SRC) -O $@
+$(CONFIG_GUESS_DEST): .FORCE $(CT_TOP_DIR)/tools
+	@$(ECHO) '  WGET  $@'
+	$(SILENT)wget $(wget_opt) -O $@ $(CONFIG_GUESS_SRC)
 	$(SILENT)chmod u+rwx,go+rx-w $@
 
 # ----------------------------------------------------------