diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 $@ |