From 2aebf375421e89de6beca59a10590d02911cee53 Mon Sep 17 00:00:00 2001
From: "Peter D. Barnes, Jr." <barnes26@llnl.gov>
Date: Wed, 8 Oct 2014 17:48:38 -0700
Subject: [PATCH] Sphinx] Reduce build chatter

---
 doc/manual/Makefile         | 23 ++++++++++++++++-------
 doc/models/Makefile         | 18 ++++++++++++++----
 doc/tutorial-pt-br/Makefile | 19 ++++++++++++++++---
 doc/tutorial/Makefile       | 19 ++++++++++++++++---
 utils/rescale-pdf.sh        |  3 ++-
 5 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index b304106f4..11ecafc7d 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -90,13 +90,22 @@ IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)
 
 RESCALE = ../../utils/rescale-pdf.sh
 
-%.eps : %.dia; $(DIA) -t eps $< -e $@
-%.png : %.dia; $(DIA) -t png $< -e $@
-%.png : %.eps; $(CONVERT) $< $@
-%.pdf : %.eps;
-	$(EPSTOPDF) $< -o=$@
-	if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
+%.eps : %.dia
+	@echo dia $(notdir $<)
+	@$(DIA) -t eps $< -e $@ >/dev/null
 
+%.png : %.dia
+	@echo dia $(notdir $<)
+	@$(DIA) -t png $< -e $@ >/dev/null
+
+%.png : %.eps
+	@echo convert $(notdir $<)
+	@$(CONVERT) $< $@ >/dev/null
+
+%.pdf : %.eps
+	@echo epstopdf $(notdir $<)
+	@$(EPSTOPDF) $< -o=$@ >/dev/null
+	@if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
@@ -135,7 +144,7 @@ help:
 copy-sources:  $(SOURCES)
 	@rm -rf $(SOURCETEMP)
 	@mkdir -p $(SOURCETEMP) 
-	@mkdir -p $(FIGURES) 
+	@mkdir -p $(FIGURES)
 	@cp -r $(SOURCES) $(SOURCETEMP)
 	@cp -r $(SOURCEFIGS) $(FIGURES)
 
diff --git a/doc/models/Makefile b/doc/models/Makefile
index b65254d4a..07faf4977 100644
--- a/doc/models/Makefile
+++ b/doc/models/Makefile
@@ -388,11 +388,21 @@ IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)
 
 RESCALE = ../../utils/rescale-pdf.sh
 
-%.eps : %.dia; $(DIA) -t eps $< -e $@
-%.png : %.dia; $(DIA) -t png $< -e $@
-%.png : %.eps; $(CONVERT) $< $@
+%.eps : %.dia
+	@echo dia $(notdir $<)
+	@$(DIA) -t eps $< -e $@ >/dev/null
+
+%.png : %.dia
+	@echo dia $(notdir $<)
+	@$(DIA) -t png $< -e $@ >/dev/null
+
+%.png : %.eps
+	@echo convert $(notdir $<)
+	@$(CONVERT) $< $@ >/dev/null
+
 %.pdf : %.eps
-	$(EPSTOPDF) $< -o=$@
+	@echo epstopdf $(notdir $<)
+	@$(EPSTOPDF) $< -o=$@ >/dev/null
 	@if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 
 # You can set these variables from the command line.
diff --git a/doc/tutorial-pt-br/Makefile b/doc/tutorial-pt-br/Makefile
index 514eebde1..ea2ecc46f 100644
--- a/doc/tutorial-pt-br/Makefile
+++ b/doc/tutorial-pt-br/Makefile
@@ -27,9 +27,22 @@ IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)
 
 .NOTPARALLEL:
 
-%.eps : %.dia; $(DIA) -t eps $< -e $@
-%.png : %.dia; $(DIA) -t png $< -e $@
-%.pdf : %.eps; $(EPSTOPDF) $< -o=$@
+%.eps : %.dia
+	@echo dia $(notdir $<)
+	@$(DIA) -t eps $< -e $@ >/dev/null
+
+%.png : %.dia
+	@echo dia $(notdir $<)
+	@$(DIA) -t png $< -e $@ >/dev/null
+
+%.png : %.eps
+	@echo convert $(notdir $<)
+	@$(CONVERT) $< $@ >/dev/null
+
+%.pdf : %.eps
+	@echo epstopdf $(notdir $<)
+	@$(EPSTOPDF) $< -o=$@ >/dev/null
+	@if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
diff --git a/doc/tutorial/Makefile b/doc/tutorial/Makefile
index 514eebde1..ea2ecc46f 100644
--- a/doc/tutorial/Makefile
+++ b/doc/tutorial/Makefile
@@ -27,9 +27,22 @@ IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)
 
 .NOTPARALLEL:
 
-%.eps : %.dia; $(DIA) -t eps $< -e $@
-%.png : %.dia; $(DIA) -t png $< -e $@
-%.pdf : %.eps; $(EPSTOPDF) $< -o=$@
+%.eps : %.dia
+	@echo dia $(notdir $<)
+	@$(DIA) -t eps $< -e $@ >/dev/null
+
+%.png : %.dia
+	@echo dia $(notdir $<)
+	@$(DIA) -t png $< -e $@ >/dev/null
+
+%.png : %.eps
+	@echo convert $(notdir $<)
+	@$(CONVERT) $< $@ >/dev/null
+
+%.pdf : %.eps
+	@echo epstopdf $(notdir $<)
+	@$(EPSTOPDF) $< -o=$@ >/dev/null
+	@if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
diff --git a/utils/rescale-pdf.sh b/utils/rescale-pdf.sh
index 5c7f418d4..f6cc4e56f 100755
--- a/utils/rescale-pdf.sh
+++ b/utils/rescale-pdf.sh
@@ -4,7 +4,8 @@ TMPDIR=${TMPDIR:-/tmp}
 
 TMPFILE=`mktemp -t $(basename ${2}).XXXXXX`
 
-echo "Rescaling ${2} to ${1}"
+ME=$(basename $0)
+echo "$ME $(basename ${2}) to ${1}"
 
 echo "
 \documentclass{book}