From 8a18cb494dea68e498ad4ff67983b2adcab96d60 Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.2022@distributedrebirth.love>
Date: Sat, 6 Jul 2024 01:09:59 +0200
Subject: [PATCH] Moved all file convert function to namespace.

---
 lib/make/mb_conv.mk        | 13 +++++++++++++
 lib/make/msxbuild.mk       | 12 +-----------
 src/ahello-m80/0module.mk  |  4 ++--
 src/dist/0module.mk        |  2 +-
 src/make-on-msx/0module.mk |  6 +++---
 5 files changed, 20 insertions(+), 17 deletions(-)
 create mode 100644 lib/make/mb_conv.mk

diff --git a/lib/make/mb_conv.mk b/lib/make/mb_conv.mk
new file mode 100644
index 0000000..d32d41a
--- /dev/null
+++ b/lib/make/mb_conv.mk
@@ -0,0 +1,13 @@
+
+
+define mb_conv_unix2dos
+	unix2dos -q -n $(1) $(2)
+endef
+MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_conv_unix2dos,"Converts an unix file to dos.","<in> <out>")
+
+
+define mb_conv_dos2unix
+	dos2unix -q -n $(1) $(2)
+endef
+MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_conv_dos2unix,"Converts an dos file to unix.","<in> <out>")
+
diff --git a/lib/make/msxbuild.mk b/lib/make/msxbuild.mk
index 4588c2a..6926937 100644
--- a/lib/make/msxbuild.mk
+++ b/lib/make/msxbuild.mk
@@ -18,6 +18,7 @@ include $(PATH_MSXBUILD)/lib/make/mb_msxhub.mk
 include $(PATH_MSXBUILD)/lib/make/mb_msxpipe.mk
 include $(PATH_MSXBUILD)/lib/make/mb_openmsx.mk
 include $(PATH_MSXBUILD)/lib/make/mb_autoexec.mk
+include $(PATH_MSXBUILD)/lib/make/mb_conv.mk
 include $(PATH_MSXBUILD)/lib/make/mb_os.mk
 
 # Below mb_doc.mk for white space...
@@ -52,17 +53,6 @@ endef
 MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_copy,"Copy an file.","<in> <out>")
 
 
-define mb_unix2dos
-	unix2dos -q -n $(1) $(2)
-endef
-MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_unix2dos,"Converts an unix file to dos.","<in> <out>")
-
-
-define mb_dos2unix
-	dos2unix -q -n $(1) $(2)
-endef
-MB_DOC_FIRE_FUNCTION += $(call mb_make_call,mb_doc_function,mb_dos2unix,"Converts an dos file to unix.","<in> <out>")
-
 
 define mb_create_dist
 	$(call mb_make_call,mb_make_echo_good,Creating distribution archive $(2))
diff --git a/src/ahello-m80/0module.mk b/src/ahello-m80/0module.mk
index c36b227..dce6c58 100644
--- a/src/ahello-m80/0module.mk
+++ b/src/ahello-m80/0module.mk
@@ -17,7 +17,7 @@ $(2): | $(1)
 MB_DOC_FIRE_TARGET_DEEP += $$(call mb_make_call,mb_doc_target_deep,$(2))
 
 $(2)/$(4).mac: $(3)/$(4).mac | $(2)
-	$$(call mb_make_call,mb_unix2dos,$(3)/$(4).mac,$(2)/$(4).mac)
+	$$(call mb_make_call,mb_conv_unix2dos,$(3)/$(4).mac,$(2)/$(4).mac)
 MB_DOC_FIRE_TARGET_DEEP += $$(call mb_make_call,mb_doc_target_deep,$(2)/$(4).mac)
 
 $(2)/$(4).rel: $(2)/$(4).mac
@@ -63,7 +63,7 @@ $(AHELLO_M80_BIN): | $(PATH_BIN)/@prepare
 	$(call mb_msxhub_get_z80asmuk,$(AHELLO_M80_BIN)/utils)
 
 $(AHELLO_M80_BIN)/%.mac: $(AHELLO_M80_SRC)/%.mac | $(AHELLO_M80_BIN)
-	$(call mb_unix2dos,$<,$@)
+	$(call mb_conv_unix2dos,$<,$@)
 
 $(AHELLO_M80_BIN)/ahello.rel: $(AHELLO_M80_BIN)/ahello.mac
 	$(call mb_msxpipe_safe_cmd,$(AHELLO_M80_BIN),m80 =ahello/Z)
diff --git a/src/dist/0module.mk b/src/dist/0module.mk
index 8561e19..3540f54 100644
--- a/src/dist/0module.mk
+++ b/src/dist/0module.mk
@@ -9,7 +9,7 @@ $(DIST_BIN): | $(PATH_BIN)/@prepare
 	$(call mb_mkdir,$(DIST_BIN))
 
 $(DIST_BIN)/readme.txt: $(DIST_SRC)/readme.txt | $(DIST_BIN)
-	$(call mb_unix2dos,$<,$@)
+	$(call mb_conv_unix2dos,$<,$@)
 
 $(DIST_BIN)/ahello1.com: bin/ahello-m80/ahello.com | $(DIST_BIN)
 	$(call mb_copy,$<,$@)
diff --git a/src/make-on-msx/0module.mk b/src/make-on-msx/0module.mk
index d90b16a..19c0ccb 100644
--- a/src/make-on-msx/0module.mk
+++ b/src/make-on-msx/0module.mk
@@ -14,17 +14,17 @@ MB_DOC_FIRE_TARGET_DEEP += $(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_
 
 
 $(MAKE_ON_MSX_BIN)/nfbsshot.mac: $(MAKE_ON_MSX_SRC)/nfbsshot.mac | $(MAKE_ON_MSX_BIN)
-	$(call mb_make_call,mb_unix2dos,$<,$@)
+	$(call mb_make_call,mb_conv_unix2dos,$<,$@)
 MB_DOC_FIRE_TARGET_DEEP += $(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/nfbsshot.mac)
 
 
 $(MAKE_ON_MSX_BIN)/nfbsshot.mf: $(MAKE_ON_MSX_SRC)/nfbsshot.mf | $(MAKE_ON_MSX_BIN)/nfbsshot.mac
-	$(call mb_make_call,mb_unix2dos,$<,$@)
+	$(call mb_make_call,mb_conv_unix2dos,$<,$@)
 MB_DOC_FIRE_TARGET_DEEP += $(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/nfbsshot.mf)
 
 
 $(MAKE_ON_MSX_BIN)/build.bat: $(MAKE_ON_MSX_SRC)/build.bat | $(MAKE_ON_MSX_BIN)/nfbsshot.mf
-	$(call mb_make_call,mb_unix2dos,$<,$@)
+	$(call mb_make_call,mb_conv_unix2dos,$<,$@)
 MB_DOC_FIRE_TARGET_DEEP += $(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/build.bat)