From d00c8902f9bc1a6a2dc16fc9005b04818ebcfe60 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 25 Feb 2023 16:48:16 -0300 Subject: [PATCH] Whitelist instead of Blacklist for TOOLDIRS in Makefiles --- Makefile | 3 ++- make_tools.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 88303e7f3..50a7e0d25 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,8 @@ JSONPROC := tools/jsonproc/jsonproc$(EXE) PERL := perl -TOOLDIRS := $(filter-out tools/agbcc tools/binutils,$(wildcard tools/*)) +# Inclusive list. If you don't want a tool to be built, don't add it here. +TOOLDIRS := tools/aif2pcm tools/bin2c tools/gbafix tools/gbagfx tools/jsonproc tools/mapjson tools/mid2agb tools/preproc tools/ramscrgen tools/rsfont tools/scaninc TOOLBASE = $(TOOLDIRS:tools/%=%) TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE)) diff --git a/make_tools.mk b/make_tools.mk index 697897a69..7e0baf890 100644 --- a/make_tools.mk +++ b/make_tools.mk @@ -1,7 +1,8 @@ MAKEFLAGS += --no-print-directory -TOOLDIRS := $(filter-out tools/agbcc tools/binutils,$(wildcard tools/*)) +# Inclusive list. If you don't want a tool to be built, don't add it here. +TOOLDIRS := tools/aif2pcm tools/bin2c tools/gbafix tools/gbagfx tools/jsonproc tools/mapjson tools/mid2agb tools/preproc tools/ramscrgen tools/rsfont tools/scaninc .PHONY: all $(TOOLDIRS)