From 0aecfa1ba38535526947411b504efab3962dc155 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 30 Jun 2024 05:05:20 +0200 Subject: [PATCH] Moved help to targets section. --- src/ahello-m80-test/0module.mk | 3 ++- src/ahello-m80/0module.mk | 3 ++- src/ahello-sdcc-test/0module.mk | 3 ++- src/ahello-sdcc/0module.mk | 3 ++- src/assert-all/0module.mk | 2 +- src/dist-qa-dos1/0module.mk | 3 ++- src/dist-qa-dos2/0module.mk | 3 ++- src/dist-qa-msx1/0module.mk | 3 ++- src/dist-qa-msxhub/0module.mk | 5 +++-- src/dist/0module.mk | 3 ++- 10 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/ahello-m80-test/0module.mk b/src/ahello-m80-test/0module.mk index 635f3e5..5b0e106 100644 --- a/src/ahello-m80-test/0module.mk +++ b/src/ahello-m80-test/0module.mk @@ -2,7 +2,6 @@ AHELLO_M80_TEST_MOD := ahello-m80-test AHELLO_M80_TEST_SRC := $(PATH_SRC)/$(AHELLO_M80_TEST_MOD) AHELLO_M80_TEST_BIN := $(PATH_BIN)/$(AHELLO_M80_TEST_MOD) -BUILD_HELP += \\n\\t* $(AHELLO_M80_TEST_BIN)/@run\\n\\t* $(AHELLO_M80_TEST_BIN)/@assert $(AHELLO_M80_TEST_BIN): $(call mb_mkdir,$(AHELLO_M80_TEST_BIN)) @@ -10,11 +9,13 @@ $(AHELLO_M80_TEST_BIN): $(AHELLO_M80_TEST_BIN)/ahello.com: $(AHELLO_M80_BIN)/ahello.com | $(AHELLO_M80_TEST_BIN) $(call mb_copy,$<,$@) +BUILD_HELP += \\n\\t* $(AHELLO_M80_TEST_BIN)/@run .PHONY: $(AHELLO_M80_TEST_BIN)/@run $(AHELLO_M80_TEST_BIN)/@run: | $(AHELLO_M80_TEST_BIN)/ahello.com $(call mb_autoexec_show_gui80,$(AHELLO_M80_TEST_BIN)) $(call mb_openmsx_dosctl,$(AHELLO_M80_TEST_BIN)) +BUILD_HELP += \\n\\t* $(AHELLO_M80_TEST_BIN)/@assert .PHONY: $(AHELLO_M80_TEST_BIN)/@assert $(AHELLO_M80_TEST_BIN)/@assert: | $(AHELLO_M80_TEST_BIN)/ahello.com $(call mb_delete,$(AHELLO_M80_TEST_BIN)/ahello.out) diff --git a/src/ahello-m80/0module.mk b/src/ahello-m80/0module.mk index 838b83f..18c4384 100644 --- a/src/ahello-m80/0module.mk +++ b/src/ahello-m80/0module.mk @@ -2,7 +2,6 @@ AHELLO_M80_MOD := ahello-m80 AHELLO_M80_SRC := $(PATH_SRC)/$(AHELLO_M80_MOD) AHELLO_M80_BIN := $(PATH_BIN)/$(AHELLO_M80_MOD) -BUILD_HELP += \\n\\t* $(AHELLO_M80_BIN)/ahello.com\\n\\t* $(AHELLO_M80_BIN)/@run $(AHELLO_M80_BIN): $(call mb_mkdir,$(AHELLO_M80_BIN)) @@ -21,10 +20,12 @@ $(AHELLO_M80_BIN)/ahello.hex: $(AHELLO_M80_BIN)/ahello.rel $(call mb_autoexec_safe_cmd,$(AHELLO_M80_BIN),l80 ahello$(MB_COMMA)ahello/N/X/Y/E) $(call mb_openmsx_dosctl,$(AHELLO_M80_BIN)) +BUILD_HELP += \\n\\t* $(AHELLO_M80_BIN)/ahello.com $(AHELLO_M80_BIN)/ahello.com: $(AHELLO_M80_BIN)/ahello.hex $(call mb_autoexec_safe_cmd,$(AHELLO_M80_BIN),hextocom ahello) $(call mb_openmsx_dosctl,$(AHELLO_M80_BIN)) +BUILD_HELP += \\n\\t* $(AHELLO_M80_BIN)/@run .PHONY: $(AHELLO_M80_BIN)/@run $(AHELLO_M80_BIN)/@run: | $(AHELLO_M80_BIN)/ahello.com $(call mb_autoexec_show_gui80,$(AHELLO_M80_BIN)) diff --git a/src/ahello-sdcc-test/0module.mk b/src/ahello-sdcc-test/0module.mk index 4d41a95..238379e 100644 --- a/src/ahello-sdcc-test/0module.mk +++ b/src/ahello-sdcc-test/0module.mk @@ -2,7 +2,6 @@ AHELLO_SDCC_TEST_MOD := ahello-sdcc-test AHELLO_SDCC_TEST_SRC := $(PATH_SRC)/$(AHELLO_SDCC_TEST_MOD) AHELLO_SDCC_TEST_BIN := $(PATH_BIN)/$(AHELLO_SDCC_TEST_MOD) -BUILD_HELP += \\n\\t* $(AHELLO_SDCC_TEST_BIN)/@run\\n\\t* $(AHELLO_SDCC_TEST_BIN)/@assert $(AHELLO_SDCC_TEST_BIN): $(call mb_mkdir,$(AHELLO_SDCC_TEST_BIN)) @@ -10,11 +9,13 @@ $(AHELLO_SDCC_TEST_BIN): $(AHELLO_SDCC_TEST_BIN)/ahello.com: $(AHELLO_SDCC_BIN)/ahello.com | $(AHELLO_SDCC_TEST_BIN) $(call mb_copy,$<,$@) +BUILD_HELP += \\n\\t* $(AHELLO_SDCC_TEST_BIN)/@run .PHONY: $(AHELLO_SDCC_TEST_BIN)/@run $(AHELLO_SDCC_TEST_BIN)/@run: | $(AHELLO_SDCC_TEST_BIN)/ahello.com $(call mb_autoexec_show_gui80,$(AHELLO_SDCC_TEST_BIN)) $(call mb_openmsx_dosctl,$(AHELLO_SDCC_TEST_BIN)) +BUILD_HELP += \\n\\t* $(AHELLO_SDCC_TEST_BIN)/@assert .PHONY: $(AHELLO_M80_TEST_BIN)/@assert $(AHELLO_SDCC_TEST_BIN)/@assert: | $(AHELLO_SDCC_TEST_BIN)/ahello.com $(call mb_delete,$(AHELLO_SDCC_TEST_BIN)/ahello.out) diff --git a/src/ahello-sdcc/0module.mk b/src/ahello-sdcc/0module.mk index 9b9ae2d..20f14ce 100644 --- a/src/ahello-sdcc/0module.mk +++ b/src/ahello-sdcc/0module.mk @@ -2,7 +2,6 @@ AHELLO_SDCC_MOD := ahello-sdcc AHELLO_SDCC_SRC := $(PATH_SRC)/$(AHELLO_SDCC_MOD) AHELLO_SDCC_BIN := $(PATH_BIN)/$(AHELLO_SDCC_MOD) -BUILD_HELP += \\n\\t* $(AHELLO_SDCC_BIN)/ahello.com\\n\\t* $(AHELLO_SDCC_BIN)/@run $(AHELLO_SDCC_BIN): $(call mb_mkdir,$(AHELLO_SDCC_BIN)) @@ -13,9 +12,11 @@ $(AHELLO_SDCC_BIN)/%.rel: $(AHELLO_SDCC_SRC)/%.asm | $(AHELLO_SDCC_BIN) $(AHELLO_SDCC_BIN)/ahello.hex: $(AHELLO_SDCC_BIN)/ahello.rel $(call mb_sdcc_link_asm_dos,$<,$@) +BUILD_HELP += \\n\\t* $(AHELLO_SDCC_BIN)/ahello.com $(AHELLO_SDCC_BIN)/ahello.com: $(AHELLO_SDCC_BIN)/ahello.hex $(call mb_sdcc_hex2bin,$<,$@) +BUILD_HELP += \\n\\t* $(AHELLO_SDCC_BIN)/@run .PHONY: $(AHELLO_SDCC_BIN)/@run $(AHELLO_SDCC_BIN)/@run: | $(AHELLO_SDCC_BIN)/ahello.com $(call mb_autoexec_show_gui80,$(AHELLO_SDCC_BIN)) diff --git a/src/assert-all/0module.mk b/src/assert-all/0module.mk index 5a68811..7c5b921 100644 --- a/src/assert-all/0module.mk +++ b/src/assert-all/0module.mk @@ -1,5 +1,4 @@ -BUILD_HELP += \\n\\t* assert-all \(Run all assertion tests\) ASSERT_ALL_DEPS := \ bin/ahello-m80-test/@assert \ bin/ahello-sdcc-test/@assert \ @@ -8,6 +7,7 @@ bin/dist-qa-dos2/@assert \ bin/dist-qa-msx1/@assert \ bin/dist-qa-msxhub/@assert +BUILD_HELP += \\n\\t* assert-all \(Run all assertion tests\) .PHONY: assert-all assert-all: | $(ASSERT_ALL_DEPS) @echo === All assertions completed diff --git a/src/dist-qa-dos1/0module.mk b/src/dist-qa-dos1/0module.mk index 54b8c91..7c83049 100644 --- a/src/dist-qa-dos1/0module.mk +++ b/src/dist-qa-dos1/0module.mk @@ -3,7 +3,6 @@ DIST_QA_DOS1_MOD := dist-qa-dos1 DIST_QA_DOS1_SRC := $(PATH_SRC)/$(DIST_QA_DOS1_MOD) DIST_QA_DOS1_BIN := $(PATH_BIN)/$(DIST_QA_DOS1_MOD) DIST_QA_DOS1_DEPS := $(subst dist,$(DIST_QA_DOS1_MOD),$(DIST_DEPS)) -BUILD_HELP += \\n\\t* $(DIST_QA_DOS1_BIN)/@run\\n\\t* $(DIST_QA_DOS1_BIN)/@assert $(DIST_QA_DOS1_BIN): $(call mb_mkdir,$(DIST_QA_DOS1_BIN)) @@ -12,11 +11,13 @@ $(DIST_QA_DOS1_BIN): $(DIST_QA_DOS1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS1_BIN) $(DIST_DEPS) $(call mb_copy,$<,$@) +BUILD_HELP += \\n\\t* $(DIST_QA_DOS1_BIN)/@run .PHONY: $(DIST_QA_DOS1_BIN)/@run $(DIST_QA_DOS1_BIN)/@run: | $(DIST_QA_DOS1_DEPS) $(call mb_autoexec_show_gui80,$(DIST_QA_DOS1_BIN)) $(call mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN)) +BUILD_HELP += \\n\\t* $(DIST_QA_DOS1_BIN)/@assert .PHONY: $(DIST_QA_DOS1_BIN)/@assert $(DIST_QA_DOS1_BIN)/@assert: | $(DIST_QA_DOS1_DEPS) $(call mb_autoexec_write_default,$(DIST_QA_DOS1_BIN)) diff --git a/src/dist-qa-dos2/0module.mk b/src/dist-qa-dos2/0module.mk index 5622cf6..c198109 100644 --- a/src/dist-qa-dos2/0module.mk +++ b/src/dist-qa-dos2/0module.mk @@ -3,7 +3,6 @@ DIST_QA_DOS2_MOD := dist-qa-dos2 DIST_QA_DOS2_SRC := $(PATH_SRC)/$(DIST_QA_DOS2_MOD) DIST_QA_DOS2_BIN := $(PATH_BIN)/$(DIST_QA_DOS2_MOD) DIST_QA_DOS2_DEPS := $(subst dist,$(DIST_QA_DOS2_MOD),$(DIST_DEPS)) -BUILD_HELP += \\n\\t* $(DIST_QA_DOS2_BIN)/@run\\n\\t* $(DIST_QA_DOS2_BIN)/@assert $(DIST_QA_DOS2_BIN): $(call mb_mkdir,$(DIST_QA_DOS2_BIN)) @@ -12,11 +11,13 @@ $(DIST_QA_DOS2_BIN): $(DIST_QA_DOS2_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS2_BIN) $(DIST_DEPS) $(call mb_copy,$<,$@) +BUILD_HELP += \\n\\t* $(DIST_QA_DOS2_BIN)/@run .PHONY: $(DIST_QA_DOS2_BIN)/@run $(DIST_QA_DOS2_BIN)/@run: | $(DIST_QA_DOS2_DEPS) $(call mb_autoexec_show_gui80,$(DIST_QA_DOS2_BIN)) $(call mb_openmsx_dosctl,$(DIST_QA_DOS2_BIN)) +BUILD_HELP += \\n\\t* $(DIST_QA_DOS2_BIN)/@assert .PHONY: $(DIST_QA_DOS2_BIN)/@assert $(DIST_QA_DOS2_BIN)/@assert: | $(DIST_QA_DOS2_DEPS) $(call mb_delete,$(DIST_QA_DOS2_BIN)/ahello1.out) diff --git a/src/dist-qa-msx1/0module.mk b/src/dist-qa-msx1/0module.mk index e1677e9..d3186f6 100644 --- a/src/dist-qa-msx1/0module.mk +++ b/src/dist-qa-msx1/0module.mk @@ -4,7 +4,6 @@ DIST_QA_MSX1_MOD := dist-qa-msx1 DIST_QA_MSX1_SRC := $(PATH_SRC)/$(DIST_QA_MSX1_MOD) DIST_QA_MSX1_BIN := $(PATH_BIN)/$(DIST_QA_MSX1_MOD) DIST_QA_MSX1_DEPS := $(subst dist,$(DIST_QA_MSX1_MOD),$(DIST_DEPS)) -BUILD_HELP += \\n\\t* $(DIST_QA_MSX1_BIN)/@run\\n\\t* $(DIST_QA_MSX1_BIN)/@assert $(DIST_QA_MSX1_BIN): $(call mb_mkdir,$(DIST_QA_MSX1_BIN)) @@ -12,11 +11,13 @@ $(DIST_QA_MSX1_BIN): $(DIST_QA_MSX1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSX1_BIN) $(DIST_DEPS) $(call mb_copy,$<,$@) +BUILD_HELP += \\n\\t* $(DIST_QA_MSX1_BIN)/@run .PHONY: $(DIST_QA_MSX1_BIN)/@run $(DIST_QA_MSX1_BIN)/@run: | $(DIST_QA_MSX1_DEPS) $(call mb_autoexec_show_gui40,$(DIST_QA_MSX1_BIN)) $(call mb_openmsx_dosctl,$(DIST_QA_MSX1_BIN),$(DIST_QA_MSX1_MACHINE)) +BUILD_HELP += \\n\\t* $(DIST_QA_MSX1_BIN)/@assert .PHONY: $(DIST_QA_MSX1_BIN)/@assert $(DIST_QA_MSX1_BIN)/@assert: | $(DIST_QA_MSX1_DEPS) $(call mb_delete,$(DIST_QA_MSX1_BIN)/ahello1.out) diff --git a/src/dist-qa-msxhub/0module.mk b/src/dist-qa-msxhub/0module.mk index 5610dfb..e3145ad 100644 --- a/src/dist-qa-msxhub/0module.mk +++ b/src/dist-qa-msxhub/0module.mk @@ -3,8 +3,7 @@ DIST_QA_MSXHUB_MACHINE ?= Boosted_MSX2+_JP DIST_QA_MSXHUB_MOD := dist-qa-msxhub DIST_QA_MSXHUB_SRC := $(PATH_SRC)/$(DIST_QA_MSXHUB_MOD) DIST_QA_MSXHUB_BIN := $(PATH_BIN)/$(DIST_QA_MSXHUB_MOD) -DIST_QA_MSXHUB_DEPS := $(subst dist,$(DIST_QA_MSXHUB_MOD),$(DIST_DEPS)) -BUILD_HELP += \\n\\t* $(DIST_QA_MSXHUB_BIN)/@run\\n\\t* $(DIST_QA_MSXHUB_BIN)/@assert +DIST_QA_MSXHUB_DEPS := $(subst dist,$(DIST_QA_MSXHUB_MOD),$(DIST_DEPS)) $(DIST_QA_MSXHUB_BIN): $(call mb_mkdir,$(DIST_QA_MSXHUB_BIN)) @@ -34,11 +33,13 @@ $(DIST_QA_MSXHUB_BIN): $(DIST_QA_MSXHUB_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSXHUB_BIN) $(DIST_DEPS) $(call mb_copy,$<,$@) +BUILD_HELP += \\n\\t* $(DIST_QA_MSXHUB_BIN)/@run .PHONY: $(DIST_QA_MSXHUB_BIN)/@run $(DIST_QA_MSXHUB_BIN)/@run: | $(DIST_QA_MSXHUB_DEPS) $(call mb_autoexec_show_gui80,$(DIST_QA_MSXHUB_BIN),dir/w) $(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB_BIN),$(DIST_QA_MSXHUB_BIN_MACHINE)) +BUILD_HELP += \\n\\t* $(DIST_QA_MSXHUB_BIN)/@assert .PHONY: $(DIST_QA_MSXHUB_BIN)/@assert $(DIST_QA_MSXHUB_BIN)/@assert: | $(DIST_QA_MSXHUB_DEPS) $(call mb_delete,$(DIST_QA_MSXHUB_BIN)/ahello1.out) diff --git a/src/dist/0module.mk b/src/dist/0module.mk index 166fc57..08fe79f 100644 --- a/src/dist/0module.mk +++ b/src/dist/0module.mk @@ -4,7 +4,6 @@ DIST_SRC := $(PATH_SRC)/$(DIST_MOD) DIST_BIN := $(PATH_BIN)/$(DIST_MOD) DIST_OUT := $(PATH_BIN)/$(DIST_MOD).tar.gz DIST_DEPS := $(DIST_BIN)/readme.txt $(DIST_BIN)/ahello1.com $(DIST_BIN)/ahello2.com -BUILD_HELP += \\n\\t* $(DIST_BIN)/@prepare\\n\\t* $(DIST_OUT) $(DIST_BIN): $(call mb_mkdir,$(DIST_BIN)) @@ -18,8 +17,10 @@ $(DIST_BIN)/ahello1.com: bin/ahello-m80/ahello.com | $(DIST_BIN) $(DIST_BIN)/ahello2.com: bin/ahello-sdcc/ahello.com | $(DIST_BIN) $(call mb_copy,$<,$@) +BUILD_HELP += \\n\\t* $(DIST_BIN)/@prepare .PHONY: $(DIST_BIN)/@prepare $(DIST_BIN)/@prepare: | $(DIST_DEPS) +BUILD_HELP += \\n\\t* $(DIST_OUT) $(DIST_OUT): | $(DIST_BIN)/@prepare $(call mb_create_dist,$(DIST_BIN),$@)