Some cleanup ; relocated the kernel at 0xC0000000

1 files changed, 8 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 1da4ce5..c5667d0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,18 @@
 .PHONY: clean, mrproper, Init.rfs, floppy, commit
 
-Projects = kernel library modules/test
+Projects = common kernel user/lib user/test
 QemuCmd = qemu-system-i386
 
-Floppy = Grapes.fl.img
+BasePath = $(shell pwd)
+SrcPath = $(BasePath)/src
+
+Floppy = TCE.fl.img
 
 all:
 	@for p in $(Projects); do \
 		echo ""; echo "----------------------"; \
 		echo "=> Building $$p"; \
-		make -C src/$$p; \
+		BasePath=$(BasePath) SrcPath=$(SrcPath) make -C src/$$p || exit -1; \
 	done
 
 rebuild: mrproper all
@@ -18,14 +21,14 @@ clean:
 	@for p in $(Projects); do \
 		echo ""; echo "----------------------"; \
 		echo "=> Cleaning $$p"; \
-		make -C src/$$p clean -s; \
+		BasePath=$(BasePath) SrcPath=$(SrcPath) make -C src/$$p clean -s; \
 	done
 
 mrproper:
 	@for p in $(Projects); do \
 		echo ""; echo "----------------------"; \
 		echo "=> Cleaning $$p"; \
-		make -C src/$$p mrproper -s; \
+		BasePath=$(BasePath) SrcPath=$(SrcPath) make -C src/$$p mrproper -s; \
 	done
 
 commit: mrproper