From 1b8020b624171e70558edc4c9c3d93b85cdf9c0f Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Wed, 18 Aug 2021 14:29:15 +0200
Subject: [PATCH] Fixed Makefile

---
 Makefile        | 6 +++---
 kernel/kernel.c | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 1a5eb4e..956ab1f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,16 +12,16 @@ drun: clean run
 grub: eOS.iso
 	qemu-system-x86_64 eOS.iso
 
-eOS.iso : kernel.bin grub/grub.cfg
+eOS.iso : kernel/kernel.bin grub/grub.cfg
 	mkdir -p boot/grub
 	cp $< boot/eOS.bin
 	cp grub/grub.cfg boot/grub/grub.cfg
 	grub-mkrescue -o eOS.iso ./
 
-os-image: bootloader.bin kernel.bin
+os-image: bootloader/bootloader.bin kernel.bin
 	cat $^ > os-image
 
-kernel.bin: kernel_entry.o $(OBJ) 
+kernel.bin: kernel/kernel_entry.o $(OBJ) 
 	gcc -o $@ $^ -Wl,--oformat=binary -ffreestanding -nostdlib -shared -Ttext 0x1000 -m32
 
 %.o : %.c
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 0ec29a5..36b9639 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -1,5 +1,3 @@
-#include "../drivers/vga.c"
-
 void main() {
 	vga_init(); 	// Initialize the screen first
 			// i.e. clear the screen et cetera.