From 78cb3d7156fce0d8e84f4401ef6f8c9cba56bb7b Mon Sep 17 00:00:00 2001
From: yuchen <yuchen@tsinghua.edu.cn>
Date: Tue, 9 Jun 2015 20:51:40 +0800
Subject: [PATCH] add update of lab2, lab2_result Makefile from
 https://github.com/Archstacker/ucore_lab/

---
 labcodes/lab2/Makefile               | 28 ++++++++++++++--------------
 labcodes_answer/lab2_result/Makefile | 30 +++++++++++++++---------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/labcodes/lab2/Makefile b/labcodes/lab2/Makefile
index 5496909..a1a3bee 100644
--- a/labcodes/lab2/Makefile
+++ b/labcodes/lab2/Makefile
@@ -224,32 +224,32 @@ endif
 
 # files for grade script
 
-targets: $(TARGETS)
+TARGETS: $(TARGETS)
 
-.DEFAULT_GOAL := targets
+.DEFAULT_GOAL := TARGETS
 
 QEMUOPTS = -hda $(UCOREIMG)
 
-.PHONY: qemu qemu-nox gdb debug debug-mon debug-nox
-qemu-mon: targets
+.PHONY: qemu qemu-nox debug debug-nox
+qemu-mon: $(UCOREIMG)
 	$(V)$(QEMU)  -no-reboot -monitor stdio $(QEMUOPTS) -serial null
-qemu: targets
+qemu: $(UCOREIMG)
 	$(V)$(QEMU)  -no-reboot -parallel stdio $(QEMUOPTS) -serial null
 
 qemu-nox: targets
 	$(V)$(QEMU)  -no-reboot -serial mon:stdio $(QEMUOPTS) -nographic
 
-gdb:
-	$(V)$(GDB) -q -x tools/gdbinit
+TERMINAL := gnome-terminal
 
-debug: targets
-	$(V)$(QEMU) -S -s -parallel stdio $(QEMUOPTS) -serial null
+debug: $(UCOREIMG)
+	$(V)$(QEMU) -S -s -parallel stdio $(QEMUOPTS) -serial null &
+	$(V)sleep 2
+	$(V)$(TERMINAL) -e "$(GDB) -q -x tools/gdbinit"
 
-debug-mon: targets
-	$(V)$(QEMU) -S -s -monitor stdio $(QEMUOPTS) -parallel null -serial null
-
-debug-nox: targets
-	$(V)$(QEMU) -S -s -serial mon:stdio $(QEMUOPTS) -nographic
+debug-nox: $(UCOREIMG)
+	$(V)$(QEMU) -S -s -serial mon:stdio $(QEMUOPTS) -nographic &
+	$(V)sleep 2
+	$(V)$(TERMINAL) -e "$(GDB) -q -x tools/gdbinit"
 
 .PHONY: grade touch
 
diff --git a/labcodes_answer/lab2_result/Makefile b/labcodes_answer/lab2_result/Makefile
index e213270..a06dbf3 100644
--- a/labcodes_answer/lab2_result/Makefile
+++ b/labcodes_answer/lab2_result/Makefile
@@ -207,26 +207,26 @@ targets: $(TARGETS)
 
 QEMUOPTS = -hda $(UCOREIMG)
 
-.PHONY: qemu qemu-nox gdb debug debug-mon debug-nox
-qemu-mon: targets
-	$(V)$(QEMU) -no-reboot -monitor stdio $(QEMUOPTS) -serial null
-qemu: targets
-	$(V)$(QEMU) -no-reboot -parallel stdio $(QEMUOPTS) -serial null
+.PHONY: qemu qemu-nox debug debug-nox
+qemu-mon: $(UCOREIMG)
+	$(V)$(QEMU) -monitor stdio $(QEMUOPTS) -serial null
+qemu: $(UCOREIMG)
+	$(V)$(QEMU) -parallel stdio $(QEMUOPTS) -serial null
 
 qemu-nox: targets
-	$(V)$(QEMU) -no-reboot -serial mon:stdio $(QEMUOPTS) -nographic
+	$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
 
-gdb:
-	$(V)$(GDB) -q -x tools/gdbinit
+TERMINAL := gnome-terminal
 
-debug: targets
-	$(V)$(QEMU) -S -s -parallel stdio $(QEMUOPTS) -serial null
+debug: $(UCOREIMG)
+	$(V)$(QEMU) -S -s -parallel stdio $(QEMUOPTS) -serial null &
+	$(V)sleep 2
+	$(V)$(TERMINAL) -e "$(GDB) -q -x tools/gdbinit"
 
-debug-mon: targets
-	$(V)$(QEMU) -S -s -monitor stdio $(QEMUOPTS) -parallel null -serial null
-
-debug-nox: targets
-	$(V)$(QEMU) -S -s -serial mon:stdio $(QEMUOPTS) -nographic
+debug-nox: $(UCOREIMG)
+	$(V)$(QEMU) -S -s -serial mon:stdio $(QEMUOPTS) -nographic &
+	$(V)sleep 2
+	$(V)$(TERMINAL) -e "$(GDB) -q -x tools/gdbinit"
 
 .PHONY: grade touch