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

diff --git a/Makefile b/Makefile
index ba53f122..2a7f1a95 100644
--- a/Makefile
+++ b/Makefile
@@ -10,17 +10,22 @@
 
 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
 
-#ALL_DYNMODS = $(addprefix all-,$(DYNMODS))
+USRAPPS := init login CLIShell cat ls mount
+USRAPPS += bomb pcidump
+USRAPPS += ifconfig ping irc
+
+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))
@@ -37,14 +42,19 @@ 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)
 
 # 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
 $(ALL_USRLIBS): all-%:
@@ -53,10 +63,10 @@ $(ALL_USRAPPS): all-%:
 	@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
 $(AI_USRLIBS): allinstall-%:
@@ -65,8 +75,10 @@ $(AI_USRAPPS): allinstall-%:
 	@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
 $(CLEAN_USRLIBS): clean-%:
@@ -75,8 +87,10 @@ $(CLEAN_USRAPPS): clean-%:
 	@$(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-Kernel:
 	@$(SUBMAKE) install -C Kernel
 $(INSTALL_USRLIBS): install-%: