From cebac21893befc656b81cd513189ec226b82fb8a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 14 Nov 2016 08:32:30 +0000
Subject: [PATCH] wmake: Moved wmkdep messages into rules/General/transform
 makefile

---
 wmake/rules/General/transform | 10 ++++++++--
 wmake/src/wmkdep.l            | 15 ---------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/wmake/rules/General/transform b/wmake/rules/General/transform
index 5ac71a66a9..49a5495151 100644
--- a/wmake/rules/General/transform
+++ b/wmake/rules/General/transform
@@ -5,11 +5,15 @@ ifneq ("$(WM_QUIET)","")
     define QUIET_MESSAGE
         @echo "    $1: $2";
     endef
-    QUIET_OP=-s
+    define VERBOSE_MESSAGE
+    endef
 else
     E=
     define QUIET_MESSAGE
     endef
+    define VERBOSE_MESSAGE
+        @echo "$1 $2";
+    endef
     QUIET_OP=
 endif
 
@@ -22,8 +26,10 @@ endef
 $(foreach s,$(SUFFIXES),$(eval $(call DEFINE_TRANSFORM,$(s))))
 
 $(OBJECTS_DIR)/%.dep : %
+	$(call QUIET_MESSAGE,wmkdep,$(<F))
+	$(call VERBOSE_MESSAGE,Making dependency list for source file,$(<F))
 	@$(WM_SCRIPTS)/makeTargetDir $@
-	@$(WMAKE_BIN)/wmkdep $(QUIET_OP) -I$(*D) $(LIB_HEADER_DIRS) $< | \
+	@$(WMAKE_BIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS) $< | \
 		sed -e 's,^$(WM_PROJECT_DIR)/,$$(WM_PROJECT_DIR)/,' \
 			-e 's,^$(WM_THIRD_PARTY_DIR)/,$$(WM_THIRD_PARTY_DIR)/,' > $@
 
diff --git a/wmake/src/wmkdep.l b/wmake/src/wmkdep.l
index 81bede8569..fea0bc5e4f 100644
--- a/wmake/src/wmkdep.l
+++ b/wmake/src/wmkdep.l
@@ -155,21 +155,6 @@ int main(int argc, char* argv[])
     }
 
     sourceFile = strdup(argv[argc-1]);
-    silent = (strncmp(argv[1], "-s", 2) == 0);
-    if (silent)
-    {
-        fprintf(stderr, "    wmkdep: %s\n", basename(sourceFile));
-    }
-    else
-    {
-        fprintf
-        (
-            stderr,
-            "Making dependency list for source file %s\n",
-            sourceFile
-        );
-    }
-
 
     if ((basePos = strrchr(sourceFile, '/')) == NULL)
     {