X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile;h=56878c1f73aff5dd5904721acb78aafbb4044aed;hb=b289025913a0e4573181155aeeaab37ed92cf525;hp=9a861fdea39bb1bd775ae11c2d6967cb92c0dee3;hpb=c7c5c4dbeb7b298675856eebb36084c92e989d98;p=tpg%2Facess2.git

diff --git a/Makefile b/Makefile
index 9a861fde..56878c1f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,13 @@
 # (Oh man! This is hacky, but beautiful at the same time, much like the
 # rest of Acess)
 
+-include Makefile.cfg
+
 .PHONY: all clean
 
 SUBMAKE = $(MAKE) --no-print-directory
 
-MODULES = FS_Ext2 FDD BochsGA IPStack NE2000 USB
+MODULES += $(DYNMODS)
 USRLIBS = ld-acess.so libacess.so libgcc.so libc.so
 USRAPPS = init login CLIShell cat ls mount ifconfig
 
@@ -21,17 +23,24 @@ CLEAN_USRAPPS = $(addprefix clean-,$(USRAPPS))
 INSTALL_MODULES = $(addprefix install-,$(MODULES))
 INSTALL_USRLIBS = $(addprefix install-,$(USRLIBS))
 INSTALL_USRAPPS = $(addprefix install-,$(USRAPPS))
+ALLINSTALL_MODULES = $(addprefix allinstall-,$(MODULES))
+ALLINSTALL_USRLIBS = $(addprefix allinstall-,$(USRLIBS))
+ALLINSTALL_USRAPPS = $(addprefix allinstall-,$(USRAPPS))
 
 .PHONY: all clean install \
 	$(ALL_MODULES) all-Kernel $(ALL_USRLIBS) $(ALL_USRAPPS) \
+	$(ALLINSTALL_MODULES) allinstall-Kernel $(ALLINSTALL_USRLIBS) $(ALLINSTALL_USRAPPS) \
 	$(CLEAN_MODULES) clean-Kernel $(CLEAN_USRLIBS) $(CLEAN_USRAPPS) \
 	$(INSTALL_MODULES) install-Kernel $(INSTALL_USRLIBS) $(INSTALL_USRAPPS)
 
+kmode:	$(ALLINSTALL_MODULES) allinstall-Kernel
+
 all:	$(ALL_MODULES) all-Kernel $(ALL_USRLIBS) $(ALL_USRAPPS)
+all-install:	$(ALLINSTALL_MODULES) allinstall-Kernel $(ALLINSTALL_USRLIBS) $(ALLINSTALL_USRAPPS)
 clean:	$(CLEAN_MODULES) clean-Kernel $(CLEAN_USRLIBS) $(CLEAN_USRAPPS)
 install:	$(INSTALL_MODULES) install-Kernel $(INSTALL_USRLIBS) $(INSTALL_USRAPPS)
 
-
+# Compile Only
 $(ALL_MODULES): all-%:
 	@echo === Module: $* && $(SUBMAKE) all -C Modules/$*
 all-Kernel:
@@ -41,6 +50,17 @@ $(ALL_USRLIBS): all-%:
 $(ALL_USRAPPS): all-%:
 	@echo === User Application: $* && $(SUBMAKE) all -C Usermode/Applications/$*_src
 
+# Compile & Install
+$(ALLINSTALL_MODULES): allinstall-%:
+	@echo === Module: $* && $(SUBMAKE) all install -C Modules/$*
+allinstall-Kernel:
+	@echo === Kernel && $(SUBMAKE) all install -C Kernel
+$(ALLINSTALL_USRLIBS): allinstall-%:
+	@echo === User Library: $* && $(SUBMAKE) all install -C Usermode/Libraries/$*_src
+$(ALLINSTALL_USRAPPS): allinstall-%:
+	@echo === User Application: $* && $(SUBMAKE) all install -C Usermode/Applications/$*_src
+
+# Clean up compilation
 $(CLEAN_MODULES): clean-%:
 	@$(SUBMAKE) clean -C Modules/$*
 clean-Kernel:
@@ -50,6 +70,7 @@ $(CLEAN_USRLIBS): clean-%:
 $(CLEAN_USRAPPS): clean-%:
 	@$(SUBMAKE) clean -C Usermode/Applications/$*_src
 
+# Install
 $(INSTALL_MODULES): install-%:
 	@$(SUBMAKE) install -C Modules/$*
 install-Kernel: