aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorXander <xander@icth.xyz>2023-06-28 21:56:30 +0200
committerXander <xander@icth.xyz>2023-06-28 21:56:30 +0200
commit448ecd41edd95b86930b5ac7288f2ea9311d476c (patch)
tree64106ce37ea5c6067835ce747dd650a5e01a4c1e /Makefile
parentfd86b8a4769860f22fc04ce3b80510d809f68d3c (diff)
downloadats-os-448ecd41edd95b86930b5ac7288f2ea9311d476c.tar.xz
ats-os-448ecd41edd95b86930b5ac7288f2ea9311d476c.zip
Reorganizing
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 6d4c9a8..4178a71 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@ arch ?= x86_64
kernel := build/kernel-$(arch).bin
iso := build/os-$(arch).iso
-linker_script := src/arch/$(arch)/linker.ld
-grub_cfg := src/arch/$(arch)/grub.cfg
-assembly_source_files := $(wildcard src/arch/$(arch)/*.asm)
-assembly_object_files := $(patsubst src/arch/$(arch)/%.asm, \
+linker_script := arch/$(arch)/boot/linker.ld
+grub_cfg := arch/$(arch)/boot/grub.cfg
+assembly_source_files := $(wildcard arch/$(arch)/boot/*.asm)
+assembly_object_files := $(patsubst arch/$(arch)/boot/%.asm, \
build/arch/$(arch)/%.o, $(assembly_source_files))
.PHONY: all clean run iso
@@ -31,6 +31,6 @@ $(kernel): $(assembly_object_files) $(linker_script)
@ld -n -T $(linker_script) -o $(kernel) $(assembly_object_files)
# compile assembly files
-build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm
+build/arch/$(arch)/%.o: arch/$(arch)/boot/%.asm
@mkdir -p $(shell dirname $@)
@nasm -felf64 $< -o $@