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

diff --git a/Makefile b/Makefile
index 9a861fde..ba53f122 100644
--- a/Makefile
+++ b/Makefile
@@ -4,34 +4,45 @@
 # (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
-USRLIBS = ld-acess.so libacess.so libgcc.so libc.so
-USRAPPS = init login CLIShell cat ls mount ifconfig
+MODULES += $(DYNMODS)
+USRLIBS := crt0.o acess.ld ld-acess.so libacess.so libgcc.so libc.so
+USRAPPS := init login CLIShell cat ls mount ifconfig
 
-ALL_MODULES = $(addprefix all-,$(MODULES))
-ALL_USRLIBS = $(addprefix all-,$(USRLIBS))
-ALL_USRAPPS = $(addprefix all-,$(USRAPPS))
-CLEAN_MODULES = $(addprefix clean-,$(MODULES))
-CLEAN_USRLIBS = $(addprefix clean-,$(USRLIBS))
-CLEAN_USRAPPS = $(addprefix clean-,$(USRAPPS))
-INSTALL_MODULES = $(addprefix install-,$(MODULES))
-INSTALL_USRLIBS = $(addprefix install-,$(USRLIBS))
-INSTALL_USRAPPS = $(addprefix install-,$(USRAPPS))
+#ALL_DYNMODS = $(addprefix all-,$(DYNMODS))
+ALL_MODULES := $(addprefix all-,$(MODULES))
+ALL_USRLIBS := $(addprefix all-,$(USRLIBS))
+ALL_USRAPPS := $(addprefix all-,$(USRAPPS))
+CLEAN_MODULES := $(addprefix clean-,$(MODULES))
+CLEAN_USRLIBS := $(addprefix clean-,$(USRLIBS))
+CLEAN_USRAPPS := $(addprefix clean-,$(USRAPPS))
+INSTALL_MODULES := $(addprefix install-,$(MODULES))
+INSTALL_USRLIBS := $(addprefix install-,$(USRLIBS))
+INSTALL_USRAPPS := $(addprefix install-,$(USRAPPS))
+AI_DYNMODS := $(addprefix allinstall-,$(DYNMODS))
+AI_MODULES := $(addprefix allinstall-,$(MODULES))
+AI_USRLIBS := $(addprefix allinstall-,$(USRLIBS))
+AI_USRAPPS := $(addprefix allinstall-,$(USRAPPS))
 
 .PHONY: all clean install \
 	$(ALL_MODULES) all-Kernel $(ALL_USRLIBS) $(ALL_USRAPPS) \
+	$(AI_MODULES) allinstall-Kernel $(AI_USRLIBS) $(AI_USRAPPS) \
 	$(CLEAN_MODULES) clean-Kernel $(CLEAN_USRLIBS) $(CLEAN_USRAPPS) \
 	$(INSTALL_MODULES) install-Kernel $(INSTALL_USRLIBS) $(INSTALL_USRAPPS)
 
-all:	$(ALL_MODULES) all-Kernel $(ALL_USRLIBS) $(ALL_USRAPPS)
-clean:	$(CLEAN_MODULES) clean-Kernel $(CLEAN_USRLIBS) $(CLEAN_USRAPPS)
-install:	$(INSTALL_MODULES) install-Kernel $(INSTALL_USRLIBS) $(INSTALL_USRAPPS)
+kmode:	$(AI_MODULES) $(AI_DYNMODS) allinstall-Kernel
 
+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_MODULES): all-%:
 	@echo === Module: $* && $(SUBMAKE) all -C Modules/$*
 all-Kernel:
@@ -41,6 +52,19 @@ $(ALL_USRLIBS): all-%:
 $(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_MODULES): allinstall-%:
+	@echo === Module: $* && $(SUBMAKE) all install -C Modules/$*
+allinstall-Kernel:
+	@echo === Kernel && $(SUBMAKE) all install -C Kernel
+$(AI_USRLIBS): allinstall-%:
+	@echo === User Library: $* && $(SUBMAKE) all install -C Usermode/Libraries/$*_src
+$(AI_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 +74,7 @@ $(CLEAN_USRLIBS): clean-%:
 $(CLEAN_USRAPPS): clean-%:
 	@$(SUBMAKE) clean -C Usermode/Applications/$*_src
 
+# Install
 $(INSTALL_MODULES): install-%:
 	@$(SUBMAKE) install -C Modules/$*
 install-Kernel: