From 8087dcaab781ce57cbeda1a991c7cc88c623294f Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.2022@distributedrebirth.love>
Date: Wed, 10 Jul 2024 22:35:57 +0200
Subject: [PATCH] Renamed to new function names.

---
 Makefile                | 16 +++++++---------
 Makelocal.mk.tpl        |  4 ++--
 src/dist-run/0module.mk |  6 +++---
 src/dist/0module.mk     | 16 ++++++++--------
 src/tara/0module.mk     |  8 ++++----
 5 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index d935b9d..1694a02 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,6 @@
 #
 # Top level makefile for tara
 #
-
-rwildcard			 = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
-INC_MODS			:= $(call rwildcard, src, */0module.mk)
-INC_LIBS			:= $(call rwildcard, src, */0module.lib.mk)
 PATH_BIN			:= bin
 PATH_SRC			:= src
 BUILD_ALL			:= "Use 'make help' for possible targets."
@@ -14,19 +10,21 @@ MB_OPENMSX_ARGS		+= -ext video9000
 .SUFFIXES:
 .PHONY: all
 all:
-	@echo $(BUILD_ALL)
+	@echo -e $(BUILD_ALL)
 
 BUILD_HELP += \\n\\t* help
 .PHONY: help
 help:
-	@echo $(BUILD_HELP)
+	@echo -e $(BUILD_HELP)
 
 BUILD_HELP += \\n\\t* clean
 .PHONY: clean
 clean:
-	$(call mb_clean,$(PATH_BIN))
+	$(call mb_make_call,mb_os_dir_delete,$(PATH_BIN))
 
 -include Makelocal.mk
+include $(PATH_MSXBUILD)/lib/make/msxbuild-prolog.mk
+.RECIPEPREFIX :=
 include $(PATH_MSXBUILD)/lib/make/msxbuild.mk
-include $(INC_LIBS)
-include $(INC_MODS)
+$(call mb_make_call,mb_make_flow_0module,$(PATH_SRC))
+
diff --git a/Makelocal.mk.tpl b/Makelocal.mk.tpl
index d9e3d80..f773abd 100644
--- a/Makelocal.mk.tpl
+++ b/Makelocal.mk.tpl
@@ -3,7 +3,7 @@
 #
 # Change to local installations if needed;
 
-#PATH_SDCC       ?= /usr/bin
-#PATH_OPENMSX    ?= /opt/openMSX/bin/
+#MB_SDCC_PATH       ?= /usr/bin
+#MB_OPENMSX_PATH    ?= /opt/openMSX/bin/
 #PATH_MSXBUILD	?= /opt/msxbuild
 
diff --git a/src/dist-run/0module.mk b/src/dist-run/0module.mk
index 167bb92..ce3d2cf 100644
--- a/src/dist-run/0module.mk
+++ b/src/dist-run/0module.mk
@@ -7,10 +7,10 @@ DIST_RUN_DEP		:= $(DIST_RUN_BIN)/tara.com
 BUILD_HELP			+= \\n\\t* $(DIST_RUN_NAME)
 
 $(DIST_RUN_BIN):
-	$(call mb_mkdir,$(DIST_RUN_BIN))
+	$(call mb_make_call,mb_os_dir_create,$(DIST_RUN_BIN))
 
 $(DIST_RUN_DEP): $(DIST_RUN_DEP_TAR) | $(DIST_RUN_BIN)
-	$(call mb_copy,$(PATH_BIN)/dist/*,$(DIST_RUN_BIN))
+	$(call mb_make_call,mb_os_file_copy,$(PATH_BIN)/dist/*,$(DIST_RUN_BIN))
 
 $(DIST_RUN_NAME): $(DIST_RUN_DEP)
-	$(call mb_msxpipe_run_gui_mouse,$(DIST_RUN_BIN),tara)
+	$(call mb_make_call,mb_msxpipe_run_gui_mouse,$(DIST_RUN_BIN),tara)
diff --git a/src/dist/0module.mk b/src/dist/0module.mk
index 4b6ed53..1c727e9 100644
--- a/src/dist/0module.mk
+++ b/src/dist/0module.mk
@@ -11,18 +11,18 @@ DIST_TARA_SRC	:= $(PATH_BIN)/tara/tara.com
 BUILD_HELP		+= \\n\\t* $(DIST_OUT)
 
 $(DIST_BIN):
-	$(call mb_mkdir,$(DIST_BIN))
+	$(call mb_make_call,mb_os_dir_create,$(DIST_BIN))
 $(DIST_BIN)/all.sr8: $(DIST_SRC)/all.sr8 | $(DIST_BIN)
-	$(call mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 $(DIST_BIN)/ascii.sr8: $(DIST_SRC)/ascii.sr8 | $(DIST_BIN)
-	$(call mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 $(DIST_BIN)/veld.sr8: $(DIST_SRC)/veld.sr8 | $(DIST_BIN)
-	$(call mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 $(DIST_BIN)/veldback.4bp: $(DIST_SRC)/veldback.4bp | $(DIST_BIN)
-	$(call mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 $(DIST_BIN)/readme.txt: $(DIST_SRC)/readme.txt | $(DIST_BIN)
-	$(call mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 $(DIST_TARA_BIN): $(DIST_TARA_SRC) | $(DIST_BIN)
-	$(call mb_copy,$<,$@)
+	$(call mb_make_call,mb_os_file_copy,$<,$@)
 $(DIST_OUT): | $(DIST_INC_BIN) $(DIST_TARA_BIN)
-	$(call mb_create_dist,$(DIST_BIN),$@)
+	$(call mb_make_call,mb_package_create_archive,$(DIST_BIN),$@)
diff --git a/src/tara/0module.mk b/src/tara/0module.mk
index 48eeaee..18f51f9 100644
--- a/src/tara/0module.mk
+++ b/src/tara/0module.mk
@@ -9,13 +9,13 @@ TARA_CODE	:= $(TARA_SRC)/$(TARA_NAME).asm
 BUILD_HELP	+= \\n\\t* $(TARA_COM)
 
 $(TARA_BIN):
-	$(call mb_mkdir,$(TARA_BIN))
+	$(call mb_make_call,mb_os_dir_create,$(TARA_BIN))
 
 $(TARA_BIN)/%.rel: $(TARA_SRC)/%.asm | $(TARA_BIN)
-	$(call mb_sdcc_compile_asm,$<,$@)
+	$(call mb_make_call,mb_sdcc_compile_asm,$<,$@)
 
 $(TARA_HEX): $(TARA_RELS)
-	$(call mb_sdcc_link_asm_bdos,$<,$@)
+	$(call mb_make_call,mb_sdcc_link_asm_bdos,$<,$@)
 
 $(TARA_COM): $(TARA_HEX)
-	$(call mb_sdcc_hex2bin,$<,$@)
+	$(call mb_make_call,mb_sdcc_objcopy,$<,$@)