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 := init login CLIShell cat ls mount automounter
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))
.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) \
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-%: