Improve build output.

The Makefile prints need to be @printf -- not $(Q)printf -- as they should

 (1) be printed always (with 'make' _and_ with 'make V=1'),

 (2) but the printf command itself should not be printed, hence the '@'.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4577 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

3 files changed, 28 insertions, 29 deletions

diff --git a/Makefile b/Makefile
index e937e7c39b..24ead11807 100644
--- a/Makefile
+++ b/Makefile
@@ -143,49 +143,49 @@ $(eval $(call evaluate_subdirs))
 
 define objs_c_template
 $(obj)/$(1)%.o: src/$(1)%.c
-	$(Q)printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
 	$(Q)$(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define objs_S_template
 $(obj)/$(1)%.o: src/$(1)%.S
-	$(Q)printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
 	$(Q)$(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define initobjs_c_template
 $(obj)/$(1)%.o: src/$(1)%.c
-	$(Q)printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
 	$(Q)$(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define initobjs_S_template
 $(obj)/$(1)%.o: src/$(1)%.S
-	$(Q)printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
 	$(Q)$(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define drivers_c_template
 $(obj)/$(1)%.o: src/$(1)%.c
-	$(Q)printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
 	$(Q)$(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define drivers_S_template
 $(obj)/$(1)%.o: src/$(1)%.S
-	$(Q)printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
 	$(Q)$(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define smmobjs_c_template
 $(obj)/$(1)%.o: src/$(1)%.c
-	$(Q)printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
 	$(Q)$(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define smmobjs_S_template
 $(obj)/$(1)%.o: src/$(1)%.S
-	$(Q)printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    CC         $$(subst $$(shell pwd)/,,$$(@))\n"
 	$(Q)$(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
 endef
 
@@ -246,7 +246,7 @@ prepare:
 	$(Q)test -n "$(alldirs)" && mkdir -p $(alldirs) || true
 
 prepare2:
-	$(Q)printf "    GEN        $(subst $(shell pwd)/,,$(obj)/build.h)\n"
+	@printf "    GEN        $(subst $(shell pwd)/,,$(obj)/build.h)\n"
 	$(Q)printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" > $(obj)/build.h
 	$(Q)printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\n" >> $(obj)/build.h
 	$(Q)printf "#define COREBOOT_V2 \"$(COREBOOT_V2)\"\n" >> $(obj)/build.h
@@ -292,7 +292,7 @@ $(obj)/ldoptions: $(obj)/config.h
 	$(Q)awk '/^#define ([^"])* ([^"])*$$/ {print $$2 " = " $$3 ";";}' $< > $@
 
 $(obj)/romcc: $(top)/util/romcc/romcc.c
-	$(Q)printf "  HOSTCC  romcc"
+	@printf "    HOSTCC     romcc"
 	$(HOSTCC) -g -O2 -Wall -o $@ $<
 
 .PHONY: $(PHONY) prepare prepare2 clean distclean doxygen doxy coreboot
diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index 541c5bb97d..4fb4ee5e21 100644
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -18,20 +18,20 @@ $(obj)/coreboot.rom: $(obj)/coreboot.bootblock $(obj)/coreboot_ram $(CBFSTOOL)
 	$(Q)$(CBFSTOOL) $@ create $(shell expr 1024 \* $(CONFIG_COREBOOT_ROMSIZE_KB)) $(BOOTBLOCK_SIZE) $(obj)/coreboot.bootblock
 	$(Q)if [ -f fallback/coreboot_apc ]; \
 	then \
-		$(Q) $(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \
+		$(Q)$(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \
 	fi
 	$(Q)$(CBFSTOOL) $@ add-stage  $(obj)/coreboot_ram fallback/coreboot_ram $(CBFS_COMPRESS_FLAG)
 ifeq ($(CONFIG_PAYLOAD_NONE),y)
-	$(Q)printf "    PAYLOAD    none (as specified by user)\n"
+	@printf "    PAYLOAD    none (as specified by user)\n"
 else
-	$(Q) printf "    PAYLOAD    $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n"
+	@printf "    PAYLOAD    $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n"
 	$(Q)$(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE)  fallback/payload $(CBFS_COMPRESS_FLAG)
 ifeq ($(CONFIG_VGA_BIOS),y)
-	$(Q) printf "    VGABIOS    $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n"
-	$(Q) $(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom 
+	@printf "    VGABIOS    $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n"
+	$(Q)$(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom 
 endif
-	$(Q) printf "    CBFSPRINT  ./build/coreboot.rom\n\n"
-	$(CBFSTOOL) build/coreboot.rom print
+	@printf "    CBFSPRINT  ./build/coreboot.rom\n\n"
+	$(Q)$(CBFSTOOL) build/coreboot.rom print
 endif
 
 
@@ -39,7 +39,7 @@ endif
 # Build the bootblock
 
 $(obj)/coreboot.bootblock: $(obj)/coreboot
-	$(Q)printf "    OBJCOPY    $(subst $(obj)/,,$(@))\n"
+	@printf "    OBJCOPY    $(subst $(obj)/,,$(@))\n"
 	$(Q)$(OBJCOPY) -O binary $< $@
 
 $(obj)/ldscript.ld: $(ldscripts) $(obj)/ldoptions
@@ -50,13 +50,13 @@ $(obj)/crt0_includes.h: $(crt0s)
 	$(Q)printf '$(foreach crt0,$(obj)/config.h $(crt0s),#include "$(crt0)"\n)' > $@
 
 $(obj)/mainboard/$(MAINBOARDDIR)/crt0.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s
-	$(CC) -I$(obj) -Wa,-acdlns -c -o $@ $<  > $(dir $@)/crt0.disasm
+	$(Q)$(CC) -I$(obj) -Wa,-acdlns -c -o $@ $<  > $(dir $@)/crt0.disasm
 
 $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s: $(src)/arch/i386/init/crt0.S.lb $(obj)/crt0_includes.h
-	$(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@
+	$(Q)$(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@
 
 $(obj)/coreboot: $(initobjs) $(obj)/ldscript.ld
-	$(Q)printf "    LINK       $(subst $(obj)/,,$(@))\n"
+	@printf "    LINK       $(subst $(obj)/,,$(@))\n"
 	$(Q)$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(obj)/ldscript.ld $(initobjs)
 	$(Q)$(NM) -n $(obj)/coreboot | sort > $(obj)/coreboot.map
 
@@ -64,31 +64,30 @@ $(obj)/coreboot: $(initobjs) $(obj)/ldscript.ld
 # i386 specific tools
 
 $(obj)/option_table.h $(obj)/option_table.c: $(obj)/build_opt_tbl $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout
-	$(Q)printf "    OPTION     $(subst $(obj)/,,$(@))\n"
+	@printf "    OPTION     $(subst $(obj)/,,$(@))\n"
 	$(Q)$(obj)/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --header $(obj)/option_table.h --option $(obj)/option_table.c
 
 $(obj)/build_opt_tbl: $(top)/util/options/build_opt_tbl.c $(top)/src/include/pc80/mc146818rtc.h $(top)/src/include/boot/coreboot_tables.h
-	$(Q)printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
+	@printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
 	$(Q)$(HOSTCC) $(HOSTCFLAGS) -include $(obj)/config.h $< -o $@
 
 #######################################################################
 # Build the coreboot_ram (stage 2)
 
 $(obj)/coreboot_ram: $(obj)/coreboot_ram.o $(src)/config/coreboot_ram.ld #ldoptions
-	$(Q)printf "    CC         $(subst $(obj)/,,$(@))\n"
+	@printf "    CC         $(subst $(obj)/,,$(@))\n"
 	$(Q)$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/config/coreboot_ram.ld $(obj)/coreboot_ram.o
 	$(Q)$(NM) -n $(obj)/coreboot_ram | sort > $(obj)/coreboot_ram.map
 
 $(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.o $(drivers) $(obj)/coreboot.a $(LIBGCC_FILE_NAME)
-	$(Q)printf "    CC         $(subst $(obj)/,,$(@))\n"
+	@printf "    CC         $(subst $(obj)/,,$(@))\n"
 	$(Q)$(CC) -nostdlib -r -o $@ $(obj)/arch/i386/lib/c_start.o $(drivers) -Wl,-\( $(obj)/coreboot.a $(LIBGCC_FILE_NAME) -Wl,-\)
 
 $(obj)/coreboot.a: $(objs)
-	$(Q)printf "    AR         $(subst $(obj)/,,$(@))\n"
+	@printf "    AR         $(subst $(obj)/,,$(@))\n"
 	$(Q)rm -f $(obj)/coreboot.a
 	$(Q)$(AR) cr $(obj)/coreboot.a $(objs)
 
-
 #######################################################################
 # done
 
diff --git a/util/x86emu/Makefile b/util/x86emu/Makefile
index 2c915d466b..ee5982d248 100644
--- a/util/x86emu/Makefile
+++ b/util/x86emu/Makefile
@@ -57,7 +57,7 @@ PCIROM_SRC += $(patsubst %,$(src)/util/x86emu/%,$(LIBX86EMU_SRC))
 
 
 $(obj)/util/x86emu/libx86emu.a: $(LIBX86EMU_OBJS) $(src)/.config
-	$(Q)printf "  AR      $(subst $(shell pwd)/,,$(@))\n"
+	@printf "  AR      $(subst $(shell pwd)/,,$(@))\n"
 	$(Q)rm -f $@ # otherwise we always add to the archive
 	$(Q)$(AR) qcs $@ $(LIBX86EMU_OBJS)
 
@@ -66,7 +66,7 @@ $(obj)/util/x86emu/libx86emu.a: $(LIBX86EMU_OBJS) $(src)/.config
 #
 
 $(obj)/util/x86emu/%.o: $(src)/util/x86emu/%.c
+	@printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
 	$(Q)mkdir -p $(dir $@)
-	$(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
 	$(Q)$(CC) -Werror $(INITCFLAGS) $(X86EMU_INCLUDE) -I$(src)/util/x86emu/include -c $< -o $@