X-Git-Url: http://git.dujemihanovic.xyz/posts?a=blobdiff_plain;f=Makefile;h=7001c99b6359d03cd4b26c934e903e2b0079e473;hb=c9f2bccb44c5437f1cae0862b2c84d3af47eade8;hp=9d95b1ef97134bcebc837fe4ab4cfab1e6fff45a;hpb=85d77ed5b53a1bd5642985ca7c6e563c58c98fa1;p=nameless-os.git

diff --git a/Makefile b/Makefile
index 9d95b1e..7001c99 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,26 @@
-AS = yasm # choose yasm or nasm here
-ASFLAGS = -f bin # compile a raw binary
+AS = yasm
+LD = i686-elf-ld
+CC = i686-elf-gcc
 
-boot: boot.s print.s
-	$(AS) $(ASFLAGS) -o $@ boot.s
+all: boot.img
 
-clean:
-	-rm boot
+boot.img: boot kernel/kernel.bin
+	cat boot kernel/kernel.bin > $@
+	truncate -s1440K $@
+
+boot: boot.s
+	$(AS) -f bin boot.s -o $@
+
+kernel/kernel.bin: kernel/entry.o kernel/kernel.o
+	$(LD) -o $@ -Ttext 0x1000 kernel/entry.o kernel/kernel.o --oformat=binary
 
-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/kernel.o: kernel/kernel.c
+	$(CC) -o $@ -ffreestanding -c kernel/kernel.c
+
+clean:
+	rm boot kernel/kernel.bin kernel/entry.o kernel/kernel.o boot.img
 
-.PHONY = clean run help
+.PHONY: all clean