Also compile kernel as ELF for easier disassembly

[nameless-os.git] / Makefile

diff --git a/Makefile b/Makefile
index a4c88b392be52822dea6e890cacc9b200b7acdcd..ce6fccc146f48fb206005586f2beb4a3c5c5e970 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,17 +4,17 @@ CC = i686-elf-gcc
 
 KERNEL_OBJ = kernel/entry.o kernel/arch/x86/tty/tty.o kernel/kernel.o
 
-all: boot.img
+all: boot.img kernel/kernel.elf
 
-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 boot/x86/print.s
+       $(AS) -f bin boot/x86/boot.s -o $@
 
 kernel/kernel.bin: ${KERNEL_OBJ}
-       $(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ} --oformat=binary
+       $(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ} 
 
 kernel/entry.o: kernel/entry.s
        $(AS) -f elf kernel/entry.s -o $@
@@ -25,7 +25,10 @@ kernel/arch/x86/tty/tty.o: kernel/arch/x86/tty/tty.c
 kernel/kernel.o: 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_OBJ} boot.img
+       rm boot/x86/boot kernel/kernel.bin ${KERNEL_OBJ} boot.img
 
 .PHONY: all clean