Changeset 969:cfdbf1574403 in lemon-main

Timestamp:

12/20/11 19:35:47 (13 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

965:a1fd7008a052 (diff), 968:53c0dd387001 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• doc/Makefile.am (modified) (1 diff)
• doc/Makefile.am (modified) (2 diffs)

doc/Makefile.am

@@ -12 +12 @@
         doc/named-param.dox \
         doc/namespaces.dox \
+        doc/template.h \
         doc/html \
         doc/CMakeLists.txt

doc/Makefile.am

@@ -29 +29 @@
         connected_components.eps \
         edge_biconnected_components.eps \
+        matching.eps \
         node_biconnected_components.eps \
+        planar.eps \
         strongly_connected_components.eps
 
@@ -68 +70 @@
         fi
 
-html-local: $(DOC_PNG_IMAGES)
+references.dox: doc/references.bib
+        if test ${python_found} = yes; then \
+          cd doc; \
+          python @abs_top_srcdir@/scripts/bib2dox.py @abs_top_builddir@/$< >$@; \
+          cd ..; \
+        else \
+          echo; \
+          echo "Python not found."; \
+          echo; \
+          exit 1; \
+        fi
+
+html-local: $(DOC_PNG_IMAGES) references.dox
         if test ${doxygen_found} = yes; then \
           cd doc; \