From 47b68865886bc60aaa3389121040ba1af1089130 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Sun, 21 Aug 2011 16:37:04 +0800
Subject: [PATCH] Kernel - Reworked kernel build to use object directories

- Much neater now
---
 Kernel/Makefile | 30 ++++++++++++++++++++----------
 Makefile.cfg    |  1 +
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 88188909..6501a900 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -21,6 +21,9 @@ CFLAGS  	+= -Wall -Werror -fno-stack-protector -fno-builtin -Wstrict-prototypes
 CFLAGS  	+= -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wuninitialized
 LDFLAGS		+= -T arch/$(ARCHDIR)/link.ld -g
 
+OBJDIR := obj-$(ARCH)/
+#OBJSUFFIX := .$(ARCH)
+
 ifeq ($(DEBUG_BUILD),yes)
 	LDFLAGS += -g
 	CFLAGS += -g
@@ -41,23 +44,27 @@ OBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/dir.o vfs/io.o vfs/mount.o
 OBJ += vfs/memfile.o vfs/nodecache.o vfs/handle.o vfs/select.o vfs/mmap.o
 OBJ += vfs/fs/root.o vfs/fs/devfs.o
 OBJ += $(addprefix drv/, $(addsuffix .o,$(DRIVERS)))
-OBJ := $(addsuffix .$(ARCH), $(OBJ))
+
+OBJ := $(addsuffix $(OBJSUFFIX), $(OBJ))
+OBJ := $(addprefix $(OBJDIR), $(OBJ))
+
 MODS += $(addprefix ../Modules/, $(addsuffix .xo.$(ARCH),$(MODULES)))
 BIN = ../Acess2.$(ARCH).bin
 GZBIN = ../Acess2.$(ARCH).gz
 
-DEPFILES  = $(filter %.o.$(ARCH),$(OBJ))
-DEPFILES := $(DEPFILES:%.o.$(ARCH)=%.d.$(ARCH))
+DEPFILES  = $(filter %.o$(OBJSUFFIX),$(OBJ))
+DEPFILES := $(DEPFILES:%.o$(OBJSUFFIX)=%.dep$(OBJSUFFIX))
 
-SRCFILES  = $(OBJ:%.o.$(ARCH)=%.c)
-SRCFILES := $(SRCFILES:%.ao.$(ARCH)=%.$(AS_SUFFIX))
+SRCFILES  = $(OBJ:$(OBJDIR)%.o$(OBJSUFFIX)=%.c)
+SRCFILES := $(SRCFILES:$(OBJDIR)%.ao$(OBJSUFFIX)=%.$(AS_SUFFIX))
 
 .PHONY: all clean install apidoc
 
 all: $(BIN)
 
 clean:
-	@$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt $(OBJ) $(DEPFILES)
+#	$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt $(OBJ) $(DEPFILES)
+	@$(RM) $(BIN) ../Acess2.$(ARCH).gz $(BIN).dsm ../Map.$(ARCH).txt LineCounts.$(ARCH).txt -r $(OBJDIR) $(OBJ) $(DEPFILES)
 
 install: $(BIN) 
 	cp $(BIN) $(BIN)_
@@ -78,17 +85,19 @@ $(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile
 	$(POSTBUILD)
 #	$(STRIP) $(BIN)
 
-%.ao.$(ARCH): %.$(AS_SUFFIX) Makefile
+$(OBJDIR)%.ao$(OBJSUFFIX): %.$(AS_SUFFIX) Makefile
 	@echo --- AS -o $@
+	@mkdir -p $(dir $@)
 	@$(AS) $(ASFLAGS) $< -o $@
 
-%.o.$(ARCH): %.c Makefile
+$(OBJDIR)%.o$(OBJSUFFIX): %.c Makefile
 #	if exists %*/Makefile
 #	@make -C %*/ all
 #	else
 	@echo --- CC -o $@
+	@mkdir -p $(dir $@)
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
+	@$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $(OBJDIR)$*.dep$(OBJSUFFIX) $<
 #	endif
 
 %.xo.$(ARCH):
@@ -99,7 +108,8 @@ include/syscalls.h include/syscalls.inc.asm:	syscalls.lst Makefile GenSyscalls.p
 
 Makefile:	../Makefile.cfg arch/$(ARCHDIR)/Makefile
 
-drv/proc.o.%: Makefile.BuildNum
+# HACK - Rebuild proc when the buildnum changes
+$(OBJDIR)drv/proc.o$(OBJSUFFIX): Makefile.BuildNum
 
 # Dependency Files
 -include $(DEPFILES)
diff --git a/Makefile.cfg b/Makefile.cfg
index d8a8e0d4..c980f42e 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -65,3 +65,4 @@ endif
 
 MODULES += IPStack	# So the other modules are loaded before it
 DYNMODS := USB/Core
+#DYNMODS += Filesystems/InitRD
-- 
2.20.1