diff -r e9c203fb003d -r 994c7df296c9 doc/Makefile.am --- a/doc/Makefile.am Fri Nov 13 12:33:33 2009 +0100 +++ b/doc/Makefile.am Thu Dec 10 17:05:35 2009 +0100 @@ -8,20 +8,31 @@ doc/license.dox \ doc/mainpage.dox \ doc/migration.dox \ + doc/min_cost_flow.dox \ doc/named-param.dox \ doc/namespaces.dox \ doc/html \ doc/CMakeLists.txt DOC_EPS_IMAGES18 = \ + grid_graph.eps \ nodeshape_0.eps \ nodeshape_1.eps \ nodeshape_2.eps \ nodeshape_3.eps \ nodeshape_4.eps +DOC_EPS_IMAGES27 = \ + bipartite_matching.eps \ + bipartite_partitions.eps \ + connected_components.eps \ + edge_biconnected_components.eps \ + node_biconnected_components.eps \ + strongly_connected_components.eps + DOC_EPS_IMAGES = \ - $(DOC_EPS_IMAGES18) + $(DOC_EPS_IMAGES18) \ + $(DOC_EPS_IMAGES27) DOC_PNG_IMAGES = \ $(DOC_EPS_IMAGES:%.eps=doc/gen-images/%.png) @@ -44,6 +55,17 @@ exit 1; \ fi +$(DOC_EPS_IMAGES27:%.eps=doc/gen-images/%.png): doc/gen-images/%.png: doc/images/%.eps + -mkdir doc/gen-images + if test ${gs_found} = yes; then \ + $(GS_COMMAND) -sDEVICE=pngalpha -r27 -sOutputFile=$@ $<; \ + else \ + echo; \ + echo "Ghostscript not found."; \ + echo; \ + exit 1; \ + fi + html-local: $(DOC_PNG_IMAGES) if test ${doxygen_found} = yes; then \ cd doc; \ @@ -69,19 +91,19 @@ install-html-local: doc/html @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(htmldir)/docs + $(mkinstalldirs) $(DESTDIR)$(htmldir)/html for p in doc/html/*.{html,css,png,map,gif,tag} ; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f; \ done uninstall-local: @$(NORMAL_UNINSTALL) for p in doc/html/*.{html,css,png,map,gif,tag} ; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(htmldir)/docs/$$f"; \ - rm -f $(DESTDIR)$(htmldir)/docs/$$f; \ + echo " rm -f $(DESTDIR)$(htmldir)/html/$$f"; \ + rm -f $(DESTDIR)$(htmldir)/html/$$f; \ done .PHONY: update-external-tags