From ae4a95ecf6e5b9fa2e4c441ff79dd513c2a1f592 Mon Sep 17 00:00:00 2001 From: Lauri Kasanen Date: Wed, 28 Feb 2024 13:21:33 +0200 Subject: [PATCH] Fix some Makefile races --- test/Makefile | 4 ++-- test/asm/Makefile | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/test/Makefile b/test/Makefile index 22e425c9c..25eb0c5d3 100644 --- a/test/Makefile +++ b/test/Makefile @@ -14,9 +14,9 @@ WORKDIR = ../testwrk .PHONY: test continue mostlyclean clean -test: mostlyclean continue +test: continue -continue: +continue: mostlyclean @$(MAKE) -C asm all @$(MAKE) -C dasm all @$(MAKE) -C val all diff --git a/test/asm/Makefile b/test/asm/Makefile index dea53f6b2..5b3bff3f8 100644 --- a/test/asm/Makefile +++ b/test/asm/Makefile @@ -12,23 +12,25 @@ endif WORKDIR = ../testwrk/asm -SUBDIRS = cpudetect opcodes listing val err misc - .PHONY: all continue mostlyclean clean all: mostlyclean continue -define CALL_template +continue: mostlyclean + @$(MAKE) -C cpudetect all + @$(MAKE) -C opcodes all + @$(MAKE) -C listing all + @$(MAKE) -C val all + @$(MAKE) -C err all + @$(MAKE) -C misc all -continue:: - @$(MAKE) -C $1 all - -mostlyclean:: - @$(MAKE) -C $1 clean - -endef - -$(foreach subdir,$(SUBDIRS),$(eval $(call CALL_template,$(subdir)))) +mostlyclean: + @$(MAKE) -C cpudetect clean + @$(MAKE) -C opcodes clean + @$(MAKE) -C listing clean + @$(MAKE) -C val clean + @$(MAKE) -C err clean + @$(MAKE) -C misc clean clean: mostlyclean @$(call RMDIR,$(WORKDIR))