Browse Source

[makefile] Reduce verbosity of various NON_AUTO_MEDIA rules

tags/v0.9.6
Michael Brown 15 years ago
parent
commit
3029eb0e84
3 changed files with 17 additions and 10 deletions
  1. 6
    4
      src/arch/i386/Makefile
  2. 10
    5
      src/arch/i386/Makefile.pcbios
  3. 1
    1
      src/util/geniso

+ 6
- 4
src/arch/i386/Makefile View File

@@ -88,14 +88,16 @@ include arch/i386/Makefile.$(PLATFORM)
88 88
 # rule to write disk images to /dev/fd0
89 89
 NON_AUTO_MEDIA	+= fd0
90 90
 %fd0 : %dsk
91
-	dd if=$< bs=512 conv=sync of=/dev/fd0
92
-	sync
91
+	$(QM)$(ECHO) "  [DD] $@"
92
+	$(Q)dd if=$< bs=512 conv=sync of=/dev/fd0
93
+	$(Q)sync
93 94
 
94 95
 # rule to create padded disk images
95 96
 NON_AUTO_MEDIA	+= pdsk
96 97
 %pdsk : %dsk
97
-	cp $< $@
98
-	$(PERL) ./util/dskpad.pl $@
98
+	$(QM)$(ECHO) "  [DSKPAD] $@"
99
+	$(Q)cp $< $@
100
+	$(Q)$(PERL) ./util/dskpad.pl $@
99 101
 
100 102
 # Add NON_AUTO_MEDIA to the media list, so that they show up in the
101 103
 # output of "make"

+ 10
- 5
src/arch/i386/Makefile.pcbios View File

@@ -29,21 +29,26 @@ MEDIA		+= exe
29 29
 # rule to make a non-emulation ISO boot image
30 30
 NON_AUTO_MEDIA	+= iso
31 31
 %iso:	%lkrn util/geniso
32
-	ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $<
32
+	$(QM)$(ECHO) "  [GENISO] $@"
33
+	$(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $<
33 34
 
34 35
 # rule to make a floppy emulation ISO boot image
35 36
 NON_AUTO_MEDIA	+= liso
36 37
 %liso:	%lkrn util/genliso
37
-	bash util/genliso $@ $<
38
+	$(QM)$(ECHO) "  [GENLISO] $@"
39
+	$(Q)bash util/genliso $@ $<
38 40
 
39 41
 # Special target for building Master Boot Record binary
40 42
 $(BIN)/mbr.bin : $(BIN)/mbr.o
41
-	$(OBJCOPY) -O binary $< $@
43
+	$(QM)$(ECHO) "  [OBJCOPY] $@"
44
+	$(Q)$(OBJCOPY) -O binary $< $@
42 45
 
43 46
 # rule to make a USB disk image
44 47
 $(BIN)/usbdisk.bin : $(BIN)/usbdisk.o
45
-	$(OBJCOPY) -O binary $< $@
48
+	$(QM)$(ECHO) "  [OBJCOPY] $@"
49
+	$(Q)$(OBJCOPY) -O binary $< $@
46 50
 
47 51
 NON_AUTO_MEDIA	+= usb
48 52
 %usb: $(BIN)/usbdisk.bin %hd
49
-	cat $^ > $@
53
+	$(QM)$(ECHO) "  [FINISH] $@"
54
+	$(Q)cat $^ > $@

+ 1
- 1
src/util/geniso View File

@@ -52,5 +52,5 @@ do
52 52
 	echo "" KERNEL $g
53 53
 	cp -p $f $dir/$g
54 54
 done >> $cfg
55
-mkisofs -l -o $out -c boot.cat -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table $dir
55
+mkisofs -q -l -o $out -c boot.cat -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table $dir
56 56
 rm -fr $dir

Loading…
Cancel
Save