revamp build system; move include to usr in root

19 files changed, 10 insertions, 10 deletions

diff --git a/.gitignore b/.gitignore
index 975d14d..2b21c41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,4 @@ bochsout.txt
 *.a
 *.o
 initrd
-root/include/modit
+root/usr/include/modit
diff --git a/Makefile b/Makefile
index 17fab29..fbfa6a9 100644
--- a/Makefile
+++ b/Makefile
@@ -25,19 +25,19 @@ build: $(DISK1) iso
 
 .PHONY: clean
 clean:
-	$(MAKE) -C kernel clean
+	$(MAKE) -C kernel clean ARCH=$(ARCH) BITS=$(BITS) MODORDER="$(shell cat $(PWD)/modorder)"
 	rm app/*/*.o
 	rm lib/*/*/*.o
 
 .PHONY: kernel
 kernel: tools/$(ARCH)_$(BITS) Makefile
-	$(MAKE) -C kernel ARCH=$(ARCH) BITS=$(BITS) CC=$(CC) LD=$(LD) AS=$(AS) AR=$(AR) MODORDER=$(PWD)/modorder LOGLEVEL=$(LOGLEVEL)
+	$(MAKE) -C kernel ARCH=$(ARCH) BITS=$(BITS) CC=$(CC) LD=$(LD) AS=$(AS) AR=$(AR) MODORDER="$(shell cat $(PWD)/modorder)" LOGLEVEL=$(LOGLEVEL)
 	mv kernel/kernel.elf root/boot/
-	mkdir -p $(PWD)/root/include/modit
-	mkdir -p $(PWD)/initrd
-	cp kernel/include/arch_$(ARCH)/$(BITS)/* root/include/modit/
-	cp kernel/include/arch_$(ARCH)/common/* root/include/modit/
-	cp kernel/include/arch_common/* root/include/modit/
+	mkdir -p $(PWD)/root/usr/include/modit
+	mkdir -p $(PWD)/initrd/boot
+	cp kernel/include/arch_$(ARCH)/$(BITS)/* root/usr/include/modit/
+	cp kernel/include/arch_$(ARCH)/common/* root/usr/include/modit/
+	cp kernel/include/arch_common/* root/usr/include/modit/
 
 .PHONY: initrd
 initrd: tools/$(ARCH)_$(BITS) apps Makefile
diff --git a/kernel b/kernel
-Subproject c4f27dbf1d2a257e08087e9a1ce932579f9dc72
+Subproject 63a5f312b06143951a49faad190d1ab2fd37fcc
diff --git a/lib/modit/mem/alloc.c b/lib/modit/mem/alloc.c
index 4212026..ff4f070 100644
--- a/lib/modit/mem/alloc.c
+++ b/lib/modit/mem/alloc.c
@@ -1,4 +1,4 @@
-#include "sys/alloc.h"
+#include "sys/mem.h"
 #include "modit/syscall.h"
 
 DEFN_SYSCALL(alloc, SYSCALL_ALLOC)
diff --git a/modorder b/modorder
index 1caf333..8c98ea3 100644
--- a/modorder
+++ b/modorder
@@ -1,7 +1,7 @@
 gdt
-klibc
 stivale2
 
+klibc
 vgatxt
 serialtxt
 
diff --git a/root/include/ctype.h b/root/usr/include/ctype.h
index b7ca0a3..b7ca0a3 100644
--- a/root/include/ctype.h
+++ b/root/usr/include/ctype.h
diff --git a/root/include/elf/elf.h b/root/usr/include/elf/elf.h
index f7967ea..f7967ea 100644
--- a/root/include/elf/elf.h
+++ b/root/usr/include/elf/elf.h
diff --git a/root/include/moditstd.h b/root/usr/include/moditstd.h
index 68d5ddb..68d5ddb 100644
--- a/root/include/moditstd.h
+++ b/root/usr/include/moditstd.h
diff --git a/root/include/rpc/api.h b/root/usr/include/rpc/api.h
index 783d23b..783d23b 100644
--- a/root/include/rpc/api.h
+++ b/root/usr/include/rpc/api.h
diff --git a/root/include/rpc/rpc.h b/root/usr/include/rpc/rpc.h
index 5b2489e..5b2489e 100644
--- a/root/include/rpc/rpc.h
+++ b/root/usr/include/rpc/rpc.h
diff --git a/root/include/stdio.h b/root/usr/include/stdio.h
index 4cd9d6f..4cd9d6f 100644
--- a/root/include/stdio.h
+++ b/root/usr/include/stdio.h
diff --git a/root/include/stdlib.h b/root/usr/include/stdlib.h
index f333ac9..f333ac9 100644
--- a/root/include/stdlib.h
+++ b/root/usr/include/stdlib.h
diff --git a/root/include/string.h b/root/usr/include/string.h
index 5d00c21..5d00c21 100644
--- a/root/include/string.h
+++ b/root/usr/include/string.h
diff --git a/root/include/sys/cid.h b/root/usr/include/sys/cid.h
index 36b61fc..36b61fc 100644
--- a/root/include/sys/cid.h
+++ b/root/usr/include/sys/cid.h
diff --git a/root/include/sys/ipc.h b/root/usr/include/sys/ipc.h
index 981b83e..981b83e 100644
--- a/root/include/sys/ipc.h
+++ b/root/usr/include/sys/ipc.h
diff --git a/root/include/sys/lock.h b/root/usr/include/sys/lock.h
index a444049..a444049 100644
--- a/root/include/sys/lock.h
+++ b/root/usr/include/sys/lock.h
diff --git a/root/include/sys/mem.h b/root/usr/include/sys/mem.h
index f4b2953..f4b2953 100644
--- a/root/include/sys/mem.h
+++ b/root/usr/include/sys/mem.h
diff --git a/root/include/sys/pid.h b/root/usr/include/sys/pid.h
index debe4f9..debe4f9 100644
--- a/root/include/sys/pid.h
+++ b/root/usr/include/sys/pid.h
diff --git a/root/include/vfs/vfs.h b/root/usr/include/vfs/vfs.h
index a21562b..a21562b 100644
--- a/root/include/vfs/vfs.h
+++ b/root/usr/include/vfs/vfs.h