From eac123833aecbcc60a264236c1969d6c7727519b Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 25 Apr 2017 10:38:42 +0000 Subject: [PATCH] run.mk: Add target run-prereq All targets running something now have this phony target among there prerequisites. Meant as a synchronization point, and also to be used by including makefiles. Signed-off-by: Jan Lindemann --- make/run.mk | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/make/run.mk b/make/run.mk index 88a90d11..5e7c0dde 100644 --- a/make/run.mk +++ b/make/run.mk @@ -45,13 +45,15 @@ install: clean: distclean: +run-prereq: all + ifeq ($(TARGET),mingw) -run test: all +run test: run-prereq @echo "wine $(EXE_PATH) $(EXE_ARGS)" @echo -e "set PATH=%PATH;$(DLL_PATH)\n" \ "$(EXE_PATH) $(EXE_ARGS)" | wine cmd -start: all +start: run-prereq @echo "wine $(EXE_PATH) $(EXE_ARGS)" @echo -e "set PATH=%PATH;$(DLL_PATH)\n" \ "$(EXE_PATH) $(EXE_ARGS)" | wine cmd & @@ -62,10 +64,10 @@ winrunclean: rm -f start.bat else -run test: all +run test: run-prereq rm -f core.* $(EXE_PATH) $(EXE_ARGS) -start: all +start: run-prereq rm -f core.* $(EXE_PATH) $(EXE_ARGS) & @@ -91,15 +93,15 @@ wait-stop: restart: stop wait-stop all start -valgrind: +valgrind: run-prereq rm -f core.* valgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) -valkyrie: +valkyrie: run-prereq rm -f core.* valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) - -efence: + +efence: run-prereq rm -f core.* ef $(EXE_PATH) $(EXE_ARGS) @@ -119,11 +121,11 @@ vg-clean-supp: clean.out: rm -f run.out -callgrind: +callgrind: run-prereq rm -f core.* valgrind --tool=callgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) -callgrind-noinst: +callgrind-noinst: run-prereq rm -f core.* valgrind --tool=callgrind $(VALGRIND_OPTS) --instr-atstart=no $(EXE_PATH) $(EXE_ARGS) @@ -153,10 +155,10 @@ kill: abort: killall -6 $(notdir $(EXE_PATH)) -strace: $(EXE_PATH) $(EXE_BIN) +strace: $(EXE_PATH) $(EXE_BIN) run-prereq strace -f $(STRACE_EXTRA_OPTS) $(EXE_PATH) $(EXE_ARGS) -tee: $(EXE_PATH) $(EXE_BIN) all +tee: $(EXE_PATH) $(EXE_BIN) run-prereq rm -f core.* $(EXE_PATH) $(EXE_ARGS) 2>&1 | tee run.out