# HG changeset patch # User Peter D. Barnes, Jr. # Date 1412815718 25200 # Node ID 0c5c87e8d9fd924e0af3c9c50e366db85548181d # Parent 303c6b6d436fe33dca2b6688dfff6c18442d7dee Sphinx] Reduce build chatter diff -r 303c6b6d436f -r 0c5c87e8d9fd doc/manual/Makefile --- a/doc/manual/Makefile Wed Oct 08 17:47:34 2014 -0700 +++ b/doc/manual/Makefile Wed Oct 08 17:48:38 2014 -0700 @@ -90,13 +90,22 @@ 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 @@ copy-sources: $(SOURCES) @rm -rf $(SOURCETEMP) @mkdir -p $(SOURCETEMP) - @mkdir -p $(FIGURES) + @mkdir -p $(FIGURES) @cp -r $(SOURCES) $(SOURCETEMP) @cp -r $(SOURCEFIGS) $(FIGURES) diff -r 303c6b6d436f -r 0c5c87e8d9fd doc/models/Makefile --- a/doc/models/Makefile Wed Oct 08 17:47:34 2014 -0700 +++ b/doc/models/Makefile Wed Oct 08 17:48:38 2014 -0700 @@ -388,11 +388,21 @@ 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 -r 303c6b6d436f -r 0c5c87e8d9fd doc/tutorial-pt-br/Makefile --- a/doc/tutorial-pt-br/Makefile Wed Oct 08 17:47:34 2014 -0700 +++ b/doc/tutorial-pt-br/Makefile Wed Oct 08 17:48:38 2014 -0700 @@ -27,9 +27,22 @@ .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 ' where is one of" diff -r 303c6b6d436f -r 0c5c87e8d9fd doc/tutorial/Makefile --- a/doc/tutorial/Makefile Wed Oct 08 17:47:34 2014 -0700 +++ b/doc/tutorial/Makefile Wed Oct 08 17:48:38 2014 -0700 @@ -27,9 +27,22 @@ .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 ' where is one of" diff -r 303c6b6d436f -r 0c5c87e8d9fd utils/rescale-pdf.sh --- a/utils/rescale-pdf.sh Wed Oct 08 17:47:34 2014 -0700 +++ b/utils/rescale-pdf.sh Wed Oct 08 17:48:38 2014 -0700 @@ -4,7 +4,8 @@ TMPFILE=`mktemp -t $(basename ${2}).XXXXXX` -echo "Rescaling ${2} to ${1}" +ME=$(basename $0) +echo "$ME $(basename ${2}) to ${1}" echo " \documentclass{book}