X-Git-Url: http://git.dujemihanovic.xyz/projects?a=blobdiff_plain;f=Makefile;h=9d1c34475a160d1bb3af2d6fd2ff3f28feb0169e;hb=63853960825f007827a79f704d291c372c807096;hp=7001c99b6359d03cd4b26c934e903e2b0079e473;hpb=c9f2bccb44c5437f1cae0862b2c84d3af47eade8;p=nameless-os.git

diff --git a/Makefile b/Makefile
index 7001c99..9d1c344 100644
--- a/Makefile
+++ b/Makefile
@@ -2,25 +2,30 @@ AS = yasm
 LD = i686-elf-ld
 CC = i686-elf-gcc
 
+KERNEL_OBJ = kernel/entry.o kernel/arch/x86/tty/tty.o kernel/kernel.o
+
 all: boot.img
 
-boot.img: boot kernel/kernel.bin
-	cat boot kernel/kernel.bin > $@
+boot.img: boot/x86/boot kernel/kernel.bin
+	cat boot/x86/boot kernel/kernel.bin > $@
 	truncate -s1440K $@
 
-boot: boot.s
-	$(AS) -f bin boot.s -o $@
+boot/x86/boot: boot/x86/boot.s boot/x86/a20.s boot/x86/protected.s
+	$(AS) -f bin boot/x86/boot.s -o $@
 
-kernel/kernel.bin: kernel/entry.o kernel/kernel.o
-	$(LD) -o $@ -Ttext 0x1000 kernel/entry.o kernel/kernel.o --oformat=binary
+kernel/kernel.bin: ${KERNEL_OBJ}
+	$(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ} --oformat=binary
 
 kernel/entry.o: kernel/entry.s
 	$(AS) -f elf kernel/entry.s -o $@
 
+kernel/arch/x86/tty/tty.o: kernel/arch/x86/tty/tty.c
+	$(CC) -g -o $@ -ffreestanding -c kernel/arch/x86/tty/tty.c
+
 kernel/kernel.o: kernel/kernel.c
-	$(CC) -o $@ -ffreestanding -c kernel/kernel.c
+	$(CC) -g -o $@ -Iinclude/arch/x86 -ffreestanding -c kernel/kernel.c
 
 clean:
-	rm boot kernel/kernel.bin kernel/entry.o kernel/kernel.o boot.img
+	rm boot/x86/boot kernel/kernel.bin ${KERNEL_OBJ} boot.img
 
 .PHONY: all clean