Fixing makefiles

[tpg/acess2.git] / Makefile

diff --git a/Makefile b/Makefile
index bb2a930..12c0264 100644 (file)
--- 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 irc
+USRAPPS += axwin2
 
 ALL_DYNMODS = $(addprefix all-,$(DYNMODS))
 ALL_MODULES := $(addprefix all-,$(MODULES))
@@ -38,10 +44,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 +93,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-%: