From cda3e845b8f7594032d0bf4bbb7f3ca267a06568 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@ryansg.com>
Date: Mon, 22 Feb 2021 16:28:31 -0500
Subject: [PATCH] Remove verbose messages from suppliers.mk generation

* build-aux/Makefile.am (suppliers.mk): Invoke ant with `-q` to eliminate
"processing" messages for each and every file.  This also speeds up
operation slightly.
* build-aux/gen-make: Remove information echos for each file.

These changes will allow for suppliers.mk to be regenerated automatically
without being so invasive.
---
 RELEASES.md           | 2 ++
 build-aux/Makefile.am | 2 +-
 build-aux/gen-make    | 3 ---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/RELEASES.md b/RELEASES.md
index b1d27fe1..c9b8cd7e 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -39,6 +39,8 @@ Build System
   accommodate liza-proguic's step-level package generation.
 - Step-level program packages are now properly accounted for as dependencies
   for builds.
+- `supplier.mk` generation will no longer be verbose (it'll instead be only
+  one line), which makes it more amenable to more frequent regeneration.
 
 
 v17.7.0 (2020-12-09)
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index 8fa28d4c..bcdaa46a 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -262,7 +262,7 @@ clean:
 # that territory and rate packages also have includes; see top of this file for
 # an explanation
 suppliers.mk: $(path_ui)/package-dfns.xml
-	$(ant) pkg-dep
+	$(ant) -q pkg-dep
 	find $(path_ui)/program/ -name '*.dep' | xargs cat $(path_ui)/program.dep | sort -u \
 	  > $(path_ui)/package-dfns.dep
 	$(RM) $(path_ui)/program.dep
diff --git a/build-aux/gen-make b/build-aux/gen-make
index e72dc555..ee9e2207 100755
--- a/build-aux/gen-make
+++ b/build-aux/gen-make
@@ -60,7 +60,6 @@ resolv-path()
 
 until [ $# -eq 0 ]; do (
   path="${1%%/}"
-  echo "[gen-make] scanning $path" >&2
 
   cd "$path" || exit $?
 
@@ -72,8 +71,6 @@ until [ $# -eq 0 ]; do (
     d="${dpath##*/}"
     sansext="${d%.*}"
 
-    echo "[gen-make] found $path/$d" >&2
-
     # this might be derived from another file
     # TODO: handle all cases, not just typelists!
     if [ -f "$sansext.typelist" ]; then