Cleaning up for release

[tpg/acess2.git] / Makefile

diff --git a/Makefile b/Makefile
index 4fca6d5..d343708 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,19 +6,18 @@
 
 -include Makefile.cfg
 
-.PHONY: all clean
+.PHONY: all clean SyscallList all-user
 
 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 += libimage_sif.so
 
 USRAPPS := init login CLIShell cat ls mount
 USRAPPS += bomb
-#USRAPPS += pcidump
 USRAPPS += ifconfig ping telnet irc
-USRAPPS += axwin2
+USRAPPS += axwin3
 
 ALL_DYNMODS = $(addprefix all-,$(DYNMODS))
 ALL_MODULES := $(addprefix all-,$(MODULES))
@@ -44,14 +43,19 @@ AI_USRAPPS := $(addprefix allinstall-,$(USRAPPS))
        $(INSTALL_MODULES) install-Kernel $(INSTALL_USRLIBS) $(INSTALL_USRAPPS)
 
 kmode: $(AI_MODULES) $(AI_DYNMODS) allinstall-Kernel
+all-kmode:     $(ALL_MODULES) $(ALL_DYNMODS) all-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)
+all:   SyscallList $(ALL_USRLIBS) $(ALL_USRAPPS) $(ALL_MODULES) all-Kernel $(ALL_DYNMODS)
+all-install:   install-Filesystem SyscallList $(AI_USRLIBS) $(AI_USRAPPS) $(AI_MODULES) allinstall-Kernel $(AI_DYNMODS)
 clean: $(CLEAN_DYNMODS) $(CLEAN_MODULES) clean-Kernel $(CLEAN_USRLIBS) $(CLEAN_USRAPPS)
-install:       install-Filesystem $(INSTALL_DYNMODS) $(INSTALL_MODULES) install-Kernel $(INSTALL_USRLIBS) $(INSTALL_USRAPPS)
+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
 
 # Compile Only
 $(ALL_DYNMODS): all-%: