[Qemu-devel] [PATCH 5/5] Make make output quieter

[Avi Kivity <avi@redhat.com>]

Spew out less noise when compiling.  This helps review make output for
information such as compilation warnings, rather than extra long compiler
invocations.

The full output can be generated by supplying a 'V=1' parameter to make.

Signed-off-by: Avi Kivity <avi@redhat.com>
---
 Makefile  |    2 +-
 rules.mak |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 428cff1..824f832 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ all: $(TOOLS) $(DOCS) recurse-all
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
 
 subdir-%:
-	$(MAKE) -C $(subst subdir-,,$@) all
+	$(MAKE) -C $(subst subdir-,,$@) V="$(V)" all
 
 $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
 $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a
diff --git a/rules.mak b/rules.mak
index dd56780..818c5ef 100644
--- a/rules.mak
+++ b/rules.mak
@@ -1,14 +1,16 @@
 
 %.o: %.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,CC $@)
 
 %.o: %.S
-	$(CC) $(CPPFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(CPPFLAGS) -c -o $@ $<,AS $@)
 
 %.o: %.m
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<,OBJC $@)
 
-LINK = $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+LINK = $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(LIBS),LINK $@)
 
 %$(EXESUF): %.o
 	$(LINK)
+
+quiet-command = $(if $(V),$1,@echo $2 && $1)
-- 
1.6.0.6