From 6bdb16878a2dd0e0cb60690da88d4f5fd2610922 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sat, 7 Dec 2019 19:21:08 +0000
Subject: [PATCH] make: Replace "pereq" in targets by "deps"

"prereq" is simply impossible to use in explanations with a straight face.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/prereq-installed.mk   |  2 +-
 make/profiler-rules-run.mk |  4 ++--
 make/projects-dir.mk       | 10 +++++-----
 make/rules.mk              |  6 +++---
 make/run.mk                | 20 ++++++++++----------
 make/topdir.mk             |  2 +-
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/make/prereq-installed.mk b/make/prereq-installed.mk
index c4fa373a..60435f6a 100644
--- a/make/prereq-installed.mk
+++ b/make/prereq-installed.mk
@@ -1,4 +1,4 @@
-PREREQ_INSTALLED_TARGETS += run gdb valgrind attach attach-strace libpath valgrind strace debug lldb echo-prereq shortcut check-conf
+PREREQ_INSTALLED_TARGETS += run gdb valgrind attach attach-strace libpath valgrind strace debug lldb echo-deps shortcut check-conf
 
 ifneq ($(filter $(PREREQ_INSTALLED_TARGETS),$(MAKECMDGOALS)),)
 PREREQ_BUILD      += $(shell ls /etc/ld.so.conf.d | sed '/ld-.*.conf/ !d; s/ld-\(.*\).conf/\1/')
diff --git a/make/profiler-rules-run.mk b/make/profiler-rules-run.mk
index 4cac7750..ab84c63f 100644
--- a/make/profiler-rules-run.mk
+++ b/make/profiler-rules-run.mk
@@ -2,10 +2,10 @@
 
 clean: clean.callgrind
 
-callgrind: run-prereq
+callgrind: run-deps
 	$(RM) -f core.*
 	valgrind --tool=callgrind  $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
-callgrind-noinst: run-prereq
+callgrind-noinst: run-deps
 	$(RM) -f core.*
 	valgrind --tool=callgrind --callgrind-out-file=$(CALLGRIND_OUT) --instr-atstart=no $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
 $(CALLGRIND_OUT): callgrind
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index f9b41f50..738f080c 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -171,13 +171,13 @@ build-order-%: $(filter-out $(UNAVAILABLE_TARGETS),pull.done)
 
 build-order: build-order-all
 
-echo-prereq-build:
+echo-build-deps:
 	@$(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build" $(TARGET_PROJECTS)
 
-echo-prereq-install:
+echo-install-deps:
 	@$(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build run" $(TARGET_PROJECTS)
 
-echo-prereq-release:
+echo-release-deps:
 	@$(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build run release" $(TARGET_PROJECTS)
 echo-os:
 	@$(GET_OS_SH)
@@ -227,10 +227,10 @@ cloc:
 pkg-manager-refresh:
 	$(PKG_MANAGER_SH) refresh $(DASH_Y)
 
-pkg-install-prereq-build:
+pkg-install-build-deps:
 	$(PKG_MANAGER_SH) install $(DASH_Y) $(BASE_PKGS) $(shell $(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build" $(TARGET_PROJECTS))
 
-pkg-install-prereq-release:
+pkg-install-release-deps:
 	$(PKG_MANAGER_SH) install $(DASH_Y) $(BASE_PKGS) $(shell $(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build run release" $(TARGET_PROJECTS))
 
 pkg-exclude-built-today:
diff --git a/make/rules.mk b/make/rules.mk
index 8f82c659..3783c6eb 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -33,7 +33,7 @@ distclean: clean
 	mocclean \
 	objclean \
 	pckgclean \
-	prereqclean \
+	depsclean \
 	profclean \
 	push \
 	rccclean \
@@ -106,7 +106,7 @@ libclean:
 vcdistclean:
 	$(RM) -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk
 
-prereqclean:
+depsclean:
 	set -e; for dir in $(PREREQ_DIR); do make -$(MAKEFLAGS) -C $$dir clean; done
 
 profclean:
@@ -222,7 +222,7 @@ echo-include:
 echo-mk:
 	@echo MAKEFILE_LIST = $(MAKEFILE_LIST)
 
-echo-prereq:
+echo-deps:
 	@echo "PREREQ_BUILD      = $(sort $(PREREQ_BUILD))"
 	@echo "PREREQ_INSTALL    = $(sort $(PREREQ_INSTALL))"
 	@echo "PREREQ_RUN        = $(sort $(PREREQ_RUN))"
diff --git a/make/run.mk b/make/run.mk
index abf239b7..2d12a77e 100644
--- a/make/run.mk
+++ b/make/run.mk
@@ -67,24 +67,24 @@ install:
 clean: runclean localclean
 distclean:
 
-run-prereq: all
+run-deps: all
 	$(RM) -f core core.* vgcore vgcore.*
 
 ifeq ($(TARGET),mingw)
-run test: run-prereq
+run test: run-deps
 	@echo "wine $(EXE_PATH) $(EXE_ARGS)"
 	@echo -e "set PATH=%PATH;$(DLL_PATH)\n" \
 		"$(EXE_PATH) $(EXE_ARGS)" | wine cmd
 
-start: run-prereq
+start: run-deps
 	@echo "wine $(EXE_PATH) $(EXE_ARGS)"
 	@echo -e "set PATH=%PATH;$(DLL_PATH)\n" \
 		"$(EXE_PATH) $(EXE_ARGS)" | wine cmd &
 
 else
-run test: run-prereq
+run test: run-deps
 	$(EXE_PATH) $(EXE_ARGS)
-start: run-prereq
+start: run-deps
 	$(EXE_PATH) $(EXE_ARGS) &
 
 which:
@@ -115,13 +115,13 @@ wait-stop:
 
 restart: stop wait-stop all start
 
-valgrind: run-prereq
+valgrind: run-deps
 	valgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
 
-valkyrie: run-prereq
+valkyrie: run-deps
 	valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
 
-efence: run-prereq
+efence: run-deps
 	ef $(EXE_PATH) $(EXE_ARGS)
 
 supp.tmp:
@@ -156,10 +156,10 @@ kill:
 abort:
 	killall -6 $(notdir $(EXE_PATH))
 
-strace: $(EXE_PATH) $(EXE_BIN) run-prereq
+strace: $(EXE_PATH) $(EXE_BIN) run-deps
 	strace -f $(STRACE_EXTRA_OPTS) $(EXE_PATH) $(EXE_ARGS)
 
-tee: $(EXE_PATH) $(EXE_BIN) run-prereq
+tee: $(EXE_PATH) $(EXE_BIN) run-deps
 	$(EXE_PATH) $(EXE_ARGS) 2>&1 | tee run.out
 
 kcg:
diff --git a/make/topdir.mk b/make/topdir.mk
index 18c68c22..c1bac415 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -186,7 +186,7 @@ prefix.done:
 	mkdir -p $(PREFIX)
 	touch $@
 
-echo-prereq-build:
+echo-build-deps:
 	@echo $(call proj_query, required-os-pkg --flavours "build" $(PROJECT))
 
 git-ssh-%: