From 3029eb0e848e6e7662fe3f273ae4fa60ca02c88b Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Fri, 10 Oct 2008 03:57:31 +0100
Subject: [PATCH] [makefile] Reduce verbosity of various NON_AUTO_MEDIA rules

---
 src/arch/i386/Makefile        | 10 ++++++----
 src/arch/i386/Makefile.pcbios | 15 ++++++++++-----
 src/util/geniso               |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 97252613..1959fbfd 100644
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -88,14 +88,16 @@ include arch/i386/Makefile.$(PLATFORM)
 # rule to write disk images to /dev/fd0
 NON_AUTO_MEDIA	+= fd0
 %fd0 : %dsk
-	dd if=$< bs=512 conv=sync of=/dev/fd0
-	sync
+	$(QM)$(ECHO) "  [DD] $@"
+	$(Q)dd if=$< bs=512 conv=sync of=/dev/fd0
+	$(Q)sync
 
 # rule to create padded disk images
 NON_AUTO_MEDIA	+= pdsk
 %pdsk : %dsk
-	cp $< $@
-	$(PERL) ./util/dskpad.pl $@
+	$(QM)$(ECHO) "  [DSKPAD] $@"
+	$(Q)cp $< $@
+	$(Q)$(PERL) ./util/dskpad.pl $@
 
 # Add NON_AUTO_MEDIA to the media list, so that they show up in the
 # output of "make"
diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios
index 4afc496c..a93861ab 100644
--- a/src/arch/i386/Makefile.pcbios
+++ b/src/arch/i386/Makefile.pcbios
@@ -29,21 +29,26 @@ MEDIA		+= exe
 # rule to make a non-emulation ISO boot image
 NON_AUTO_MEDIA	+= iso
 %iso:	%lkrn util/geniso
-	ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $<
+	$(QM)$(ECHO) "  [GENISO] $@"
+	$(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $<
 
 # rule to make a floppy emulation ISO boot image
 NON_AUTO_MEDIA	+= liso
 %liso:	%lkrn util/genliso
-	bash util/genliso $@ $<
+	$(QM)$(ECHO) "  [GENLISO] $@"
+	$(Q)bash util/genliso $@ $<
 
 # Special target for building Master Boot Record binary
 $(BIN)/mbr.bin : $(BIN)/mbr.o
-	$(OBJCOPY) -O binary $< $@
+	$(QM)$(ECHO) "  [OBJCOPY] $@"
+	$(Q)$(OBJCOPY) -O binary $< $@
 
 # rule to make a USB disk image
 $(BIN)/usbdisk.bin : $(BIN)/usbdisk.o
-	$(OBJCOPY) -O binary $< $@
+	$(QM)$(ECHO) "  [OBJCOPY] $@"
+	$(Q)$(OBJCOPY) -O binary $< $@
 
 NON_AUTO_MEDIA	+= usb
 %usb: $(BIN)/usbdisk.bin %hd
-	cat $^ > $@
+	$(QM)$(ECHO) "  [FINISH] $@"
+	$(Q)cat $^ > $@
diff --git a/src/util/geniso b/src/util/geniso
index 7642ed36..d7ddbd2b 100755
--- a/src/util/geniso
+++ b/src/util/geniso
@@ -52,5 +52,5 @@ do
 	echo "" KERNEL $g
 	cp -p $f $dir/$g
 done >> $cfg
-mkisofs -l -o $out -c boot.cat -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table $dir
+mkisofs -q -l -o $out -c boot.cat -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table $dir
 rm -fr $dir