Restructure project directories

[rrq/jonasforth.git] / Makefile

diff --git a/Makefile b/Makefile
index 362c429255dcef90992572cfe584f70047864f6c..3f6972b095a456029aa65f9063d12f5e007fced9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 .PHONY: qemu
-qemu: out/main OVMF_CODE.fd OVMF_VARS.fd
+qemu: out/main out/startup.nsh OVMF_CODE.fd OVMF_VARS.fd
        # Based on https://wiki.osdev.org/UEFI#Emulation_with_QEMU_and_OVMF
        qemu-system-x86_64 -cpu qemu64 \
                -drive if=pflash,format=raw,unit=0,file=OVMF_CODE.fd,readonly=on \
@@ -14,9 +14,13 @@ OVMF_CODE.fd: /usr/share/ovmf/x64/OVMF_CODE.fd
 OVMF_VARS.fd: /usr/share/ovmf/x64/OVMF_VARS.fd
        cp $< $@
 
-out/main: main.asm impl.asm bootstrap.asm sys.f os/uefi.asm
+out/main: src/main.asm src/impl.asm src/bootstrap.asm src/uefi.asm init/sys.f init/uefi.f
        mkdir -p out
-       OS_INCLUDE=os/uefi.asm fasm $< $@
+       fasm $< $@
+
+out/startup.nsh:
+       mkdir -p out
+       echo 'fs0:main' >out/startup.nsh
 
 .PHONY: clean
 clean: