From 40cc5e32663cd0350b791b8e54825f564489343f Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 22 Jul 2020 18:26:56 +0200
Subject: Imported some things from master

---
 Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c25895f..718491a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,16 @@
+# MIT License, Copyright (c) 2020 Marvin Borner
+
 COBJS = src/main.o \
-		src/drivers/vesa.o
+		src/drivers/vesa.o \
+		src/drivers/cpu.o \
+		src/drivers/serial.o \
+		src/lib/string.o
 CC = cross/opt/bin/i686-elf-gcc
 LD = cross/opt/bin/i686-elf-ld
 AS = nasm
 
-CFLAGS = -Wall -Wextra -nostdlib -nostdinc -ffreestanding -std=c99 -pedantic-errors -Isrc/lib/ -Isrc/inc/ -c
+# TODO: Use lib as external library
+CFLAGS = -Wall -Wextra -nostdlib -nostdinc -ffreestanding -std=c99 -pedantic-errors -Isrc/lib/inc/ -Isrc/inc/ -c
 
 all: compile clean
 
-- 
cgit v1.2.3