X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile;h=56878c1f73aff5dd5904721acb78aafbb4044aed;hb=76504d6eb355267746921fb49ebd191219f4cb84;hp=1aad518b00234d5f3d02ef8abeb98e0e4d020916;hpb=4c846dc6c5b4e8bc39f1ecc3370db690400b40e2;p=tpg%2Facess2.git

diff --git a/Makefile b/Makefile
index 1aad518b..56878c1f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,81 @@
 #
 # Acess2 Core Makefile
 #
+# (Oh man! This is hacky, but beautiful at the same time, much like the
+# rest of Acess)
+
+-include Makefile.cfg
 
 .PHONY: all clean
 
-MODULES = FS_Ext2 FDD BochsGA IPStack NE2000 USB
+SUBMAKE = $(MAKE) --no-print-directory
+
+MODULES += $(DYNMODS)
 USRLIBS = ld-acess.so libacess.so libgcc.so libc.so
 USRAPPS = init login CLIShell cat ls mount ifconfig
 
-all:
-	@echo === Filesystem && $(MAKE) all --no-print-directory -C Usermode/Filesystem
-	@for mod in $(MODULES); do \
-	(echo === Module: $$mod && $(MAKE) all --no-print-directory -C Modules/$$mod) \
-	done
-	
-	@echo === Kernel
-	@$(MAKE) all --no-print-directory -C Kernel
-	
-	@for lib in $(USRLIBS); do \
-	(echo === User Library: $$lib && $(MAKE) all --no-print-directory -C Usermode/Libraries/`echo $$lib`_src) \
-	done
-	
-	@for app in $(USRAPPS); do \
-	(echo === User Application: $$app && $(MAKE) all --no-print-directory -C Usermode/Applications/`echo $$app`_src) \
-	done
-
-clean:
-#	@$(MAKE) clean --no-print-directory -C Usermode/Filesystem
-	@for mod in $(MODULES); do \
-	($(MAKE) clean --no-print-directory -C Modules/$$mod) \
-	done
-	
-	@make clean --no-print-directory -C Kernel/
-	
-	@for lib in $(USRLIBS); do \
-	($(MAKE) clean --no-print-directory -C Usermode/Libraries/`echo $$lib`_src) \
-	done
-	
-	@for app in $(USRAPPS); do \
-	($(MAKE) clean --no-print-directory -C Usermode/Applications/`echo $$app`_src) \
-	done
+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))
+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:
+	@echo === Kernel && $(SUBMAKE) all -C Kernel
+$(ALL_USRLIBS): all-%:
+	@echo === User Library: $* && $(SUBMAKE) all -C Usermode/Libraries/$*_src
+$(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:
+	@$(SUBMAKE) clean -C Kernel
+$(CLEAN_USRLIBS): clean-%:
+	@$(SUBMAKE) clean -C Usermode/Libraries/$*_src
+$(CLEAN_USRAPPS): clean-%:
+	@$(SUBMAKE) clean -C Usermode/Applications/$*_src
+
+# Install
+$(INSTALL_MODULES): install-%:
+	@$(SUBMAKE) install -C Modules/$*
+install-Kernel:
+	@$(SUBMAKE) install -C Kernel
+$(INSTALL_USRLIBS): install-%:
+	@$(SUBMAKE) install -C Usermode/Libraries/$*_src
+$(INSTALL_USRAPPS): install-%:
+	@$(SUBMAKE) install -C Usermode/Applications/$*_src