aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-21 18:13:09 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-21 18:13:09 +0000
commit4f188f88874830c1fdca6144938ac0db1cbc540a (patch)
tree1769009b00a848957d9e02699ff8707558dbabd5
parent3aa892d75f38c339a1d7e09126e84f06b05b4232 (diff)
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
-rw-r--r--Makefile2
-rw-r--r--rules.mak10
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 9068181603..ac15ca5b69 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 dd567802bd..818c5effb0 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)