diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk index 7001755..1d8f237 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk @@ -12,8 +12,8 @@ $(MB_@RECIPE)$$(call mb-make-call,mb-os-file-copy,$$<,$$@) endef define __mb-flow-clone-deps-chain .RECIPEPREFIX := $(MB_@RECIPE) -$(1): $(MB_@INCLUDE_CHAIN) -MB_@INCLUDE_CHAIN :$(MB_MAKE_EQUALS) $(1) +$(1): $(MB_@GRAPH_CHAIN) +MB_@GRAPH_CHAIN :$(MB_MAKE_EQUALS) $(1) .RECIPEPREFIX := $(MB_@RECIPEPREFIX) endef @@ -24,9 +24,9 @@ $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-flow-proj-setup,$(1),$(2)/@build, $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-flow-proj-module-run,$(1),$(5)) $(MB_ᕽᕽᕽ   )$(if $(4),$(call mb-make-call,mb-flow-proj-prepare-packages,$(1),$(4))) $(MB_ᕽᕽᕽ   )$(eval $(call mb-make-call,__mb-flow-clone-deps,$(1),$(2),$(3),$(call mb-make-call,mb-make-module-local-deps,$(1),$(3)))) -$(MB_ᕽᕽᕽ   )$(eval MB_@INCLUDE_CHAIN :$(MB_MAKE_EQUALS) $(1)/@@prepare) +$(MB_ᕽᕽᕽ   )$(eval MB_@GRAPH_CHAIN :$(MB_MAKE_EQUALS) $(1)/@@prepare) $(MB_ᕽᕽᕽ   )$(foreach _dep,$(call mb-make-call,mb-make-module-local-deps,$(1),$(3)),$(eval $(call mb-make-call,__mb-flow-clone-deps-chain,$(_dep)))) -$(MB_ᕽᕽᕽ   )$(eval $(1)/@@prepare-deps:: $(MB_@INCLUDE_CHAIN)) +$(MB_ᕽᕽᕽ   )$(eval $(1)/@@prepare-deps:: $(MB_@GRAPH_CHAIN)) endef $(call mb-make-call,mb-doc-function-flow,mb-flow-clone-deps-proj-setup,Inject flow of file copy toolchain module., [packages] [machine]) @@ -37,9 +37,9 @@ $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-flow-proj-setup-orphan,$(1),$(2)/ $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-flow-proj-module-run,$(1),$(5)) $(MB_ᕽᕽᕽ   )$(if $(4),$(call mb-make-call,mb-flow-proj-prepare-packages,$(1),$(4))) $(MB_ᕽᕽᕽ   )$(eval $(call mb-make-call,__mb-flow-clone-deps,$(1),$(2),$(3),$(call mb-make-call,mb-make-module-local-deps,$(1),$(3)))) -$(MB_ᕽᕽᕽ   )$(eval MB_@INCLUDE_CHAIN :$(MB_MAKE_EQUALS) $(1)/@@prepare) +$(MB_ᕽᕽᕽ   )$(eval MB_@GRAPH_CHAIN :$(MB_MAKE_EQUALS) $(1)/@@prepare) $(MB_ᕽᕽᕽ   )$(foreach _dep,$(call mb-make-call,mb-make-module-local-deps,$(1),$(3)),$(eval $(call mb-make-call,__mb-flow-clone-deps-chain,$(_dep)))) -$(MB_ᕽᕽᕽ   )$(eval $(1)/@@prepare-deps:: $(MB_@INCLUDE_CHAIN)) +$(MB_ᕽᕽᕽ   )$(eval $(1)/@@prepare-deps:: $(MB_@GRAPH_CHAIN)) endef $(call mb-make-call,mb-doc-function-flow,mb-flow-clone-deps-proj-setup-orphan,Inject flow of file copy toolchain module., [packages] [machine]) diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk index a50ae04..8a4aaf6 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk @@ -319,19 +319,19 @@ $(call mb-make-call,mb-doc-function-flow,mb-flow-proj-module-run,Inject flow mod define __mb-flow-proj-prepare-packages .RECIPEPREFIX := $(MB_@RECIPE) -$(1)/@msxhub/$(2): $(MB_@INCLUDE_CHAIN) +$(1)/@msxhub/$(2): $(MB_@GRAPH_CHAIN) $(MB_@RECIPE)$$(if $$(wildcard $(1)$$(if $(3),/$(3))),,$$(call mb-make-call,mb-os-dir-create,$(1)$$(if $(3),/$(3)))) $(MB_@RECIPE)$$(call mb-make-call,mb-msxhub-get-$(2),$(1)$$(if $(3),/$(3))) $(MB_ᕽᕽᕽ   )$$(call mb-make-call,mb-make-target-phony,$(1)/@msxhub/$(2)) -$(MB_ᕽᕽᕽ   )MB_@INCLUDE_CHAIN :$(MB_MAKE_EQUALS) $(1)/@msxhub/$(2) +$(MB_ᕽᕽᕽ   )MB_@GRAPH_CHAIN :$(MB_MAKE_EQUALS) $(1)/@msxhub/$(2) .RECIPEPREFIX := $(MB_@RECIPEPREFIX) endef define mb-flow-proj-prepare-packages $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-check-arg2,$(0),$(1),$(2)) -$(MB_ᕽᕽᕽ   )$(eval MB_@INCLUDE_CHAIN :$(MB_MAKE_EQUALS) $(1)/@@prepare) +$(MB_ᕽᕽᕽ   )$(eval MB_@GRAPH_CHAIN :$(MB_MAKE_EQUALS) $(1)/@@prepare) $(MB_ᕽᕽᕽ   )$(foreach _pack,$(2),$(eval $(call mb-make-call,__$(0),$(1),$(_pack),$(3)))) -$(MB_ᕽᕽᕽ   )$(eval $(1)/@@prepare-deps:: $(MB_@INCLUDE_CHAIN)) +$(MB_ᕽᕽᕽ   )$(eval $(1)/@@prepare-deps:: $(MB_@GRAPH_CHAIN)) endef $(call mb-make-call,mb-doc-function-flow,mb-flow-proj-prepare-packages,Inject package fetch flow for module., [dest-dir]) diff --git a/lib/msxbuild.mk b/lib/msxbuild.mk index ae9a4f4..7a756f4 100644 --- a/lib/msxbuild.mk +++ b/lib/msxbuild.mk @@ -23,7 +23,7 @@ MB_@RECIPE := ] MB_@RECIPEPREFIX := $(.RECIPEPREFIX) MB_@BASEPATH := $(dir $(lastword $(MAKEFILE_LIST))) MB_@WORK := /../_work/ -MB_@INCLUDE_CHAIN := +MB_@GRAPH_CHAIN := # Build multiple groups of chains of includes define __mb-include @@ -34,12 +34,12 @@ endif endif .PHONY: $(MB_@BASEPATH)$(1) include $(MB_@BASEPATH)$(1) -$(MB_@BASEPATH)$(1): $(MB_@INCLUDE_CHAIN) -MB_@INCLUDE_CHAIN := $(MB_@BASEPATH)$(1) +$(MB_@BASEPATH)$(1): $(MB_@GRAPH_CHAIN) +MB_@GRAPH_CHAIN := $(MB_@BASEPATH)$(1) endef # Include full library grouped in functional blocks -MB_@INCLUDE_CHAIN := @@include-parent +MB_@GRAPH_CHAIN := @@include-parent $(eval $(call __mb-include,make/सिस्टमₚᵣₐᵧToੴ/mb_xxx.mk)) $(eval $(call __mb-include,make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk)) $(eval $(call __mb-include,make/सिस्टमₚᵣₐᵧToੴ/mb_make_call.mk)) @@ -48,22 +48,22 @@ $(eval $(call __mb-include,make/सिस्टमₚᵣₐᵧToੴ/mb_make_modu $(eval $(call __mb-include,make/सिस्टमₚᵣₐᵧToੴ/mb_make_space.mk)) $(eval $(call __mb-include,make/सिस्टमₚᵣₐᵧToੴ/mb_make_xml.mk)) $(eval $(call __mb-include,make/सिस्टमₚᵣₐᵧToੴ/mb_make.mk)) -@@include-libs:: $(MB_@INCLUDE_CHAIN) -MB_@INCLUDE_CHAIN := @@include-parent +@@include-libs:: $(MB_@GRAPH_CHAIN) +MB_@GRAPH_CHAIN := @@include-parent $(eval $(call __mb-include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_os.mk)) $(eval $(call __mb-include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_conv.mk)) $(eval $(call __mb-include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_sdcc.mk)) $(eval $(call __mb-include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_package.mk)) $(eval $(call __mb-include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_nestor80.mk)) -@@include-libs:: $(MB_@INCLUDE_CHAIN) -MB_@INCLUDE_CHAIN := @@include-parent +@@include-libs:: $(MB_@GRAPH_CHAIN) +MB_@GRAPH_CHAIN := @@include-parent $(eval $(call __mb-include,make/天房系統擴展/mb_msxrom.mk)) $(eval $(call __mb-include,make/天房系統擴展/mb_msxhub.mk)) $(eval $(call __mb-include,make/天房系統擴展/mb_msxpipe.mk)) $(eval $(call __mb-include,make/天房系統擴展/mb_openmsx.mk)) $(eval $(call __mb-include,make/天房系統擴展/mb_autoexec.mk)) -@@include-libs:: $(MB_@INCLUDE_CHAIN) -MB_@INCLUDE_CHAIN := @@include-parent +@@include-libs:: $(MB_@GRAPH_CHAIN) +MB_@GRAPH_CHAIN := @@include-parent $(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_nx01.mk)) $(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_help.mk)) $(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk)) @@ -72,8 +72,8 @@ $(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_macro80.mk)) $(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_nestor80.mk)) $(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_sdcc.mk)) $(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk)) -@@include-libs:: $(MB_@INCLUDE_CHAIN) -MB_@INCLUDE_CHAIN := +@@include-libs:: $(MB_@GRAPH_CHAIN) +MB_@GRAPH_CHAIN := $(eval $(call __mb-include,make/mb_env.mk)) $(eval $(call __mb-include,make/mb_flight.mk)) $(eval $(call __mb-include,make/ i18n/mb_i18n.mk)) @@ -81,8 +81,8 @@ ifneq ("$(MB_I18N)", "off") $(if $(MB_I18N),$(if $(wildcard $(MB_@BASEPATH)make/ i18n/mb_i18n_$(MB_I18N).mk),,$(error Unsupported i18n language code: $(MB_I18N)))) $(eval $(call __mb-include,make/ i18n/mb_i18n_$(MB_I18N).mk)) endif -@include:: $(MB_@INCLUDE_CHAIN) -MB_@INCLUDE_CHAIN := +@include:: $(MB_@GRAPH_CHAIN) +MB_@GRAPH_CHAIN := # Glue phony targets to get internal @include tree (semi) correct (TODO: fix chain in: mb_flow_0module_setup) .PHONY: @include @@include-root @@include-libs @@include-mods @@include-parent @@include-tree @@ -94,7 +94,7 @@ $(MB_ᕽᕽᕽ )$(call mb-make-call,mb-doc-variable-rock,MB_@RECIPE,Recipe pre $(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-doc-variable-rock,MB_@RECIPEPREFIX,Recipe prefix to restore to after flow eval rules.) $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-doc-variable-rock,MB_@BASEPATH,Path where msxbuild lib folder is located.) $(MB_ᕽᕽᕽ    )$(call mb-make-call,mb-doc-variable-rock,MB_@WORK,Shorthand to move to the work folder of module.) -$(MB_ᕽᕽᕽ     )$(call mb-make-call,mb-doc-variable-rock,MB_@INCLUDE_CHAIN,Helper to chain internal library sections includes into groups.) +$(MB_ᕽᕽᕽ     )$(call mb-make-call,mb-doc-variable-rock,MB_@GRAPH_CHAIN,Helper to chain internal graph sections includes into groups.) # Provider+doc easy single function start point for user define mb-setup-default