From ad3908568cbd3df62fc576b9f9fe8803c166a435 Mon Sep 17 00:00:00 2001
From: Travis Geiselbrecht <geist@newos.org>
Date: Sat, 20 Nov 2004 16:54:01 +0000
Subject: [PATCH] Get the build system working again with the new boot/ dir
 structure

git-svn-id: svn+ssh://newos.org/var/svn/newos/newos@1142 c25cc9d1-44fa-0310-b259-ad778cb1d433
---
 config/{ => arch}/make.config.arm    | 0
 config/{ => arch}/make.config.i386   | 0
 config/{ => arch}/make.config.m68k   | 0
 config/{ => arch}/make.config.ppc    | 0
 config/{ => arch}/make.config.sh4    | 0
 config/{ => arch}/make.config.x86_64 | 0
 config/make.config                   | 4 +++-
 makefile                             | 5 ++---
 8 files changed, 5 insertions(+), 4 deletions(-)
 rename config/{ => arch}/make.config.arm (100%)
 rename config/{ => arch}/make.config.i386 (100%)
 rename config/{ => arch}/make.config.m68k (100%)
 rename config/{ => arch}/make.config.ppc (100%)
 rename config/{ => arch}/make.config.sh4 (100%)
 rename config/{ => arch}/make.config.x86_64 (100%)

diff --git a/config/make.config.arm b/config/arch/make.config.arm
similarity index 100%
rename from config/make.config.arm
rename to config/arch/make.config.arm
diff --git a/config/make.config.i386 b/config/arch/make.config.i386
similarity index 100%
rename from config/make.config.i386
rename to config/arch/make.config.i386
diff --git a/config/make.config.m68k b/config/arch/make.config.m68k
similarity index 100%
rename from config/make.config.m68k
rename to config/arch/make.config.m68k
diff --git a/config/make.config.ppc b/config/arch/make.config.ppc
similarity index 100%
rename from config/make.config.ppc
rename to config/arch/make.config.ppc
diff --git a/config/make.config.sh4 b/config/arch/make.config.sh4
similarity index 100%
rename from config/make.config.sh4
rename to config/arch/make.config.sh4
diff --git a/config/make.config.x86_64 b/config/arch/make.config.x86_64
similarity index 100%
rename from config/make.config.x86_64
rename to config/arch/make.config.x86_64
diff --git a/config/make.config b/config/make.config
index 6d8d55f..bec7336 100644
--- a/config/make.config
+++ b/config/make.config
@@ -105,7 +105,9 @@ ALL_LIST = \
 	$(APPS) \
 	$(LIBS)
 
-include make.config.$(ARCH)
+-include config/arch/make.config.$(ARCH)
+-include config/platform/make.config.$(PLATFORM)
+-include config/target/make.config.$(TARGET)
 
 ALL := \
 	$(ALL_LIST)
diff --git a/makefile b/makefile
index 513c043..36ecd5d 100644
--- a/makefile
+++ b/makefile
@@ -33,15 +33,14 @@ FINAL := $(call TOBUILDDIR, final)
 final: $(FINAL)
 
 # includes the config of the build
-include make.config
-include make.config.$(ARCH)
+include config/make.config
 
 include apps/makefile
 include kernel/makefile
 include kernel/addons/makefile
 include tools/makefile
 include lib/makefile
-include boot/$(ARCH)/makefile
+include boot/$(PLATFORM)/makefile
 
 clean: $(CLEAN)
 	rm -f $(ALL_OBJS)
-- 
2.11.4.GIT