From d79b7492910d4a77b8c3a70f28c5ea4c81a0b2e5 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Mon, 31 Aug 2020 23:09:35 +0200 Subject: Abstracted tests from boot process --- kernel/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'kernel/Makefile') diff --git a/kernel/Makefile b/kernel/Makefile index bdf89ff..a907986 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -1,8 +1,6 @@ # MIT License, Copyright (c) 2020 Marvin Borner -COBJS = main.o \ - test.o \ - drivers/interrupts.o \ +COBJS = drivers/interrupts.o \ drivers/interrupts_asm.o \ drivers/keyboard.o \ drivers/mouse.o \ @@ -39,12 +37,15 @@ bootloader: @mkdir -p ../build/ @$(AS) -f bin entry.asm -o ../build/boot.bin -compile: $(COBJS) +compile: main.o $(COBJS) @mkdir -p ../build/ @$(LD) -N -ekernel_main -Ttext 0x00050000 -o ../build/kernel.bin -L../build/ $+ -lk --oformat binary @$(CC) $(CFLAGS) -o ../build/debug.o -L../build/ $+ -lk -compile_test: CFLAGS += -Dtest -compile_test: compile +compile_test: CFLAGS += -Dtest -Wl,-etest_all +compile_test: test.o $(COBJS) + @mkdir -p ../build/ + @$(LD) -N -etest_all -Ttext 0x00050000 -o ../build/kernel.bin -L../build/ $+ -lk --oformat binary + @$(CC) $(CFLAGS) -o ../build/debug.o -L../build/ $+ -lk .PHONY: test compile_test -- cgit v1.2.3