[master] 960e7eb add pdf and svg output to the distribution

Nils Goroll nils.goroll at uplex.de
Thu Mar 10 15:02:03 CET 2016


commit 960e7ebc4a5ad53ded9706e8dd8c9ed9d81b75a2
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Mar 10 14:58:52 2016 +0100

    add pdf and svg output to the distribution
    
    to remove the dependency on graphviz when building from a tarball

diff --git a/doc/graphviz/Makefile.am b/doc/graphviz/Makefile.am
index acbe4fe..772bfb3 100644
--- a/doc/graphviz/Makefile.am
+++ b/doc/graphviz/Makefile.am
@@ -20,9 +20,10 @@ dist-hook:
 # this is a4, letter is 8.5,11
 SIZE	      = 8.4,11.7
 
-EXTRA_DIST = $(srcdir)/*.dot
+EXTRA_DIST = $(srcdir)/*.dot	\
+	$(PDFS)		\
+	$(SVGS)
 
-if HAVE_DOT
 PDFS = \
 	cache_http1_fsm.pdf \
 	cache_req_fsm.pdf \
@@ -33,33 +34,43 @@ SVGS = \
 	cache_req_fsm.svg \
 	cache_fetch.svg
 
+if HAVE_DOT
 CLEANFILES = \
 	$(PDFS)	\
 	$(SVGS)
 endif
 
 pdf: $(PDFS)
+
+html: $(SVGS) link_srcdir
+
+# XXX does not fit onto a4 unless in landscape
+cache_fetch.pdf: cache_fetch.dot
 if ! HAVE_DOT
 	@echo ==================================================
 	@echo You need graphviz installed to generate pdf output
 	@echo ==================================================
 	@false
+else
+	@DOT@ -Tpdf -Gsize=$(SIZE) -Grotate=90 $< >$@
 endif
 
-html: $(SVGS) link_srcdir
+%.pdf: %.dot
 if ! HAVE_DOT
-	@echo ===================================================
-	@echo You need graphviz installed to generate html output
-	@echo ===================================================
+	@echo ==================================================
+	@echo You need graphviz installed to generate pdf output
+	@echo ==================================================
 	@false
-endif
-
-# XXX does not fit onto a4 unless in landscape
-cache_fetch.pdf: cache_fetch.dot
-	@DOT@ -Tpdf -Gsize=$(SIZE) -Grotate=90 $< >$@
-
-%.pdf: %.dot
+else
 	@DOT@ -Tpdf -Gsize=$(SIZE) $< >$@
+endif
 
 %.svg: %.dot
+if ! HAVE_DOT
+	@echo ===================================================
+	@echo You need graphviz installed to generate svg output
+	@echo ===================================================
+	@false
+else
 	@DOT@ -Tsvg $< >$@
+endif



More information about the varnish-commit mailing list