X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile;h=f0f85df184649d09b3c1910aedb74049588cd0cc;hb=bf0187772ecfb475eedf5e0e9b8460b4f1a3f445;hp=54d0e167a76ed0cfdc290e68401ea89ed988673e;hpb=385aa5c4b5e509d298b3341dcd27ca26c3ce2358;p=tpg%2Facess2.git

diff --git a/Makefile b/Makefile
index 54d0e167..f0f85df1 100644
--- a/Makefile
+++ b/Makefile
@@ -10,14 +10,14 @@
 
 SUBMAKE = $(MAKE) --no-print-directory
 
-USRLIBS := crt0.o acess.ld ld-acess.so libgcc.so libc.so
-USRLIBS += libreadline.so libnet.so liburi.so
-USRLIBS += libimage_sif.so
+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 libunicode.so
 
 USRAPPS := init login CLIShell cat ls mount
-USRAPPS += bomb dhcpclient
-USRAPPS += ip ping telnet irc
-USRAPPS += axwin3
+USRAPPS += bomb lspci
+USRAPPS += ip dhcpclient ping telnet irc wget telnetd
+USRAPPS += axwin3 gui_ate gui_shell
 
 ALL_DYNMODS = $(addprefix all-,$(DYNMODS))
 ALL_MODULES := $(addprefix all-,$(MODULES))
@@ -37,6 +37,9 @@ AI_USRLIBS := $(addprefix allinstall-,$(USRLIBS))
 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) \
@@ -44,6 +47,7 @@ AI_USRAPPS := $(addprefix allinstall-,$(USRAPPS))
 
 kmode:	$(AI_MODULES) $(AI_DYNMODS) allinstall-Kernel
 all-kmode:	$(ALL_MODULES) $(ALL_DYNMODS) all-Kernel
+clean-kmode:	$(CLEAN_MODULES) $(CLEAN_DYNMODS) clean-Kernel
 
 all-user: $(ALL_USRLIBS) $(ALL_USRAPPS)
 clean-user: $(CLEAN_USRLIBS) $(CLEAN_USRAPPS)
@@ -53,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-%:
@@ -98,6 +112,10 @@ $(CLEAN_USRAPPS): clean-%:
 	+@$(SUBMAKE) clean -C Usermode/Applications/$*_src
 
 # Install
+ifeq ($(ARCH),host)
+install-%:
+	
+else
 $(INSTALL_DYNMODS): install-%:
 	@$(_build_dynmod)$* install
 $(INSTALL_MODULES): install-%:
@@ -110,3 +128,4 @@ $(INSTALL_USRLIBS): install-%:
 	@$(SUBMAKE) install -C Usermode/Libraries/$*_src
 $(INSTALL_USRAPPS): install-%:
 	@$(SUBMAKE) install -C Usermode/Applications/$*_src
+endif