X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile;h=1aad518b00234d5f3d02ef8abeb98e0e4d020916;hb=287d527af97dc3346f50756910e67d63fa5507bd;hp=392ab5dec1b53000b31131b28fe868fc1a21df60;hpb=5fc81fa5e050f48374a6aff5636f3e60313dfc78;p=tpg%2Facess2.git

diff --git a/Makefile b/Makefile
index 392ab5de..1aad518b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,36 +4,39 @@
 
 .PHONY: all clean
 
+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
+
 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
-	@echo === ld-acess.so
-	@$(MAKE) all --no-print-directory -C Usermode/Libraries/ld-acess.so_src
-	@echo === libacess.so
-	@$(MAKE) all --no-print-directory -C Usermode/Libraries/libacess.so_src
-	@echo === libgcc.so
-	@$(MAKE) all --no-print-directory -C Usermode/Libraries/libgcc.so_src
-	@echo === libc.so
-	@$(MAKE) all --no-print-directory -C Usermode/Libraries/libc.so_src
-	@echo === init
-	@$(MAKE) all --no-print-directory -C Usermode/Applications/init_src
-	@echo === login
-	@$(MAKE) all --no-print-directory -C Usermode/Applications/login_src
-	@echo === CLIShell
-	@$(MAKE) all --no-print-directory -C Usermode/Applications/CLIShell_src
-	@echo === cat
-	@$(MAKE) all --no-print-directory -C Usermode/Applications/cat_src
-	@echo === ls
-	@$(MAKE) all --no-print-directory -C Usermode/Applications/ls_src
+	
+	@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 Kernel/
-	make clean --no-print-directory -C Usermode/Libraries/ld-acess.so_src
-	make clean --no-print-directory -C Usermode/Libraries/libacess.so_src
-	make clean --no-print-directory -C Usermode/Libraries/libc.so_src
-	make clean --no-print-directory -C Usermode/Libraries/libgcc.so_src
-	make clean --no-print-directory -C Usermode/Applications/init_src
-	make clean --no-print-directory -C Usermode/Applications/login_src
-	make clean --no-print-directory -C Usermode/Applications/CLIShell_src
-	make clean --no-print-directory -C Usermode/Applications/cat_src
-	make clean --no-print-directory -C Usermode/Applications/ls_src
+#	@$(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