X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile;h=f7f5928ad3ae4aedc41d49257508606c2aef5dea;hb=930fe819133ddb444bc6c22df09baf788183f6ad;hp=bb2a93070773634b1508f9cfdc53758e79856996;hpb=c61713a1b9b042796794b8046d8b62e95a7e1264;p=tpg%2Facess2.git

diff --git a/Makefile b/Makefile
index bb2a9307..f7f5928a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,14 @@
 
 SUBMAKE = $(MAKE) --no-print-directory
 
-USRLIBS := crt0.o acess.ld ld-acess.so libacess.so libgcc.so libc.so
-USRAPPS := init login CLIShell cat ls mount ifconfig
+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
+
+USRAPPS := init login CLIShell cat ls mount
+USRAPPS += bomb pcidump
+USRAPPS += ifconfig ping telnet irc
+USRAPPS += axwin2
 
 ALL_DYNMODS = $(addprefix all-,$(DYNMODS))
 ALL_MODULES := $(addprefix all-,$(MODULES))
@@ -38,52 +44,57 @@ AI_USRAPPS := $(addprefix allinstall-,$(USRAPPS))
 
 kmode:	$(AI_MODULES) $(AI_DYNMODS) allinstall-Kernel
 
+all-user: $(ALL_USRLIBS) $(ALL_USRAPPS)
+clean-user: $(CLEAN_USRLIBS) $(CLEAN_USRAPPS)
+
 all:	$(ALL_DYNMODS) $(ALL_MODULES) all-Kernel $(ALL_USRLIBS) $(ALL_USRAPPS)
 all-install:	$(AI_DYNMODS) $(AI_MODULES) allinstall-Kernel $(AI_USRLIBS) $(AI_USRAPPS)
 clean:	$(CLEAN_DYNMODS) $(CLEAN_MODULES) clean-Kernel $(CLEAN_USRLIBS) $(CLEAN_USRAPPS)
-install:	$(INSTALL_DYNMODS) $(INSTALL_MODULES) install-Kernel $(INSTALL_USRLIBS) $(INSTALL_USRAPPS)
+install:	install-Filesystem $(INSTALL_DYNMODS) $(INSTALL_MODULES) install-Kernel $(INSTALL_USRLIBS) $(INSTALL_USRAPPS)
 
 # Compile Only
 $(ALL_DYNMODS): all-%:
-	@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all -C Modules/$*
+	+@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all -C Modules/$*
 $(ALL_MODULES): all-%:
-	@echo === Module: $* && BUILDTYPE=static $(SUBMAKE) all -C Modules/$*
+	+@echo === Module: $* && BUILDTYPE=static $(SUBMAKE) all -C Modules/$*
 all-Kernel:
-	@echo === Kernel && $(SUBMAKE) all -C Kernel
+	+@echo === Kernel && $(SUBMAKE) all -C Kernel
 $(ALL_USRLIBS): all-%:
-	@echo === User Library: $* && $(SUBMAKE) all -C Usermode/Libraries/$*_src
+	+@echo === User Library: $* && $(SUBMAKE) all -C Usermode/Libraries/$*_src
 $(ALL_USRAPPS): all-%:
-	@echo === User Application: $* && $(SUBMAKE) all -C Usermode/Applications/$*_src
+	+@echo === User Application: $* && $(SUBMAKE) all -C Usermode/Applications/$*_src
 
 # Compile & Install
 $(AI_DYNMODS): allinstall-%:
-	@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all install -C Modules/$*
+	+@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all install -C Modules/$*
 $(AI_MODULES): allinstall-%:
-	@echo === Module: $* && BUILDTYPE=static $(SUBMAKE) all install -C Modules/$*
+	+@echo === Module: $* && BUILDTYPE=static $(SUBMAKE) all install -C Modules/$*
 allinstall-Kernel:
-	@echo === Kernel && $(SUBMAKE) all install -C Kernel
+	+@echo === Kernel && $(SUBMAKE) all install -C Kernel
 $(AI_USRLIBS): allinstall-%:
-	@echo === User Library: $* && $(SUBMAKE) all install -C Usermode/Libraries/$*_src
+	+@echo === User Library: $* && $(SUBMAKE) all install -C Usermode/Libraries/$*_src
 $(AI_USRAPPS): allinstall-%:
-	@echo === User Application: $* && $(SUBMAKE) all install -C Usermode/Applications/$*_src
+	+@echo === User Application: $* && $(SUBMAKE) all install -C Usermode/Applications/$*_src
 
 # Clean up compilation
 $(CLEAN_DYNMODS): clean-%:
-	@BUILDTYPE=dynamic $(SUBMAKE) clean -C Modules/$*
+	+@BUILDTYPE=dynamic $(SUBMAKE) clean -C Modules/$*
 $(CLEAN_MODULES): clean-%:
-	@BUILDTYPE=static $(SUBMAKE) clean -C Modules/$*
+	+@BUILDTYPE=static $(SUBMAKE) clean -C Modules/$*
 clean-Kernel:
-	@$(SUBMAKE) clean -C Kernel
+	+@$(SUBMAKE) clean -C Kernel
 $(CLEAN_USRLIBS): clean-%:
-	@$(SUBMAKE) clean -C Usermode/Libraries/$*_src
+	+@$(SUBMAKE) clean -C Usermode/Libraries/$*_src
 $(CLEAN_USRAPPS): clean-%:
-	@$(SUBMAKE) clean -C Usermode/Applications/$*_src
+	+@$(SUBMAKE) clean -C Usermode/Applications/$*_src
 
 # Install
 $(INSTALL_DYNMODS): install-%:
 	@BUILDTYPE=dynamic $(SUBMAKE) install -C Modules/$*
 $(INSTALL_MODULES): install-%:
 	@BUILDTYPE=static $(SUBMAKE) install -C Modules/$*
+install-Filesystem:
+	@$(SUBMAKE) install -C Usermode/Filesystem
 install-Kernel:
 	@$(SUBMAKE) install -C Kernel
 $(INSTALL_USRLIBS): install-%: