From facea70bb1723ae10b8883227846adba54bf56ca Mon Sep 17 00:00:00 2001 From: Willem Date: Fri, 2 Jul 2021 21:01:12 +0200 Subject: [PATCH] Cleaned space. --- Makefile | 16 ++++++++-------- src/bios/0module.mk | 2 +- src/dist-run/0module.mk | 2 +- src/dome/0module.mk | 2 +- src/domelib/0module.mk | 2 +- src/gfx/0module.mk | 2 +- src/init/0module.mk | 2 +- src/levels/0module.mk | 2 +- src/loader/0module.mk | 2 +- src/makelib/0module.mk | 2 +- src/menu/0module.mk | 2 +- src/mmenu/0module.mk | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 1835e40..95bac08 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,14 @@ # Top level makefile for dome # -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." -BUILD_HELP := "Use one of the following build targets;" -MB_OPENMSX_JOYPORTA := mouse +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." +BUILD_HELP := "Use one of the following build targets;" +MB_OPENMSX_JOYPORTA := mouse .SUFFIXES: .PHONY: all diff --git a/src/bios/0module.mk b/src/bios/0module.mk index 59bf032..2689c07 100644 --- a/src/bios/0module.mk +++ b/src/bios/0module.mk @@ -6,7 +6,7 @@ BIOS_HEX := $(BIOS_BIN)/$(BIOS_NAME).hex BIOS_DAT := $(BIOS_BIN)/$(BIOS_NAME).dat BIOS_RELS := $(BIOS_BIN)/$(BIOS_NAME).rel BIOS_CODE := $(BIOS_SRC)/$(BIOS_NAME).asm -BUILD_HELP += \\n\\t* $(BIOS_DAT) +BUILD_HELP += \\n\\t* $(BIOS_DAT) $(BIOS_BIN): $(call mb_mkdir,$(BIOS_BIN)) diff --git a/src/dist-run/0module.mk b/src/dist-run/0module.mk index b9c0023..d2cb257 100644 --- a/src/dist-run/0module.mk +++ b/src/dist-run/0module.mk @@ -4,7 +4,7 @@ DIST_RUN_BIN := $(PATH_BIN)/$(DIST_RUN_NAME) DIST_RUN_SRC := $(PATH_SRC)/$(DIST_RUN_NAME) DIST_RUN_INC := init.com dome.000 DIST_RUN_INC_BIN := $(patsubst %,$(DIST_RUN_BIN)/%,$(DIST_RUN_INC)) -BUILD_HELP += \\n\\t* $(DIST_RUN_NAME) +BUILD_HELP += \\n\\t* $(DIST_RUN_NAME) $(DIST_RUN_BIN): $(call mb_mkdir,$(DIST_RUN_BIN)) diff --git a/src/dome/0module.mk b/src/dome/0module.mk index 116e137..f7b1818 100644 --- a/src/dome/0module.mk +++ b/src/dome/0module.mk @@ -6,7 +6,7 @@ DOME_HEX := $(DOME_BIN)/$(DOME_NAME).hex DOME_DAT := $(DOME_BIN)/$(DOME_NAME).dat DOME_RELS := $(DOME_BIN)/$(DOME_NAME).rel DOME_CODE := $(DOME_SRC)/$(DOME_NAME).asm -BUILD_HELP += \\n\\t* $(DOME_DAT) +BUILD_HELP += \\n\\t* $(DOME_DAT) # TODO fix build trigger on ai_new.asm diff --git a/src/domelib/0module.mk b/src/domelib/0module.mk index 3ea9a42..a3509e7 100644 --- a/src/domelib/0module.mk +++ b/src/domelib/0module.mk @@ -3,6 +3,7 @@ DOMELIB_NAME := domelib DOMELIB_SRC := $(PATH_SRC)/$(DOMELIB_NAME) DOMELIB_BIN := $(PATH_BIN)/$(DOMELIB_NAME) DOMELIB_OUT := $(PATH_BIN)/$(DOMELIB_NAME)/dome.000 +BUILD_HELP += \\n\\t* $(DOMELIB_OUT) DOMELIB_DEPS := \ $(PATH_BIN)/bios/bios.dat \ $(PATH_BIN)/dome/dome.dat \ @@ -10,7 +11,6 @@ $(PATH_BIN)/loader/loader.dat \ $(PATH_BIN)/makelib/makelib.com \ $(PATH_BIN)/menu/menu.dat \ $(PATH_BIN)/mmenu/mmenu.dat -BUILD_HELP += \\n\\t* $(DOMELIB_OUT) $(DOMELIB_BIN): $(call mb_mkdir,$(DOMELIB_BIN)) diff --git a/src/gfx/0module.mk b/src/gfx/0module.mk index 9925713..b7cd696 100644 --- a/src/gfx/0module.mk +++ b/src/gfx/0module.mk @@ -4,7 +4,7 @@ GFX_SRC := $(PATH_SRC)/$(GFX_NAME) GFX_BIN := $(PATH_BIN)/$(GFX_NAME) GFX_SRC_FILES := $(call rwildcard, $(PATH_SRC)/$(GFX_NAME), *.ge5) GFX_BIN_FILES := $(patsubst $(PATH_SRC)/$(GFX_NAME)/%.ge5,$(GFX_BIN)/%.zop,$(GFX_SRC_FILES)) -BUILD_HELP += \\n\\t* gfx / test-gfx +BUILD_HELP += \\n\\t* gfx / test-gfx # TODO: add unittot.ge5 # diff --git a/src/init/0module.mk b/src/init/0module.mk index ce2261f..f60ad70 100644 --- a/src/init/0module.mk +++ b/src/init/0module.mk @@ -6,7 +6,7 @@ INIT_HEX := $(INIT_BIN)/$(INIT_NAME).hex INIT_COM := $(INIT_BIN)/$(INIT_NAME).com INIT_RELS := $(INIT_BIN)/$(INIT_NAME).rel INIT_CODE := $(INIT_SRC)/$(INIT_NAME).asm -BUILD_HELP += \\n\\t* $(INIT_COM) +BUILD_HELP += \\n\\t* $(INIT_COM) $(INIT_BIN): $(call mb_mkdir,$(INIT_BIN)) diff --git a/src/levels/0module.mk b/src/levels/0module.mk index 65a5e4a..cf05893 100644 --- a/src/levels/0module.mk +++ b/src/levels/0module.mk @@ -2,7 +2,7 @@ LEVELS_NAME := levels LEVELS_SRC := $(PATH_SRC)/$(LEVELS_NAME) LEVELS_BIN := $(PATH_BIN)/$(LEVELS_NAME) -BUILD_HELP += \\n\\t* $(LEVELS_BIN)/code.001 / $(LEVELS_BIN)/code.002 +BUILD_HELP += \\n\\t* $(LEVELS_BIN)/code.001 / $(LEVELS_BIN)/code.002 $(LEVELS_BIN): $(call mb_mkdir,$(LEVELS_BIN)) diff --git a/src/loader/0module.mk b/src/loader/0module.mk index 1ec93c4..c6cb185 100644 --- a/src/loader/0module.mk +++ b/src/loader/0module.mk @@ -6,7 +6,7 @@ LOADER_HEX := $(LOADER_BIN)/$(LOADER_NAME).hex LOADER_DAT := $(LOADER_BIN)/$(LOADER_NAME).dat LOADER_RELS := $(LOADER_BIN)/$(LOADER_NAME).rel LOADER_CODE := $(LOADER_SRC)/$(LOADER_NAME).asm -BUILD_HELP += \\n\\t* $(LOADER_DAT) +BUILD_HELP += \\n\\t* $(LOADER_DAT) $(LOADER_BIN): $(call mb_mkdir,$(LOADER_BIN)) diff --git a/src/makelib/0module.mk b/src/makelib/0module.mk index 1ca32fc..64dddfc 100644 --- a/src/makelib/0module.mk +++ b/src/makelib/0module.mk @@ -6,7 +6,7 @@ MAKELIB_HEX := $(MAKELIB_BIN)/$(MAKELIB_NAME).hex MAKELIB_COM := $(MAKELIB_BIN)/$(MAKELIB_NAME).com MAKELIB_RELS := $(MAKELIB_BIN)/$(MAKELIB_NAME).rel MAKELIB_CODE := $(MAKELIB_SRC)/$(MAKELIB_NAME).asm -BUILD_HELP += \\n\\t* $(MAKELIB_COM) +BUILD_HELP += \\n\\t* $(MAKELIB_COM) $(MAKELIB_BIN): $(call mb_mkdir,$(MAKELIB_BIN)) diff --git a/src/menu/0module.mk b/src/menu/0module.mk index 56d4c92..a070e45 100644 --- a/src/menu/0module.mk +++ b/src/menu/0module.mk @@ -6,7 +6,7 @@ MENU_HEX := $(MENU_BIN)/$(MENU_NAME).hex MENU_DAT := $(MENU_BIN)/$(MENU_NAME).dat MENU_RELS := $(MENU_BIN)/$(MENU_NAME).rel MENU_CODE := $(MENU_SRC)/$(MENU_NAME).asm -BUILD_HELP += \\n\\t* $(MENU_DAT) +BUILD_HELP += \\n\\t* $(MENU_DAT) $(MENU_BIN): $(call mb_mkdir,$(MENU_BIN)) diff --git a/src/mmenu/0module.mk b/src/mmenu/0module.mk index 24448c6..8cd36e1 100644 --- a/src/mmenu/0module.mk +++ b/src/mmenu/0module.mk @@ -6,7 +6,7 @@ MMENU_HEX := $(MMENU_BIN)/$(MMENU_NAME).hex MMENU_DAT := $(MMENU_BIN)/$(MMENU_NAME).dat MMENU_RELS := $(MMENU_BIN)/$(MMENU_NAME).rel MMENU_CODE := $(MMENU_SRC)/$(MMENU_NAME).asm -BUILD_HELP += \\n\\t* $(MMENU_DAT) +BUILD_HELP += \\n\\t* $(MMENU_DAT) $(MMENU_BIN): $(call mb_mkdir,$(MMENU_BIN))