More features in VGA driver

[nameless-os.git] / Makefile

diff --git a/Makefile b/Makefile
index 7001c99b6359d03cd4b26c934e903e2b0079e473..5d9822946a116ea2bce52b0cef027cdbf59832d9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,25 +2,33 @@ AS = yasm
 LD = i686-elf-ld
 CC = i686-elf-gcc
 
-all: boot.img
+KERNEL_OBJ = kernel/entry.o kernel/arch/x86/tty/tty.o kernel/kernel.o
 
-boot.img: boot kernel/kernel.bin
-       cat boot kernel/kernel.bin > $@
+all: boot.img kernel/kernel.elf
+
+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 boot/x86/print.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} 
 
 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 $@ -Iinclude/arch/x86 -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
+
+kernel/kernel.elf: kernel/kernel.bin
+       $(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ} --oformat=elf32-i386
 
 clean:
-       rm boot kernel/kernel.bin kernel/entry.o kernel/kernel.o boot.img
+       rm boot/x86/boot kernel/kernel.bin kernel/kernel.elf ${KERNEL_OBJ} boot.img
 
 .PHONY: all clean