X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/f09e806d5032150564df39a2f7b1192c4d84cf15..78cd005fac540973751b5a108c37a715bc64b5a2:/lunaix-os/makefile

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index bb105d4..779a38e 100644
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -5,7 +5,6 @@ include $(mkinc_dir)/toolchain.mkinc
 include $(mkinc_dir)/qemu.mkinc
 include $(mkinc_dir)/utils.mkinc
 
-
 ARCH ?= i386
 export ARCH
 
@@ -38,17 +37,19 @@ $(kbuild_dir):
 	@mkdir -p $(os_img_dir)/boot/grub
 	@mkdir -p $(os_img_dir)/usr
 
-export BUILD_DIR=$(kbuild_dir)
+.PHONY: kernel
+export BUILD_DIR=$(kbin_dir)
 export BUILD_NAME=$(kbin)
-$(kbin):
+kernel:
 	$(call status,TASK,$(notdir $@))
 	@$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all
 
-$(kimg): usr/build $(kbin)
+.PHONY: image
+image: usr/build kernel
 	$(call status,TASK,$(notdir $@))
 	@./config-grub.sh ${OS_NAME} $(os_img_dir)/boot/grub/grub.cfg
 	@cp -r usr/build/* $(os_img_dir)/usr
-	@cp $(kbin) $(os_img_dir)/boot
+	@cp -r $(kbin_dir)/* $(os_img_dir)/boot
 	@grub-mkrescue -o $(kimg) $(os_img_dir) -- -volid "$(OS_ID) $(OS_VER)" -system_id "$(OS_NAME)"
 
 usr/build: user
@@ -58,10 +59,10 @@ check: $(DEPS) check-cc GRUB_TEMPLATE
 prepare: check $(os_img_dir)
 
 export BUILD_MODE=release
-bootable: $(kbuild_dir) $(kimg)
+bootable: $(kbuild_dir) image
 
 export BUILD_MODE=debug
-bootable-debug: $(kbuild_dir) $(kimg)
+bootable-debug: $(kbuild_dir) image
 
 user:
 	$(call status,$@)
@@ -74,7 +75,6 @@ instable: all
 
 all-debug: bootable-debug
 	@echo "Dumping the disassembled kernel code to $(kbuild_dir)/kdump.txt"
-	@i686-elf-objdump -S $(kbin) > $(kbuild_dir)/kdump.txt
 
 clean:
 	@rm -rf $(kbuild_dir) || exit 1
@@ -90,12 +90,11 @@ debug-qemu: all-debug
 	@i686-elf-objcopy --only-keep-debug $(kbin) $(kbuild_dir)/kernel.dbg
 	@qemu-system-i386 $(call get_qemu_options,$(kimg))
 	@sleep 1
-	@$(QEMU_MON_TERM) -- telnet 127.0.0.1 $(QEMU_MON_PORT)
-	@gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
+	@QMPORT=$(QEMU_MON_PORT) gdb -s $(kbuild_dir)/kernel.dbg -ex "target remote localhost:1234"
 
 debug-qemu-vscode: all-debug
 	@i686-elf-objcopy --only-keep-debug $(kbin) $(kbuild_dir)/kernel.dbg
-	@qemu-system-i386 $(QEMU_OPTIONS)
+	@qemu-system-i386 $(call get_qemu_options,$(kimg))
 	@sleep 0.5
 	@telnet 127.0.0.1 $(QEMU_MON_PORT)