X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Facess2.git;a=blobdiff_plain;f=Makefile;h=cb21b454e13485ad20d4fe11664954b3c5dbf4ad;hp=88b8377d7358c6da5d3cbbbd7010848af3c0327c;hb=5b99c972f3994cd19a04ac57caaf20da96a6aa14;hpb=47e9dfd89189fc6b150bd6b20229cb047c7e0858

diff --git a/Makefile b/Makefile
index 88b8377d..cb21b454 100644
--- a/Makefile
+++ b/Makefile
@@ -1,68 +1,141 @@
 #
 # Acess2 Core Makefile
 #
+# (Oh man! This is hacky, but beautiful at the same time, much like the
+# rest of Acess)
 
-.PHONY: all clean
-
-MODULES = IPStack
-USRLIBS = ld-acess.so libacess.so libgcc.so libc.so
-USRAPPS = init login CLIShell cat ls mount
-
-all:
-	@for mod in $(MODULES); do \
-	(echo === $$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 === $$lib && $(MAKE) all --no-print-directory -C Usermode/Libraries/`echo $$lib`_src) \
-	done
-	
-	@for app in $(USRAPPS); do \
-	(echo === $$app && $(MAKE) all --no-print-directory -C Usermode/Applications/`echo $$app`_src) \
-	done
-
-#	@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
-#	@echo === mount
-#	@$(MAKE) all --no-print-directory -C Usermode/Applications/mount_src
-
-clean:
-	@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
-
-#	@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/Applications/mount_src
+-include Makefile.cfg
+
+.PHONY: all clean SyscallList all-user
+
+SUBMAKE = $(MAKE) --no-print-directory
+
+USRLIBS := crt0.o ld-acess.so libc.so libposix.so libc++.so libpthread.so
+USRLIBS += libreadline.so libnet.so liburi.so libpsocket.so
+USRLIBS += libimage_sif.so libunicode.so libm.so
+USRLIBS += libaxwin4.so
+
+EXTLIBS := 
+#libspiderscript
+# zlib libpng
+
+USRAPPS := init login CLIShell cat ls mount automounter
+USRAPPS += insmod
+USRAPPS += bomb lspci
+USRAPPS += ip dhcpclient ping telnet irc wget telnetd
+USRAPPS += axwin3 gui_ate gui_terminal
+USRAPPS += axwin4
+
+define targetclasses
+ AI_$1      := $$(addprefix allinstall-,$$($1))
+ ALL_$1     := $$(addprefix all-,$$($1))
+ CLEAN_$1   := $$(addprefix clean-,$$($1))
+ INSTALL_$1 := $$(addprefix install-,$$($1))
+endef
+
+$(eval $(call targetclasses,DYNMODS))
+$(eval $(call targetclasses,MODULES))
+$(eval $(call targetclasses,USRLIBS))
+$(eval $(call targetclasses,EXTLIBS))
+$(eval $(call targetclasses,USRAPPS))
+
+targetvars := $$(AI_$1) $$(ALL_$1) $$(CLEAN_$1) $$(INSTALL_$1)
+
+.PHONY: all clean install \
+	ai-kmode all-kmode clean-kmode install-kmode \
+	ai-user all-user clean-user install-user \
+	utest mtest
+
+.PHONY: allinstall-Kernel all-Kernel clean-Kernel install-Kernel \
+	$(call targetvars,DYNMODS) \
+	$(call targetvars,MODULES) \
+	$(call targetvars,USRLIBS) \
+	$(call targetvars,EXTLIBS) \
+	$(call targetvars,USRAPPS)
+
+ai-kmode:	$(AI_MODULES) allinstall-Kernel $(AI_DYNMODS)
+all-kmode:	$(ALL_MODULES) all-Kernel $(ALL_DYNMODS)
+clean-kmode:	$(CLEAN_MODULES) $(CLEAN_DYNMODS) clean-Kernel
+install-kmode:	$(INSTALL_MODULES) install-Kernel $(INSTALL_DYNMODS)
+
+ai-user:	$(AI_USRLIBS) $(AI_EXTLIBS) $(AI_USRAPPS)
+all-user:	$(ALL_USRLIBS) $(ALL_EXTLIBS) $(ALL_USRAPPS)
+clean-user:	$(CLEAN_USRLIBS) $(CLEAN_EXTLIBS) $(CLEAN_USRAPPS)
+install-user:	$(INSTALL_USRLIBS) $(INSTALL_EXTLIBS) $(INSTALL_USRAPPS)
+
+all:	SyscallList all-user all-kmode
+all-install:	install-Filesystem SyscallList ai-user ai-kmode
+clean:	clean-kmode clean-user
+install:	install-Filesystem SyscallList install-user install-kmode
+
+utest-build: $(USRLIBS:%=utest-build-%)
+utest-run: $(USRLIBS:%=utest-run-%)
+utest: utest-build utest-run
+
+utest-build-%:
+	@CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src generate_exp
+	@CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src utest-build
+utest-run-%:
+	@CC=$(NCC) $(SUBMAKE) -C Usermode/Libraries/$*_src utest-run -k
+
+# TODO: Module tests using DiskTool and NetTest
+mtest: mtest-build mtest-run
+	@echo > /dev/null
+mtest-build:
+	# Network
+	@echo "== Build Module Tests"
+	@echo "-- nativelib"
+	@CC=$(NCC) $(SUBMAKE) -C Tools/nativelib
+	@echo "-- NetTest"
+	@CC=$(NCC) $(SUBMAKE) -C Tools/NetTest
+	@echo "-- NetTest Runner"
+	@CC=$(NCC) $(SUBMAKE) -C Tools/NetTest_Runner
+mtest-run:
+	@echo "=== Network Module Test ==="
+	@cd Tools && ./nettest_runner
+
+SyscallList: include/syscalls.h
+include/syscalls.h: KernelLand/Kernel/Makefile KernelLand/Kernel/syscalls.lst
+	@make -C KernelLand/Kernel/ include/syscalls.h
+
+_build_dynmod := BUILDTYPE=dynamic $(SUBMAKE) -C KernelLand/Modules/
+_build_stmod  := BUILDTYPE=static $(SUBMAKE) -C KernelLand/Modules/
+_build_kernel := $(SUBMAKE) -C KernelLand/Kernel
+
+define rules
+$$(ALL_$1): all-%: $(CC)
+	+@echo === $2 && $3 all
+$$(AI_$1): allinstall-%: $(CC)
+	+@echo === $2 && $3 all install
+$$(CLEAN_$1): clean-%: $(CC)
+	+@echo === $2 && $3 clean
+$$(INSTALL_$1): install-%: $(CC)
+	+@$3 install
+endef
+
+$(eval $(call rules,DYNMODS,Dynamic Module: $$*,$(_build_dynmod)$$*))
+$(eval $(call rules,MODULES,Module: $$*,$(_build_stmod)$$*))
+$(eval $(call rules,USRLIBS,User Library: $$*,$(SUBMAKE) -C Usermode/Libraries/$$*_src))
+$(eval $(call rules,EXTLIBS,External Library: $$*,$(SUBMAKE) -C Externals/$$*))
+$(eval $(call rules,USRAPPS,User Application: $$*,$(SUBMAKE) -C Usermode/Applications/$$*_src))
+all-Kernel: $(CC)
+	+@echo === Kernel && $(_build_kernel) all
+allinstall-Kernel: $(CC)
+	+@echo === Kernel && $(_build_kernel) all install
+clean-Kernel: $(CC)
+	+@$(_build_kernel) clean
+install-Kernel: $(CC)
+	@$(_build_kernel) install
+install-Filesystem: $(CC)
+	@$(SUBMAKE) install -C Usermode/Filesystem
+
+ifeq ($(ARCHDIR),native)
+.PHONY: $(CC)
+else
+$(CC):
+	@echo ---
+	@echo $(CC) does not exist, recompiling
+	@echo ---
+	for dir in $(USRLIBS:%=Usermode/Libraries/%_src); do $(SUBMAKE) -C $$dir _libs; done
+	make -C Externals/cross-compiler/ -f Makefile.cross
+endif