From a59c77c13064f510d09a8f60c7ac0524ca04233b Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 17 Sep 2009 14:06:02 -0300
Subject: [PATCH 01/38] Use quiet-command to get a cleaner build output

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <8d26406b71d2036f4a0da1f04b8e75f4fe63d68b.1249487147.git.quintela@redhat.com>
Patchwork-id: 3167
O-Subject: [PATCH 01/38] Use quiet-command to get a cleaner build output
Bugzilla: 515749
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Acked-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 qemu/Makefile        |   30 ++++++++++++++++--------------
 qemu/Makefile.target |   20 +++++++++++---------
 2 files changed, 27 insertions(+), 23 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/Makefile        |   30 ++++++++++++++++--------------
 qemu/Makefile.target |   20 +++++++++++---------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/qemu/Makefile b/qemu/Makefile
index f344c05..cf23885 100644
--- a/qemu/Makefile
+++ b/qemu/Makefile
@@ -194,49 +194,51 @@ endif
 
 LIBS+=$(VDE_LIBS)
 
+quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1))
+
 cocoa.o: cocoa.m
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<,"  CC     $@")
 
 sdl.o: sdl.c keymaps.c sdl_keysym.h
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c -o $@ $<,"  CC     $@")
 
 vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(CONFIG_VNC_TLS_CFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) $(CONFIG_VNC_TLS_CFLAGS) -c -o $@ $<,"  CC     $@")
 
 curses.o: curses.c keymaps.c curses_keys.h
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<,"  CC     $@")
 
 bt-host.o: bt-host.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(CONFIG_BLUEZ_CFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) $(CONFIG_BLUEZ_CFLAGS) -c -o $@ $<,"  CC     $@")
 
 audio/sdlaudio.o: audio/sdlaudio.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c -o $@ $<,"  CC     $@")
 
 libqemu_common.a: $(OBJS)
-	rm -f $@ 
-	$(AR) rcs $@ $(OBJS)
+	@rm -f $@ 
+	$(call quiet-command,$(AR) rcs $@ $(OBJS),"  AR     $@")
 
 #######################################################################
 # USER_OBJS is code used by qemu userspace emulation
 USER_OBJS=cutils.o  cache-utils.o
 
 libqemu_user.a: $(USER_OBJS)
-	rm -f $@ 
-	$(AR) rcs $@ $(USER_OBJS)
+	@rm -f $@ 
+	$(call quiet-command,$(AR) rcs $@ $(USER_OBJS),"  AR     $@")
 
 ######################################################################
 
 qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
+	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS),"  LD     $@")
 
 %.o: %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<,"  CC     $@")
 
 qemu-nbd$(EXESUF):  qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
+	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS),"  LD     $@")
 
 qemu-io$(EXESUF): qemu-io.o qemu-tool.o osdep.o cmd.o $(BLOCK_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
+	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS),"  LD     $@")
 
 clean:
 # avoid old build problems by removing potentially incorrect old files
diff --git a/qemu/Makefile.target b/qemu/Makefile.target
index afc7f60..077a199 100644
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -307,9 +307,11 @@ endif
 
 # libqemu
 
+quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1))
+
 libqemu.a: $(LIBOBJS)
-	rm -f $@
-	$(AR) rcs $@ $(LIBOBJS)
+	@rm -f $@
+	$(call quiet-command,$(AR) rcs $@ $(LIBOBJS),"  AR     $@")
 
 translate.o: translate.c cpu.h
 
@@ -318,18 +320,18 @@ translate-all.o: translate-all.c cpu.h
 tcg/tcg.o: cpu.h
 
 machine.o: machine.c
-	$(CC) $(OP_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(OP_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"  CC     $@")
 
 # HELPER_CFLAGS is used for all the code compiled with static register
 # variables
 op_helper.o: op_helper.c
-	$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) $(I386_CFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) $(I386_CFLAGS) -c -o $@ $<,"  CC     $@")
 
 cpu-exec.o: cpu-exec.c
-	$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"  CC     $@")
 
 qemu-kvm-helper.o: qemu-kvm-helper.c
-	$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(call quiet-command,$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"  CC     $@")
 
 #########################################################
 # Linux user emulator target
@@ -898,7 +900,7 @@ firmware.o: firmware.c
 endif
 
 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS)
+	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS),"  LD     $@")
 
 endif # !CONFIG_USER_ONLY
 
@@ -911,10 +913,10 @@ else
 endif
 
 %.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     $@")
 
 clean:
 	rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
-- 
1.6.3.rc4.29.g8146