david/ipxe
david/ipxe
Archived
1
0
Fork 0
Code

[makefile] Reduce verbosity of various NON_AUTO_MEDIA rules

Browse Source
This commit is contained in:
Michael Brown 2008-10-10 03:57:31 +01:00
parent 5c695db474
commit 3029eb0e84
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/arch/i386/Makefile
View File

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

15
src/arch/i386/Makefile.pcbios
View File

@ -29,21 +29,26 @@ MEDIA += exe
# rule to make a non-emulation ISO boot image # rule to make a non-emulation ISO boot image
NON_AUTO_MEDIA += iso NON_AUTO_MEDIA += iso
%iso: %lkrn util/geniso %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 # rule to make a floppy emulation ISO boot image
NON_AUTO_MEDIA += liso NON_AUTO_MEDIA += liso
%liso: %lkrn util/genliso %liso: %lkrn util/genliso
bash util/genliso $@ $< $(QM)$(ECHO) " [GENLISO] $@"
$(Q)bash util/genliso $@ $<
# Special target for building Master Boot Record binary # Special target for building Master Boot Record binary
$(BIN)/mbr.bin : $(BIN)/mbr.o $(BIN)/mbr.bin : $(BIN)/mbr.o
$(OBJCOPY) -O binary $< $@ $(QM)$(ECHO) " [OBJCOPY] $@"
$(Q)$(OBJCOPY) -O binary $< $@
# rule to make a USB disk image # rule to make a USB disk image
$(BIN)/usbdisk.bin : $(BIN)/usbdisk.o $(BIN)/usbdisk.bin : $(BIN)/usbdisk.o
$(OBJCOPY) -O binary $< $@ $(QM)$(ECHO) " [OBJCOPY] $@"
$(Q)$(OBJCOPY) -O binary $< $@
NON_AUTO_MEDIA += usb NON_AUTO_MEDIA += usb
%usb: $(BIN)/usbdisk.bin %hd %usb: $(BIN)/usbdisk.bin %hd
cat $^ > $@ $(QM)$(ECHO) " [FINISH] $@"
$(Q)cat $^ > $@

2
src/util/geniso
View File

@ -52,5 +52,5 @@ do
echo "" KERNEL $g echo "" KERNEL $g
cp -p $f $dir/$g cp -p $f $dir/$g
done >> $cfg 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 rm -fr $dir