[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[tyndur-devel] [PATCH 1/4] Makefile: $LOST_TOOLS_QEMU auch nutzen



* Da nicht bei jedem Qemu auch 'qemu' heißt ist es sinnvoll die
  dafür vorgesehene Konfigurationsvariable auch zu nutzen.

Signed-off-by: Andreas Freimuth <m.nemo@xxxxxxx>
---
 Makefile   | 7 ++++---
 buildmk.sh | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1927650..f83a098 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 CC=$(CC_BINARY)   
 CPP=$(CPP_BINARY) 
 PPC=$(PPC_BINARY) -n -Cn -CX -Ttyndur  -Fu../lib/units -Fu../units
+QEMU=$(QEMU_BINARY)
 
 ASM_ELF=nasm -felf -O99 
 ASM_BIN=nasm -fbin -O99
@@ -73,13 +74,13 @@ image-cdrom: updateroot
 	build/scripts/image_cdrom_$(GRUB_VERSION)
 
 test-qemu-floppy: image-floppy
-	qemu -serial stdio -fda build/images/floppy.img -boot a -net user -net nic,model=rtl8139 | tee qemu-serial.log
+	$(QEMU) -serial stdio -fda build/images/floppy.img -boot a -net user -net nic,model=rtl8139 | tee qemu-serial.log
 
 test-qemu-hd: image-hd
-	qemu -serial stdio -hda build/images/hd.img -net user -net nic,model=rtl8139 | tee qemu-serial.log
+	$(QEMU) -serial stdio -hda build/images/hd.img -net user -net nic,model=rtl8139 | tee qemu-serial.log
 
 test-qemu-cdrom: image-cdrom
-	qemu -serial stdio -cdrom build/images/cdrom.img -boot d -net user -net nic,model=rtl8139 | tee qemu-serial.log
+	$(QEMU) -serial stdio -cdrom build/images/cdrom.img -boot d -net user -net nic,model=rtl8139 | tee qemu-serial.log
 
 test-bochs: image-floppy
 	bochs -f bochs.config
diff --git a/buildmk.sh b/buildmk.sh
index 8078812..083ea21 100644
--- a/buildmk.sh
+++ b/buildmk.sh
@@ -90,6 +90,7 @@ CC_BINARY=$LOST_TOOLS_GCC
 CPP_BINARY=$LOST_TOOLS_GPP
 PPC_BINARY=$LOST_TOOLS_PPC
 LD_BINARY=$LOST_TOOLS_LD
+QEMU_BINARY=$LOST_TOOLS_QEMU
 EOF
 
   # Ist grub legacy installiert?
-- 
1.7.11.7