X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile;h=d9339514d5f758b3112cf14a39367125929b1a42;hb=7d76ac580a19c897ea849d4bc684068ab1fdc6f3;hp=ba53f122b121bd1146c307fdd31c1e5523601124;hpb=775bf8013abe9fe4ef3d4883ea2e43bba2a84da1;p=tpg%2Facess2.git

diff --git a/Makefile b/Makefile
index ba53f122..d9339514 100644
--- a/Makefile
+++ b/Makefile
@@ -6,21 +6,29 @@
 
 -include Makefile.cfg
 
-.PHONY: all clean
+.PHONY: all clean SyscallList all-user
 
 SUBMAKE = $(MAKE) --no-print-directory
 
-MODULES += $(DYNMODS)
-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
 
-#ALL_DYNMODS = $(addprefix all-,$(DYNMODS))
+USRAPPS := init login CLIShell cat ls mount
+USRAPPS += bomb
+#USRAPPS += pcidump
+USRAPPS += ifconfig ping telnet irc
+USRAPPS += axwin2
+
+ALL_DYNMODS = $(addprefix all-,$(DYNMODS))
 ALL_MODULES := $(addprefix all-,$(MODULES))
 ALL_USRLIBS := $(addprefix all-,$(USRLIBS))
 ALL_USRAPPS := $(addprefix all-,$(USRAPPS))
+CLEAN_DYNMODS := $(addprefix clean-,$(DYNMODS))
 CLEAN_MODULES := $(addprefix clean-,$(MODULES))
 CLEAN_USRLIBS := $(addprefix clean-,$(USRLIBS))
 CLEAN_USRAPPS := $(addprefix clean-,$(USRAPPS))
+INSTALL_DYNMODS := $(addprefix install-,$(DYNMODS))
 INSTALL_MODULES := $(addprefix install-,$(MODULES))
 INSTALL_USRLIBS := $(addprefix install-,$(USRLIBS))
 INSTALL_USRAPPS := $(addprefix install-,$(USRAPPS))
@@ -36,47 +44,63 @@ 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_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-%:
+	+@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all -C Modules/$*
 $(ALL_MODULES): all-%:
-	@echo === Module: $* && $(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: $* && STATIC_MODULE=yes $(SUBMAKE) all install -C Modules/$*
+$(AI_DYNMODS): allinstall-%:
+	+@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all install -C Modules/$*
 $(AI_MODULES): allinstall-%:
-	@echo === Module: $* && $(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/$*
 $(CLEAN_MODULES): clean-%:
-	@$(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-%:
-	@$(SUBMAKE) install -C Modules/$*
+	@BUILDTYPE=static $(SUBMAKE) install -C Modules/$*
+install-Filesystem:
+	@$(SUBMAKE) install -C Usermode/Filesystem
 install-Kernel:
 	@$(SUBMAKE) install -C Kernel
 $(INSTALL_USRLIBS): install-%: