From fc300ab0ee63a1ecbcead67c3a7019a0bfe8deb5 Mon Sep 17 00:00:00 2001 From: Ben10do Date: Sat, 10 Jun 2017 18:21:38 +0100 Subject: [PATCH] Fix parallelisation issues in Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduces a minor hack, in order to ensure that the tools are built before the Makefile attempts to use any of the tools, even when using ‘make -j’. --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index eb2e60148..19ca8e15a 100644 --- a/Makefile +++ b/Makefile @@ -29,8 +29,15 @@ crystal11_obj := $(crystal_obj:.o=11.o) roms := pokecrystal.gbc pokecrystal11.gbc all: crystal -crystal: tools pokecrystal.gbc -crystal11: tools pokecrystal11.gbc +crystal: pokecrystal.gbc +crystal11: pokecrystal11.gbc + +# Ensure that the tools are built when making the ROM +ifneq ($(MAKECMDGOALS),clean) +ifneq ($(MAKECMDGOALS),tools) +Makefile: tools +endif +endif clean: rm -f $(roms) $(crystal_obj) $(crystal11_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)