summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/makefile b/kernel/makefile
index c579016..5a53f00 100644
--- a/kernel/makefile
+++ b/kernel/makefile
@@ -3,7 +3,7 @@ all: run
run : ld
ld: kernel.o bootloader.o gdt.o gdt_asm.o
- ld -Tkernel.ld -melf_i386 gdt_asm.o bootloader.o kernel.o gdt.o -o kernel.elf
+ ld -Tkernel.ld -melf_i386 gdt_asm.o bootloader.o kernel.o kernel_asm.o gdt.o -o kernel.elf
kernel.o: kernel.c kernel_asm.o
gcc -DTEST -std=gnu99 -m32 -fno-builtin -ffreestanding -Wall -Wextra -c kernel.c
@@ -12,7 +12,7 @@ kernel_asm.o: kernel_asm.s
nasm -f elf32 $<
bootloader.o: bootloader.s
- nasm -f elf32 bootloader.s
+ nasm -f elf32 $<
gdt.o: gdt.c gdt.h
gcc -std=gnu99 -m32 -fno-builtin -ffreestanding -Wall -Wextra -c gdt.c