Restructure project directories

[rrq/jonasforth.git] / Makefile

diff --git a/Makefile b/Makefile
index 4b8184f3c5e0ec58c5d5f747d9aaee5d5c19e8d2..3f6972b095a456029aa65f9063d12f5e007fced9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,17 +14,14 @@ 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
 
-main: main.asm impl.asm bootstrap.asm sys.f os/linux.asm
-       OS_INCLUDE=os/linux.asm fasm $< $@
-
 .PHONY: clean
 clean:
        rm -rf out OVMF_CODE.fd OVMF_VARS.fd