Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sphinx] Reduce build chatter
authorPeter D. Barnes, Jr. <barnes26@llnl.gov>
Wed, 08 Oct 2014 17:48:38 -0700
changeset 11001 0c5c87e8d9fd
parent 11000 303c6b6d436f
child 11002 80e12ddf6d72
Sphinx] Reduce build chatter
doc/manual/Makefile file | annotate | diff | comparison | revisions
doc/models/Makefile file | annotate | diff | comparison | revisions
doc/tutorial-pt-br/Makefile file | annotate | diff | comparison | revisions
doc/tutorial/Makefile file | annotate | diff | comparison | revisions
utils/rescale-pdf.sh file | annotate | diff | comparison | revisions 
--- 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)
 
--- 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.
--- 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 <target>' where <target> is one of"
--- 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 <target>' where <target> is one of"
--- 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}
ns-3.24