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

diff --git a/Makefile b/Makefile
index bb2a9307..4cae511b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,12 @@
 
 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
+
+USRAPPS := init login CLIShell cat ls mount
+USRAPPS += bomb pcidump
+USRAPPS += ifconfig ping irc
 
 ALL_DYNMODS = $(addprefix all-,$(DYNMODS))
 ALL_MODULES := $(addprefix all-,$(MODULES))
@@ -38,10 +42,13 @@ 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-%:
@@ -84,6 +91,8 @@ $(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-%: