X-Git-Url: http://git.dujemihanovic.xyz/%7B%7B%20%24.Site.BaseURL%20%7D%7Dposts/index.xml?a=blobdiff_plain;f=Makefile;h=f254d0c8ed42952a44a7d1cd42ad6c699b727b63;hb=refs%2Ftags%2F0.1.1;hp=714528a346d610ace66c17c2933e0ea8e6b7752b;hpb=d895d72c4e8625b435add9067fe8f7298de2d301;p=nameless-os.git

diff --git a/Makefile b/Makefile
index 714528a..f254d0c 100644
--- a/Makefile
+++ b/Makefile
@@ -25,34 +25,31 @@ debug: all
 
 boot/x86/mbr: boot/x86/mbr.s
 boot/x86/vbr-fat32: boot/x86/vbr-fat32.s boot/x86/fat32/*.s 
-boot/x86/stage3/LOADER.BIN: boot/x86/stage3/*.s boot/x86/stage3/*.c boot/x86/fat32/*.s
-boot/x86/stage3/loader.elf: boot/x86/stage3/*.s boot/x86/stage3/*.c boot/x86/fat32/*.s
+boot/x86/stage3/LOADER.BIN: boot/x86/stage3/*.s boot/x86/stage3/*.c boot/x86/fat32/*.s boot/x86/stage3/stage3.ld
+boot/x86/stage3/loader.elf: boot/x86/stage3/*.s boot/x86/stage3/*.c boot/x86/fat32/*.s boot/x86/stage3/stage3.ld
 $(BOOTLOADER_OBJ):
 	$(MAKE) -C boot/x86
 
-boot/x86/disk.img: boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN boot/x86/disk.dump kernel/kernel.bin
+boot/x86/disk.img: boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN boot/x86/disk.dump kernel/kernel.elf
 	truncate -s1G boot/x86/disk.img
 	sfdisk boot/x86/disk.img < boot/x86/disk.dump
 	mkfs.fat -F 32 --offset 2048 boot/x86/disk.img
 	dd if=boot/x86/mbr of=boot/x86/disk.img bs=440 count=1 conv=notrunc
 	dd if=boot/x86/vbr-fat32 of=boot/x86/disk.img bs=1 skip=90 seek=1048666 conv=notrunc
 	mcopy -i boot/x86/disk.img@@1M boot/x86/stage3/LOADER.BIN ::.
-	mcopy -i boot/x86/disk.img@@1M kernel/kernel.bin ::./KERNEL.BIN
-
-kernel/kernel.bin: ${KERNEL_OBJ} kernel/linker.ld
-	$(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ}
+	mcopy -i boot/x86/disk.img@@1M kernel/kernel.elf ::./KERNEL.ELF
 
 kernel/arch/x86/irq/sample_handler.o: kernel/arch/x86/irq/sample_handler.c
 	$(CC) $(CFLAGS) -mgeneral-regs-only -c $< -o $@
 
-kernel/kernel.elf: kernel/kernel.bin
-	$(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ} -Wl,--oformat=elf32-i386
+kernel/kernel.elf: $(KERNEL_OBJ)
+	$(CC) -ffreestanding -nostdlib -o $@ -T kernel/linker.ld ${KERNEL_OBJ} -lgcc
 	i686-elf-objcopy --only-keep-debug kernel/kernel.elf kernel/kernel.dbg
 	i686-elf-objcopy --add-gnu-debuglink=kernel/kernel.dbg kernel/kernel.elf
 	i686-elf-strip --strip-unneeded kernel/kernel.elf
 
 clean:
-	-rm kernel/kernel.{bin,dbg,elf} ${KERNEL_OBJ}
+	-rm kernel/kernel.{dbg,elf} ${KERNEL_OBJ}
 	cd boot/x86 && $(MAKE) clean
 
 .PHONY: default all clean run debug bootloader