NativeLib - Including kernelland locks

[tpg/acess2.git] / Makefile

diff --git a/Makefile b/Makefile
index 9821d16..c2ef59f 100644 (file)
--- 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 += libaxwin2.so 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
-USRAPPS += ifconfig ping telnet irc
-USRAPPS += axwin2 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,8 @@ AI_USRLIBS := $(addprefix allinstall-,$(USRLIBS))
 AI_USRAPPS := $(addprefix allinstall-,$(USRAPPS))
 
 .PHONY: all clean install \
+       kmode all-kmode clean-kmode \
+       all-user clean-user \
        $(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 +46,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)
@@ -54,16 +57,20 @@ clean:      $(CLEAN_DYNMODS) $(CLEAN_MODULES) clean-Kernel $(CLEAN_USRLIBS) $(CLEAN_U
 install:       install-Filesystem SyscallList $(INSTALL_USRLIBS) $(INSTALL_USRAPPS) $(INSTALL_DYNMODS) $(INSTALL_MODULES) install-Kernel
 
 SyscallList: include/syscalls.h
-include/syscalls.h: Kernel/Makefile Kernel/syscalls.lst
-       @make -C Kernel/ 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
 
 # Compile Only
 $(ALL_DYNMODS): all-%:
-       +@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all -C Modules/$*
+       +@echo === Dynamic Module: $* && $(_build_dynmod)$* all
 $(ALL_MODULES): all-%:
-       +@echo === Module: $* && BUILDTYPE=static $(SUBMAKE) all -C Modules/$*
+       +@echo === Module: $* && $(_build_stmod)$* all
 all-Kernel:
-       +@echo === Kernel && $(SUBMAKE) all -C Kernel
+       +@echo === Kernel && $(_build_kernel) all
 $(ALL_USRLIBS): all-%:
        +@echo === User Library: $* && $(SUBMAKE) all -C Usermode/Libraries/$*_src
 $(ALL_USRAPPS): all-%:
@@ -71,11 +78,11 @@ $(ALL_USRAPPS): all-%:
 
 # Compile & Install
 $(AI_DYNMODS): allinstall-%:
-       +@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all install -C Modules/$*
+       +@echo === Dynamic Module: $* && $(_build_dynmod)$* all install
 $(AI_MODULES): allinstall-%:
-       +@echo === Module: $* && BUILDTYPE=static $(SUBMAKE) all install -C Modules/$*
+       +@echo === Module: $* && $(_build_stmod)$* all install
 allinstall-Kernel:
-       +@echo === Kernel && $(SUBMAKE) all install -C Kernel
+       +@echo === Kernel && $(_build_kernel) all install
 $(AI_USRLIBS): allinstall-%:
        +@echo === User Library: $* && $(SUBMAKE) all install -C Usermode/Libraries/$*_src
 $(AI_USRAPPS): allinstall-%:
@@ -83,26 +90,31 @@ $(AI_USRAPPS): allinstall-%:
 
 # Clean up compilation
 $(CLEAN_DYNMODS): clean-%:
-       +@BUILDTYPE=dynamic $(SUBMAKE) clean -C Modules/$*
+       +@$(_build_dynmod)$* clean
 $(CLEAN_MODULES): clean-%:
-       +@BUILDTYPE=static $(SUBMAKE) clean -C Modules/$*
+       +@$(_build_stmod)$* clean
 clean-Kernel:
-       +@$(SUBMAKE) clean -C Kernel
+       +@$(_build_kernel) clean
 $(CLEAN_USRLIBS): clean-%:
        +@$(SUBMAKE) clean -C Usermode/Libraries/$*_src
 $(CLEAN_USRAPPS): clean-%:
        +@$(SUBMAKE) clean -C Usermode/Applications/$*_src
 
 # Install
+ifeq ($(ARCH),host)
+install-%:
+       
+else
 $(INSTALL_DYNMODS): install-%:
-       @BUILDTYPE=dynamic $(SUBMAKE) install -C Modules/$*
+       @$(_build_dynmod)$* install
 $(INSTALL_MODULES): install-%:
-       @BUILDTYPE=static $(SUBMAKE) install -C Modules/$*
+       @$(_build_stmod)$* install
 install-Filesystem:
        @$(SUBMAKE) install -C Usermode/Filesystem
 install-Kernel:
-       @$(SUBMAKE) install -C Kernel
+       @$(_build_kernel) install
 $(INSTALL_USRLIBS): install-%:
        @$(SUBMAKE) install -C Usermode/Libraries/$*_src
 $(INSTALL_USRAPPS): install-%:
        @$(SUBMAKE) install -C Usermode/Applications/$*_src
+endif