X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Facess2.git;a=blobdiff_plain;f=Makefile;h=cb21b454e13485ad20d4fe11664954b3c5dbf4ad;hp=9821d169e898944d87fa824717038c22fbf0734b;hb=5b99c972f3994cd19a04ac57caaf20da96a6aa14;hpb=184cdb36faa9cdf7e71af47a49c140b6fc4cebef diff --git a/Makefile b/Makefile index 9821d169..cb21b454 100644 --- a/Makefile +++ b/Makefile @@ -10,99 +10,132 @@ SUBMAKE = $(MAKE) --no-print-directory -USRLIBS := crt0.o acess.ld ld-acess.so libgcc.so libc.so -USRLIBS += libreadline.so libnet.so liburi.so -USRLIBS += libaxwin2.so libimage_sif.so - -USRAPPS := init login CLIShell cat ls mount -USRAPPS += bomb -USRAPPS += ifconfig ping telnet irc -USRAPPS += axwin2 axwin3 - -ALL_DYNMODS = $(addprefix all-,$(DYNMODS)) -ALL_MODULES := $(addprefix all-,$(MODULES)) -ALL_USRLIBS := $(addprefix all-,$(USRLIBS)) -ALL_USRAPPS := $(addprefix all-,$(USRAPPS)) -CLEAN_DYNMODS := $(addprefix clean-,$(DYNMODS)) -CLEAN_MODULES := $(addprefix clean-,$(MODULES)) -CLEAN_USRLIBS := $(addprefix clean-,$(USRLIBS)) -CLEAN_USRAPPS := $(addprefix clean-,$(USRAPPS)) -INSTALL_DYNMODS := $(addprefix install-,$(DYNMODS)) -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)) +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 \ - $(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) + 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) -kmode: $(AI_MODULES) $(AI_DYNMODS) allinstall-Kernel -all-kmode: $(ALL_MODULES) $(ALL_DYNMODS) all-Kernel +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-user: $(ALL_USRLIBS) $(ALL_USRAPPS) -clean-user: $(CLEAN_USRLIBS) $(CLEAN_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 -all: SyscallList $(ALL_USRLIBS) $(ALL_USRAPPS) $(ALL_MODULES) all-Kernel $(ALL_DYNMODS) -all-install: install-Filesystem SyscallList $(AI_USRLIBS) $(AI_USRAPPS) $(AI_MODULES) allinstall-Kernel $(AI_DYNMODS) -clean: $(CLEAN_DYNMODS) $(CLEAN_MODULES) clean-Kernel $(CLEAN_USRLIBS) $(CLEAN_USRAPPS) -install: install-Filesystem SyscallList $(INSTALL_USRLIBS) $(INSTALL_USRAPPS) $(INSTALL_DYNMODS) $(INSTALL_MODULES) install-Kernel +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: Kernel/Makefile Kernel/syscalls.lst - @make -C Kernel/ include/syscalls.h - -# Compile Only -$(ALL_DYNMODS): all-%: - +@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all -C Modules/$* -$(ALL_MODULES): all-%: - +@echo === Module: $* && BUILDTYPE=static $(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 -$(AI_DYNMODS): allinstall-%: - +@echo === Dynamic Module: $* && BUILDTYPE=dynamic $(SUBMAKE) all install -C Modules/$* -$(AI_MODULES): allinstall-%: - +@echo === Module: $* && BUILDTYPE=static $(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_DYNMODS): clean-%: - +@BUILDTYPE=dynamic $(SUBMAKE) clean -C Modules/$* -$(CLEAN_MODULES): clean-%: - +@BUILDTYPE=static $(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_DYNMODS): install-%: - @BUILDTYPE=dynamic $(SUBMAKE) install -C Modules/$* -$(INSTALL_MODULES): install-%: - @BUILDTYPE=static $(SUBMAKE) install -C Modules/$* -install-Filesystem: +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 -install-Kernel: - @$(SUBMAKE) install -C Kernel -$(INSTALL_USRLIBS): install-%: - @$(SUBMAKE) install -C Usermode/Libraries/$*_src -$(INSTALL_USRAPPS): install-%: - @$(SUBMAKE) install -C Usermode/Applications/$*_src + +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