From 54e7efbbd0e0c88d99bb6bddb82e9fc8d90eae50 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex.auvolat@ens.fr>
Date: Sun, 30 Nov 2014 19:58:32 +0100
Subject: Add debug output and a few elementary stdlib functions.

---
 kernel/Makefile | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'kernel/Makefile')

diff --git a/kernel/Makefile b/kernel/Makefile
index 7a29c9e..6e973dd 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -3,15 +3,18 @@ AS = nasm
 ASFLAGS = -felf
 
 CC = i586-elf-gcc
-CFLAGS = -ffreestanding -O2 -std=gnu99 -Wall -Wextra -I ./include
+CFLAGS = -ffreestanding -O2 -std=gnu99 -Wall -Wextra -I . -I ./include
+# CXX = i586-elf-g++
+# CXFLAGS = -ffreestanding -O2 -Wall -Wextra -I . -I ./include -fno-exceptions -fno-rtti
 LD = i586-elf-gcc
 LDFLAGS = -T linker.ld -ffreestanding -O2 -nostdlib -lgcc
 
-OBJ = l0/loader.o l0/kmain.o
+OBJ = lib/stdlib.o lib/printf.o l0/loader.o l0/kmain.o l0/dbglog.o l0/sys.o
+OUT = kernel.bin
 
-all: kernel.bin
+all: $(OUT)
 
-kernel.bin: $(OBJ)
+$(OUT): $(OBJ)
 	$(LD) $(LDFLAGS) -o $@ $^
 
 %.o: %.s
@@ -19,3 +22,11 @@ kernel.bin: $(OBJ)
 
 %.o: %.c
 	$(CC) -c $< -o $@ $(CFLAGS)
+
+# %.o: %.cpp
+#	$(CXX) -c $< -o $@ $(CXFLAGS)
+
+clean:
+	rm */*.o || true
+mrproper: clean
+	rm $(OUT)
-- 
cgit v1.2.3