Make make output quieter (Avi Kivity)

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>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6380 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile b/Makefile
index 9068181603906b64ca4175f7c13b61b3c57a8078..ac15ca5b696767978222364e18f5ee846c3901fa 100644 (file)
--- 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 dd567802bd3f1c11ca32d7d4d0113403a5fb89c2..818c5effb036261236ac865ed9060fbfad695a7c 100644 (file)
--- 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)