X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile;h=f0f85df184649d09b3c1910aedb74049588cd0cc;hb=141a83624849c3db62522275c35c385430dfc484;hp=32f1ffb4412952ec22b46b6afa8e5fd961d9c5f5;hpb=04a050f42807686dc119838c82372409246d55bb;p=tpg%2Facess2.git

diff --git a/Makefile b/Makefile
index 32f1ffb4..f0f85df1 100644
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,12 @@ SUBMAKE = $(MAKE) --no-print-directory
 
 USRLIBS := crt0.o acess.ld ld-acess.so libc.so libposix.so
 USRLIBS += libreadline.so libnet.so liburi.so libpsocket.so
-USRLIBS += libimage_sif.so
+USRLIBS += libimage_sif.so libunicode.so
 
 USRAPPS := init login CLIShell cat ls mount
 USRAPPS += bomb lspci
 USRAPPS += ip dhcpclient ping telnet irc wget telnetd
-USRAPPS += axwin3 gui_ate
+USRAPPS += axwin3 gui_ate gui_shell
 
 ALL_DYNMODS = $(addprefix all-,$(DYNMODS))
 ALL_MODULES := $(addprefix all-,$(MODULES))
@@ -39,6 +39,7 @@ AI_USRAPPS := $(addprefix allinstall-,$(USRAPPS))
 .PHONY: all clean install \
 	kmode all-kmode clean-kmode \
 	all-user clean-user \
+	utest mtest \
 	$(ALL_MODULES) all-Kernel $(ALL_USRLIBS) $(ALL_USRAPPS) \
 	$(AI_MODULES) allinstall-Kernel $(AI_USRLIBS) $(AI_USRAPPS) \
 	$(CLEAN_MODULES) clean-Kernel $(CLEAN_USRLIBS) $(CLEAN_USRAPPS) \
@@ -56,13 +57,23 @@ all-install:	install-Filesystem SyscallList $(AI_USRLIBS) $(AI_USRAPPS) $(AI_MOD
 clean:	$(CLEAN_DYNMODS) $(CLEAN_MODULES) clean-Kernel $(CLEAN_USRLIBS) $(CLEAN_USRAPPS)
 install:	install-Filesystem SyscallList $(INSTALL_USRLIBS) $(INSTALL_USRAPPS) $(INSTALL_DYNMODS) $(INSTALL_MODULES) install-Kernel
 
+utest: $(USRLIBS:%=utest-%)
+
+$(USRLIBS:%=utest-%): utest-%:
+	@CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src generate_exp
+	@CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src utest -k
+
+# TODO: Module tests using DiskTool and NetTest
+mtest:
+	@echo > /dev/null
+
 SyscallList: include/syscalls.h
 include/syscalls.h: KernelLand/Kernel/Makefile KernelLand/Kernel/syscalls.lst
 	@make -C KernelLand/Kernel/ include/syscalls.h
 
 _build_dynmod := BUILDTYPE=dynamic $(SUBMAKE) -C KernelLand/Modules/
 _build_stmod  := BUILDTYPE=static $(SUBMAKE) -C KernelLand/Modules/
-_build_kernel := $(SUBMAKE) $1 -C KernelLand/Kernel
+_build_kernel := $(SUBMAKE) -C KernelLand/Kernel
 
 # Compile Only
 $(ALL_DYNMODS): all-%: