1.1 --- a/doc/Makefile.am	Fri Oct 16 10:21:37 2009 +0200
     1.2 +++ b/doc/Makefile.am	Thu Nov 05 15:50:01 2009 +0100
     1.3 @@ -8,20 +8,31 @@
     1.4  	doc/license.dox \
     1.5  	doc/mainpage.dox \
     1.6  	doc/migration.dox \
     1.7 +	doc/min_cost_flow.dox \
     1.8  	doc/named-param.dox \
     1.9  	doc/namespaces.dox \
    1.10  	doc/html \
    1.11  	doc/CMakeLists.txt
    1.12  
    1.13  DOC_EPS_IMAGES18 = \
    1.14 +	grid_graph.eps \
    1.15  	nodeshape_0.eps \
    1.16  	nodeshape_1.eps \
    1.17  	nodeshape_2.eps \
    1.18  	nodeshape_3.eps \
    1.19  	nodeshape_4.eps
    1.20  
    1.21 +DOC_EPS_IMAGES27 = \
    1.22 +	bipartite_matching.eps \
    1.23 +	bipartite_partitions.eps \
    1.24 +	connected_components.eps \
    1.25 +	edge_biconnected_components.eps \
    1.26 +	node_biconnected_components.eps \
    1.27 +	strongly_connected_components.eps
    1.28 +
    1.29  DOC_EPS_IMAGES = \
    1.30 -	$(DOC_EPS_IMAGES18)
    1.31 +	$(DOC_EPS_IMAGES18) \
    1.32 +	$(DOC_EPS_IMAGES27)
    1.33  
    1.34  DOC_PNG_IMAGES = \
    1.35  	$(DOC_EPS_IMAGES:%.eps=doc/gen-images/%.png)
    1.36 @@ -44,7 +55,30 @@
    1.37  	  exit 1; \
    1.38  	fi
    1.39  
    1.40 -html-local: $(DOC_PNG_IMAGES)
    1.41 +$(DOC_EPS_IMAGES27:%.eps=doc/gen-images/%.png): doc/gen-images/%.png: doc/images/%.eps
    1.42 +	-mkdir doc/gen-images
    1.43 +	if test ${gs_found} = yes; then \
    1.44 +	  $(GS_COMMAND) -sDEVICE=pngalpha -r27 -sOutputFile=$@ $<; \
    1.45 +	else \
    1.46 +	  echo; \
    1.47 +	  echo "Ghostscript not found."; \
    1.48 +	  echo; \
    1.49 +	  exit 1; \
    1.50 +	fi
    1.51 +
    1.52 +references.dox: doc/references.bib
    1.53 +	if test ${python_found} = yes; then \
    1.54 +	  cd doc; \
    1.55 +	  python @abs_top_srcdir@/scripts/bib2dox.py @abs_top_builddir@/$< >$@; \
    1.56 +	  cd ..; \
    1.57 +	else \
    1.58 +	  echo; \
    1.59 +	  echo "Python not found."; \
    1.60 +	  echo; \
    1.61 +	  exit 1; \
    1.62 +	fi
    1.63 +
    1.64 +html-local: $(DOC_PNG_IMAGES) references.dox
    1.65  	if test ${doxygen_found} = yes; then \
    1.66  	  cd doc; \
    1.67  	  doxygen Doxyfile; \
    1.68 @@ -69,19 +103,19 @@
    1.69  
    1.70  install-html-local: doc/html
    1.71  	@$(NORMAL_INSTALL)
    1.72 -	$(mkinstalldirs) $(DESTDIR)$(htmldir)/docs
    1.73 +	$(mkinstalldirs) $(DESTDIR)$(htmldir)/html
    1.74  	for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
    1.75  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
    1.76 -	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f"; \
    1.77 -	  $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f; \
    1.78 +	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f"; \
    1.79 +	  $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f; \
    1.80  	done
    1.81  
    1.82  uninstall-local:
    1.83  	@$(NORMAL_UNINSTALL)
    1.84  	for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
    1.85  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
    1.86 -	  echo " rm -f $(DESTDIR)$(htmldir)/docs/$$f"; \
    1.87 -	  rm -f $(DESTDIR)$(htmldir)/docs/$$f; \
    1.88 +	  echo " rm -f $(DESTDIR)$(htmldir)/html/$$f"; \
    1.89 +	  rm -f $(DESTDIR)$(htmldir)/html/$$f; \
    1.90  	done
    1.91  
    1.92  .PHONY: update-external-tags