X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile;h=c283ec62ff5d6796d577b2562815061658c59814;hb=b5ef69daf12844e475918acf7e6a7fbe2ccb30b2;hp=d3290dff183fdbf9136b6e420038154710535d99;hpb=45ff232a1db704623e0c4baed011d12cbd44b06e;p=tpg%2Facess2.git

diff --git a/Makefile b/Makefile
index d3290dff..c283ec62 100644
--- a/Makefile
+++ b/Makefile
@@ -10,17 +10,19 @@
 
 SUBMAKE = $(MAKE) --no-print-directory
 
-USRLIBS := crt0.o acess.ld ld-acess.so libc.so libposix.so
+USRLIBS := crt0.o acess.ld ld-acess.so libc.so libc++.so libposix.so
 USRLIBS += libreadline.so libnet.so liburi.so libpsocket.so
-USRLIBS += libimage_sif.so libunicode.so
+USRLIBS += libimage_sif.so libunicode.so libm.so
 
-EXTLIBS := libspiderscript
+EXTLIBS := 
+#libspiderscript
 # zlib libpng
 
 USRAPPS := init login CLIShell cat ls mount automounter
+USRAPPS += insmod
 USRAPPS += bomb lspci
 USRAPPS += ip dhcpclient ping telnet irc wget telnetd
-USRAPPS += axwin3 gui_ate gui_shell
+USRAPPS += axwin3 gui_ate gui_terminal
 
 define targetclasses
  AI_$1      := $$(addprefix allinstall-,$$($1))
@@ -71,9 +73,15 @@ $(USRLIBS:%=utest-%): utest-%:
 	@CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src utest -k
 
 # TODO: Module tests using DiskTool and NetTest
-mtest:
+mtest: mtest-Network
 	@echo > /dev/null
 
+mtest-Network:
+	@$(SUBMAKE) -C Tools/nativelib
+	@$(SUBMAKE) -C Tools/NetTest
+	@$(SUBMAKE) -C Tools/NetTest_Runner
+	@cd Tools && ./nettest_runner
+
 SyscallList: include/syscalls.h
 include/syscalls.h: KernelLand/Kernel/Makefile KernelLand/Kernel/syscalls.lst
 	@make -C KernelLand/Kernel/ include/syscalls.h