From 2761b620043ad511d9baf66d5478a463aeece77b Mon Sep 17 00:00:00 2001
From: Michal Idziorek <m.i@gmx.at>
Date: Fri, 14 Nov 2014 03:36:29 +0100
Subject: minur improvement

---
 Makefile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 87ecc15..62b053e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,13 +17,11 @@ KERNEL_START=0x100000
 CC=i686-elf-gcc
 
 ############ compiler flags ############
-
 CFLAGS=
 CFLAGS+=-ffreestanding 
 CFLAGS+=-nostdlib 
 CFLAGS+=-std=gnu11
 CFLAGS+= -I.
-
 #CFLAGS+=-lgcc 
 CFLAGS+=-Werror-implicit-function-declaration
 #CFLAGS+= -O4
@@ -33,8 +31,8 @@ CFLAGS+=-Werror-implicit-function-declaration
 ############ source and object files ############
 
 #kernel sources (asm and c)
-
-SOURCES=$(wildcard ./kernel/*.c)
+SOURCES=
+SOURCES+=$(wildcard ./kernel/*.c)
 SOURCES+=$(wildcard ./video/*.c)
 SOURCES+=$(wildcard ./lib/*/*.c)
 SOURCES+=$(wildcard ./fs/*.c)
@@ -42,14 +40,16 @@ SOURCES+=$(wildcard ./fs/*.c)
 ASMSOURCES=$(wildcard ./asm/*.asm)
 
 #kernel object files
-
 OBJECTS=$(patsubst %.c, %.o, $(SOURCES))
-DEPS=$(patsubst %.c, %.d, $(SOURCES))
 ASMOBJECTS=$(patsubst %.asm, %.o, $(ASMSOURCES))
 KERNEL_ENTRY=./boot/kernel_entry.o
 
+# deps
+DEPS=$(patsubst %.c, %.d, $(SOURCES))
+
 ############ final image (default target) ############
 all: FoolOS.vdi
+
 new: clean all
 newrun: clean run
 
@@ -72,6 +72,9 @@ MP_BIN=./boot/mp.bin
 #some fillup data (zeros)
 FILLUP=./data/fill.bin
 
+####### userspace #########
+userspace/ext2.img:
+	make -C userspace
 	
 ############ linking kernel binary ############
 
@@ -137,7 +140,3 @@ release: new
 	-mv FoolOS.img release/
 	make clean_release
 
-####### userspace #########
-userspace/ext2.img:
-	make -C userspace
-
-- 
cgit v1.2.3