pipeline: improve reliability of certain make targets (test, clean)

diff --git a/Makefile b/Makefile
index 4040d6d2a9c6c83308cfbe24e96e6b89c564f87b..06d18db8571f45200f93da8812c1bb3f36f1e872 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ DIFF ?= diff
 # xonotic build system overrides this by command line argument to turn off the check-cvars step
 XON_BUILDSYSTEM =
 
+# If requested, these targets must always run first:
+.EXTRA_PREREQS := $(filter clean, $(MAKECMDGOALS))
+
 .PHONY: all
 all: check-cvars
        $(MAKE) -C qcsrc all

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index 4994469c195f188a6200fc0f76b763f1da34bb08..ce59dcaf38fde56940cba5a30ddd4536587d236a 100644 (file)
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -24,12 +24,15 @@ ifndef ZIP
 endif
 
 
+# If requested, these targets must always run first:
+.EXTRA_PREREQS := $(filter clean, $(MAKECMDGOALS))
 
 .PHONY: all
 all: qc pk3
 
 $(WORKDIR):
        @mkdir -p $@
+$(WORKDIR): .EXTRA_PREREQS =  # prevents circular dependency
 
 .PHONY: clean
 clean: | $(WORKDIR)
@@ -59,13 +62,13 @@ pk3: csprogs-$(VER).pk3
 
 
 
-DIFFTESTS = test-genmod test-cvar-spelling
+DIFFTESTS = test-genmod .WAIT test-cvar-spelling
 COMPTESTS = test-server test-client test-menu
 .PHONY: test test-diff $(DIFFTESTS) test-comp $(COMPTESTS)
 
-test: $(DIFFTESTS) $(COMPTESTS)
+test: $(DIFFTESTS) .WAIT $(COMPTESTS)
 
-test-diff: test-genmod test-cvar-spelling
+test-diff: $(DIFFTESTS)
 test-genmod:
        tools/scripts-diff-test-wrapper.sh genmod.sh
 test-cvar-spelling: