Usermode/irc - Fix pointer mismatch printing new messages

[tpg/acess2.git] / Makefile

diff --git a/Makefile b/Makefile
index d3290df..c3c26c1 100644 (file)
--- 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))
@@ -64,15 +66,27 @@ all-install:        install-Filesystem SyscallList ai-user ai-kmode
 clean: clean-kmode clean-user
 install:       install-Filesystem SyscallList install-user install-kmode
 
-utest: $(USRLIBS:%=utest-%)
+utest-build: $(USRLIBS:%=utest-build-%)
+utest-run: $(USRLIBS:%=utest-run-%)
+utest: utest-build utest-run
 
-$(USRLIBS:%=utest-%): utest-%:
+utest-build-%:
        @CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src generate_exp
-       @CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src utest -k
+       @CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src utest-build
+utest-run-%:
+       @CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src utest-run -k
 
 # TODO: Module tests using DiskTool and NetTest
-mtest:
+mtest: mtest-build mtest-run
        @echo > /dev/null
+mtest-build:
+       # Network
+       @CC=$(NCC) $(SUBMAKE) -C Tools/nativelib
+       @CC=$(NCC) $(SUBMAKE) -C Tools/NetTest
+       @CC=$(NCC) $(SUBMAKE) -C Tools/NetTest_Runner
+mtest-run:
+       @echo "=== Network Module Test ==="
+       @cd Tools && ./nettest_runner
 
 SyscallList: include/syscalls.h
 include/syscalls.h: KernelLand/Kernel/Makefile KernelLand/Kernel/syscalls.lst