X-Git-Url: http://git.dujemihanovic.xyz/projects?a=blobdiff_plain;f=Makefile;h=ce6fccc146f48fb206005586f2beb4a3c5c5e970;hb=9ef60208fec0c672248023d467f57eecd6e7214f;hp=8d4b3653f3c8f16c9749254f8908bf568e48b17d;hpb=6c6312e540a570d376aae5551626128fcc1cd1c6;p=nameless-os.git diff --git a/Makefile b/Makefile index 8d4b365..ce6fccc 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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/x86/boot kernel/kernel.bin cat boot/x86/boot kernel/kernel.bin > $@ @@ -14,7 +14,7 @@ boot/x86/boot: boot/x86/boot.s boot/x86/a20.s boot/x86/protected.s boot/x86/prin $(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,6 +25,9 @@ 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/x86/boot kernel/kernel.bin ${KERNEL_OBJ} boot.img