From ca844d89e45d8edf3896a457f81b5104cd087b4a Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Mon, 1 Sep 2025 22:57:31 +0200 Subject: [PATCH 1/2] Remove junk main from makefile --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 39c8c74..88f77cf 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,6 @@ CFLAGS += -I./kern/libkern all: kern/kernel.elf -main: main.o - kern/kernel.elf: kern/entry.o kern/start.o kern/libkern/string.o kern/libkern/proc.o kern/libkern/uart.o kern/libkern/panic.o kern/kalloc.o kern/libkern/memory.o kern/libkern/spinlock.o kern/libkern/string.o kern/libkern/mini-printf.o @echo LD $@ @$(LD) $(LDFLAGS) -o $@ $^ From b24035c51f345697b7f97d0acd1f3e03e44d13c0 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Mon, 1 Sep 2025 22:57:48 +0200 Subject: [PATCH 2/2] Branch out all kernel objects into a KERNEL_OBJ variable --- Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 88f77cf..8621d11 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,19 @@ CFLAGS += -I./kern/libkern all: kern/kernel.elf -kern/kernel.elf: kern/entry.o kern/start.o kern/libkern/string.o kern/libkern/proc.o kern/libkern/uart.o kern/libkern/panic.o kern/kalloc.o kern/libkern/memory.o kern/libkern/spinlock.o kern/libkern/string.o kern/libkern/mini-printf.o +KERNEL_OBJ := \ + kern/entry.o \ + kern/start.o \ + kern/kalloc.o \ + kern/libkern/string.o \ + kern/libkern/proc.o \ + kern/libkern/uart.o \ + kern/libkern/panic.o \ + kern/libkern/memory.o \ + kern/libkern/spinlock.o \ + kern/libkern/mini-printf.o + +kern/kernel.elf: $(KERNEL_OBJ) @echo LD $@ @$(LD) $(LDFLAGS) -o $@ $^