From 8d23d1b0bb00b0609ff5476e317819336f1856f0 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Wed, 31 Jul 2013 00:15:38 +0200
Subject: [PATCH] Support the recently added verbosity control.

---
 cpu/6502/Makefile.6502        | 12 ++++++++----
 platform/win32/Makefile.win32 | 19 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/cpu/6502/Makefile.6502 b/cpu/6502/Makefile.6502
index 60186feea..14c252675 100644
--- a/cpu/6502/Makefile.6502
+++ b/cpu/6502/Makefile.6502
@@ -74,18 +74,22 @@ AROPTS  = a
 
 CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
 $(OBJECTDIR)/%.o: %.c | $(OBJECTDIR)
-	$(CC) -c -o $@ $(CFLAGS) --create-dep $(@:.o=.d) $<
+	$(TRACE_CC)
+	$(Q)$(CC) -c -o $@ $(CFLAGS) --create-dep $(@:.o=.d) $<
 
 CUSTOM_RULE_C_TO_CO = 1
 %.co: %.c
-	$(CC) -c -o $@ $(CFLAGS) -DAUTOSTART_ENABLE --create-dep $(@:.o=.d) $<
+	$(TRACE_CC)
+	$(Q)$(CC) -c -o $@ $(CFLAGS) -DAUTOSTART_ENABLE --create-dep $(@:.o=.d) $<
 
 CUSTOM_RULE_LINK = 1
 %.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a
-	$(LD) -o $@ $(LDFLAGS) -u _main $^ $(TARGET).lib
+	$(TRACE_LD)
+	$(Q)$(LD) -o $@ $(LDFLAGS) -u _main $^ $(TARGET).lib
 
 %.eth: $(OBJECTDIR)/%.o
-	$(LD) -o $@ -t module -m $@.map $<
+	$(TRACE_LD)
+	$(Q)$(LD) -o $@ -t module -m $@.map $<
 
 ifdef ETHERNET
 $(ETHERNET)-eth.S: $(ETHERNET).eth
diff --git a/platform/win32/Makefile.win32 b/platform/win32/Makefile.win32
index 3759df8c5..83e82bf7d 100644
--- a/platform/win32/Makefile.win32
+++ b/platform/win32/Makefile.win32
@@ -72,10 +72,11 @@ ${foreach DSC,$(DSCS),${eval ${call dsc_template,$(DSC),${call appname,$(DSC)}}}
 
 ### Generic module-link rules, no prerequisites here
 $(PRGS:=.prg) $(DSCS:=.dsc):
+	$(TRACE_LD)
 ifdef VCINSTALLDIR
-	link -nologo -debug -dll $^ contiki-main.$(TARGET).a -out:$@
+	$(Q)link -nologo -debug -dll $^ contiki-main.$(TARGET).a -out:$@
 else
-	$(LD) -shared $^ contiki-main.$(TARGET).a -o $@
+	$(Q)$(LD) -shared $^ contiki-main.$(TARGET).a -o $@
 endif
 
 ifdef VCINSTALLDIR
@@ -84,19 +85,23 @@ VCFLAGS = -Od -Z7 $(filter-out -Wall -g -O,$(CFLAGS))
 
 CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
 $(OBJECTDIR)/%.o: %.c | $(OBJECTDIR)
-	cl -nologo $(VCFLAGS) -c $< -Fo$@
-	@makedepend $(CFLAGS) -o.o -f- $< 2> nul: | sed -e s!$(<:.c=.o)!$@! -e s!\\!/!g > $(@:.o=.d)
+	$(TRACE_CC)
+	$(Q)cl -nologo $(VCFLAGS) -c $< -Fo$@
+	$(Q)makedepend $(CFLAGS) -o.o -f- $< 2> nul: | sed -e s!$(<:.c=.o)!$@! -e s!\\!/!g > $(@:.o=.d)
 
 CUSTOM_RULE_C_TO_CO = 1
 %.co: %.c
-	cl -nologo $(VCFLAGS) -DAUTOSTART_ENABLE -c $< -Fo$@
+	$(TRACE_CC)
+	$(Q)cl -nologo $(VCFLAGS) -DAUTOSTART_ENABLE -c $< -Fo$@
 
 CUSTOM_RULE_ALLOBJS_TO_TARGETLIB = 1
 contiki-$(TARGET).a: $(CONTIKI_OBJECTFILES)
-	lib -nologo $^ -out:$@
+	$(TRACE_AR)
+	$(Q)lib -nologo $^ -out:$@
 
 CUSTOM_RULE_LINK = 1
 %.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a
-	link -nologo $(LINKFLAGS) -debug -map:contiki-$(TARGET).map $^ user32.lib ws2_32.lib iphlpapi.lib -out:$@
+	$(TRACE_LD)
+	$(Q)link -nologo $(LINKFLAGS) -debug -map:contiki-$(TARGET).map $^ user32.lib ws2_32.lib iphlpapi.lib -out:$@
 
 endif # VCINSTALLDIR
\ No newline at end of file