X-Git-Url: http://git.dujemihanovic.xyz/posts?a=blobdiff_plain;f=Makefile;h=d3f2ee4be49cbe23808b4d7813da6965cb51ed2e;hb=2a70d72730b91905543e5d5e850bc00cf43bc5e6;hp=9d95b1ef97134bcebc837fe4ab4cfab1e6fff45a;hpb=73dce672626ceb415b49ff059092c48a2f7c3de3;p=nameless-os.git

diff --git a/Makefile b/Makefile
index 9d95b1e..d3f2ee4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,46 @@
-AS = yasm # choose yasm or nasm here
-ASFLAGS = -f bin # compile a raw binary
+export AS = yasm
+export LD = i686-elf-ld
+export CC = i686-elf-gcc
+QEMU = qemu-system-i386
 
-boot: boot.s print.s
-	$(AS) $(ASFLAGS) -o $@ boot.s
+GIT_REV = $(shell git rev-parse --short HEAD)
 
-clean:
-	-rm boot
+CFLAGS = -std=gnu89 -g -Iinclude/arch/x86 -ffreestanding -DGIT_COMMIT=\"$(GIT_REV)\"
+
+KERNEL_OBJ = kernel/entry.o kernel/arch/x86/tty/tty.o kernel/drivers/irq/i8259a.o kernel/arch/x86/irq/idt.o kernel/arch/x86/irq/sample_handler.o kernel/kernel.o
+
+default: kernel/kernel.elf
+
+all: default boot/x86/disk.img
+
+run: boot/x86/disk.img
+	$(QEMU) boot/x86/disk.img
+
+boot/x86/disk.img: boot/x86/mbr.s boot/x86/vbr-fat32.s boot/x86/loader.s boot/x86/disk.dump boot/x86/fat32.s boot/x86/fat32-structs.s
+	cd boot/x86 && $(MAKE) all
+
+kernel/kernel.bin: ${KERNEL_OBJ}
+	$(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ}
 
-run:
-	qemu-system-i386 boot
+kernel/entry.o: kernel/entry.s
+	$(AS) -f elf kernel/entry.s -o $@
 
-help:
-	@echo "Run 'make' to compile."
-	@echo "Run 'make clean' to delete compiled objects."
-	@echo "Run 'make run' to run the compiled object. Must have qemu-system-i386 (but x86_64 should work too)."
+kernel/arch/x86/tty/tty.o: kernel/arch/x86/tty/tty.c
+
+kernel/drivers/irq/i8259a.o: kernel/drivers/irq/i8259a.c
+
+kernel/arch/x86/irq/idt.o: kernel/arch/x86/irq/idt.c
+
+kernel/arch/x86/irq/sample_handler.o: kernel/arch/x86/irq/sample_handler.c
+	$(CC) $(CFLAGS) -mgeneral-regs-only -c kernel/arch/x86/irq/sample_handler.c -o $@
+
+kernel/kernel.o: kernel/kernel.c
+
+kernel/kernel.elf: kernel/kernel.bin
+	$(LD) -o $@ -T kernel/linker.ld ${KERNEL_OBJ} --oformat=elf32-i386
+
+clean:
+	-rm kernel/kernel.bin kernel/kernel.elf ${KERNEL_OBJ}
+	cd boot/x86 && $(MAKE) clean
 
-.PHONY = clean run help
+.PHONY: default all clean run