From ed0baf7c1c5f9015e7863fefa238dc3232ae0733 Mon Sep 17 00:00:00 2001
From: Suresh Sundriyal <sureshsundriyal@gmail.com>
Date: Wed, 25 Mar 2015 02:13:18 -0700
Subject: [PATCH] [build] Add custom silent rules.

Add custom silent rules for ptime/bin2c/sqlite3/rm commands.
---
 src/Makefile.am  | 18 +++++++++++++-----
 src/Makefile.in  | 16 +++++++++++-----
 test/Makefile.am | 16 ++++++++++++----
 test/Makefile.in | 14 ++++++++++----
 4 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 1781b5fe..b099aba8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,20 +5,28 @@ noinst_PROGRAMS = bin2c ptimec lnav-test
 
 noinst_LIBRARIES = libdiag.a
 
+PTIME_V = $(PTIME_V_@AM_V@)
+PTIME_V_ = $(PTIME_V_@AM_DEFAULT_V@)
+PTIME_V_0 = @echo "  TIMEFMT " $@;
+
+BIN2C_V = $(BIN2C_V_@AM_V@)
+BIN2C_V_ = $(BIN2C_V_@AM_DEFAULT_V@)
+BIN2C_V_0 = @echo "  BIN2C   " $@;
+
 help.c: $(srcdir)/help.txt bin2c
-	./bin2c -z -c $(srcdir)/help.txt $@
+	$(BIN2C_V)./bin2c -z -c $(srcdir)/help.txt $@
 
 dump-pid-sh.c: $(srcdir)/dump-pid.sh bin2c
-	./bin2c -z -c $(srcdir)/dump-pid.sh $@
+	$(BIN2C_V)./bin2c -z -c $(srcdir)/dump-pid.sh $@
 
 default-log-formats-json.c: $(srcdir)/default-log-formats.json bin2c
-	./bin2c -z -c $(srcdir)/default-log-formats.json $@
+	$(BIN2C_V)./bin2c -z -c $(srcdir)/default-log-formats.json $@
 
 init.sql: $(srcdir)/init_sql.py
 	$(PYTHON) $(srcdir)/init_sql.py > $@
 
 init-sql.c: $(srcdir)/init.sql bin2c
-	./bin2c -z -c $(srcdir)/init.sql $@
+	$(BIN2C_V)./bin2c -z -c $(srcdir)/init.sql $@
 
 TIME_FORMATS = \
     "%Y-%m-%d %H:%M:%S" \
@@ -42,7 +50,7 @@ TIME_FORMATS = \
     "%M:%S"
 
 time_fmts.cc: ptimec
-	./ptimec $(TIME_FORMATS) > $@
+	$(PTIME_V)./ptimec $(TIME_FORMATS) > $@
 
 AM_LDFLAGS = \
 	$(STATIC_LDFLAGS) \
diff --git a/src/Makefile.in b/src/Makefile.in
index 08fc1dee..279e0d81 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -452,6 +452,12 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libdiag.a
+PTIME_V = $(PTIME_V_@AM_V@)
+PTIME_V_ = $(PTIME_V_@AM_DEFAULT_V@)
+PTIME_V_0 = @echo "  TIMEFMT " $@;
+BIN2C_V = $(BIN2C_V_@AM_V@)
+BIN2C_V_ = $(BIN2C_V_@AM_DEFAULT_V@)
+BIN2C_V_0 = @echo "  BIN2C   " $@;
 TIME_FORMATS = \
     "%Y-%m-%d %H:%M:%S" \
     "%Y-%m-%d %H:%M" \
@@ -1049,22 +1055,22 @@ uninstall-am: uninstall-binPROGRAMS
 
 
 help.c: $(srcdir)/help.txt bin2c
-	./bin2c -z -c $(srcdir)/help.txt $@
+	$(BIN2C_V)./bin2c -z -c $(srcdir)/help.txt $@
 
 dump-pid-sh.c: $(srcdir)/dump-pid.sh bin2c
-	./bin2c -z -c $(srcdir)/dump-pid.sh $@
+	$(BIN2C_V)./bin2c -z -c $(srcdir)/dump-pid.sh $@
 
 default-log-formats-json.c: $(srcdir)/default-log-formats.json bin2c
-	./bin2c -z -c $(srcdir)/default-log-formats.json $@
+	$(BIN2C_V)./bin2c -z -c $(srcdir)/default-log-formats.json $@
 
 init.sql: $(srcdir)/init_sql.py
 	$(PYTHON) $(srcdir)/init_sql.py > $@
 
 init-sql.c: $(srcdir)/init.sql bin2c
-	./bin2c -z -c $(srcdir)/init.sql $@
+	$(BIN2C_V)./bin2c -z -c $(srcdir)/init.sql $@
 
 time_fmts.cc: ptimec
-	./ptimec $(TIME_FORMATS) > $@
+	$(PTIME_V)./ptimec $(TIME_FORMATS) > $@
 
 uncrusty:
 	(cd $(srcdir) && uncrustify -c ../lnav.cfg --replace $(SOURCES) \
diff --git a/test/Makefile.am b/test/Makefile.am
index 2c14074a..d73e5b32 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,9 +2,17 @@
 TESTS_ENVIRONMENT = $(SHELL) $(top_builddir)/TESTS_ENVIRONMENT
 LOG_COMPILER = $(SHELL) $(top_builddir)/TESTS_ENVIRONMENT
 
+DBGEN_V = $(DBGEN_V_@AM_V@)
+DBGEN_V_ = $(DBGEN_V_@AM_DEFAULT_V@)
+DBGEN_V_0 = @echo "  DBGEN   " $@;
+
+RM_V = $(RM_V_@AM_V@)
+RM_V_ = $(RM_V_@AM_DEFAULT_V@)
+RM_V_0 = @echo "  RM      " $@;
+
 simple-db.db: simple-db.sql
-	rm -f $@
-	$(SQLITE3_CMD) $@ < $(srcdir)/simple-db.sql
+	$(RM_V)rm -f $@
+	$(DBGEN_V)$(SQLITE3_CMD) $@ < $(srcdir)/simple-db.sql
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
@@ -291,5 +299,5 @@ DISTCLEANFILES = \
 	test.log
 
 distclean-local:
-	rm -rf sessions
-	rm -rf .lnav
+	$(RM_V)rm -rf sessions
+	$(RM_V)rm -rf .lnav
diff --git a/test/Makefile.in b/test/Makefile.in
index 71b9ae71..b6dba6c2 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -664,6 +664,12 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 TESTS_ENVIRONMENT = $(SHELL) $(top_builddir)/TESTS_ENVIRONMENT
 LOG_COMPILER = $(SHELL) $(top_builddir)/TESTS_ENVIRONMENT
+DBGEN_V = $(DBGEN_V_@AM_V@)
+DBGEN_V_ = $(DBGEN_V_@AM_DEFAULT_V@)
+DBGEN_V_0 = @echo "  DBGEN   " $@;
+RM_V = $(RM_V_@AM_V@)
+RM_V_ = $(RM_V_@AM_DEFAULT_V@)
+RM_V_0 = @echo "  RM      " $@;
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	$(SQLITE3_CFLAGS)
@@ -1653,12 +1659,12 @@ uninstall-am:
 
 
 simple-db.db: simple-db.sql
-	rm -f $@
-	$(SQLITE3_CMD) $@ < $(srcdir)/simple-db.sql
+	$(RM_V)rm -f $@
+	$(DBGEN_V)$(SQLITE3_CMD) $@ < $(srcdir)/simple-db.sql
 
 distclean-local:
-	rm -rf sessions
-	rm -rf .lnav
+	$(RM_V)rm -rf sessions
+	$(RM_V)rm -rf .lnav
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.