From 4c846dc6c5b4e8bc39f1ecc3370db690400b40e2 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@portege.mutabah.net>
Date: Sun, 27 Dec 2009 00:18:04 +0800
Subject: [PATCH] Added Filesystem generation and required $(x*) variables

---
 Kernel/Makefile.BuildNum              |  2 +-
 Makefile                              |  2 ++
 Makefile.cfg                          |  3 +++
 Usermode/Filesystem/Conf/BootConf.cfg |  5 +++++
 Usermode/Filesystem/Makefile          | 25 +++++++++++++++++++++++++
 5 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100755 Usermode/Filesystem/Conf/BootConf.cfg
 create mode 100644 Usermode/Filesystem/Makefile

diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum
index b4ec2fa7..05201c78 100644
--- a/Kernel/Makefile.BuildNum
+++ b/Kernel/Makefile.BuildNum
@@ -1 +1 @@
-BUILD_NUM = 1073
+BUILD_NUM = 1074
diff --git a/Makefile b/Makefile
index 0113ad0d..1aad518b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ USRLIBS = ld-acess.so libacess.so libgcc.so libc.so
 USRAPPS = init login CLIShell cat ls mount ifconfig
 
 all:
+	@echo === Filesystem && $(MAKE) all --no-print-directory -C Usermode/Filesystem
 	@for mod in $(MODULES); do \
 	(echo === Module: $$mod && $(MAKE) all --no-print-directory -C Modules/$$mod) \
 	done
@@ -25,6 +26,7 @@ all:
 	done
 
 clean:
+#	@$(MAKE) clean --no-print-directory -C Usermode/Filesystem
 	@for mod in $(MODULES); do \
 	($(MAKE) clean --no-print-directory -C Modules/$$mod) \
 	done
diff --git a/Makefile.cfg b/Makefile.cfg
index 3a164ee6..441718cb 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -12,6 +12,9 @@ MKDIR = mkdir
 RMDIR = rm -rf
 lCP = cp
 xCP = mcopy -D o
+xMKDIR = mmd
+xRMDIR = mdeltree
+xRM = mdel
 
 ARCH = i386
 ARCHDIR = x86
diff --git a/Usermode/Filesystem/Conf/BootConf.cfg b/Usermode/Filesystem/Conf/BootConf.cfg
new file mode 100755
index 00000000..fcd6ad6f
--- /dev/null
+++ b/Usermode/Filesystem/Conf/BootConf.cfg
@@ -0,0 +1,5 @@
+module /Acess/Modules/bochsvbe.kmd
+#module /Acess/Modules/ps2mouse
+#edimod /Acess/Modules/serial.edi
+#module /Acess/Modules/ne2000.akm
+spawn /Acess/SBin/init
diff --git a/Usermode/Filesystem/Makefile b/Usermode/Filesystem/Makefile
new file mode 100644
index 00000000..ef1f6b2b
--- /dev/null
+++ b/Usermode/Filesystem/Makefile
@@ -0,0 +1,25 @@
+# Acess 2
+# - Usermode Filesystem Structure Generator
+
+-include ../../Makefile.cfg
+
+DIRS  = Bin SBin Libs Modules Applications
+DIRS += Conf Conf/Auth
+FILES = Conf/BootConf.cfg Conf/Auth/Users Conf/Auth/Passwords Conf/Auth/Groups
+
+#DIRS  := $(addprefix $(DISTROOT)/,$(DIRS))
+#FILES := $(addprefix $(DISTROOT)/,$(FILES))
+
+.PHONY: all clean
+
+all:	$(DIRS) $(FILES)
+
+clean:
+	$(xRMDIR) $(DIRS)
+	$(xRM) $(FILES)
+
+$(DIRS):
+	$(xMKDIR) $(DISTROOT)/$@
+
+$(FILES):
+	$(xCP) $< $(DISTROOT)/$@
-- 
2.20.1