COIN-OR::LEMON - Graph Library

Changeset 1114:cfdbf1574403 in lemon


Ignore:
Timestamp:
12/20/11 19:35:47 (7 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1108:a1fd7008a052 (diff), 1113: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:
2 edited

Legend:

Unmodified
Added
Removed
  • doc/Makefile.am

    r943 r1114  
    1212        doc/named-param.dox \
    1313        doc/namespaces.dox \
     14        doc/template.h \
    1415        doc/html \
    1516        doc/CMakeLists.txt
  • doc/Makefile.am

    r1112 r1114  
    2929        connected_components.eps \
    3030        edge_biconnected_components.eps \
     31        matching.eps \
    3132        node_biconnected_components.eps \
     33        planar.eps \
    3234        strongly_connected_components.eps
    3335
     
    6870        fi
    6971
    70 html-local: $(DOC_PNG_IMAGES)
     72references.dox: doc/references.bib
     73        if test ${python_found} = yes; then \
     74          cd doc; \
     75          python @abs_top_srcdir@/scripts/bib2dox.py @abs_top_builddir@/$< >$@; \
     76          cd ..; \
     77        else \
     78          echo; \
     79          echo "Python not found."; \
     80          echo; \
     81          exit 1; \
     82        fi
     83
     84html-local: $(DOC_PNG_IMAGES) references.dox
    7185        if test ${doxygen_found} = yes; then \
    7286          cd doc; \
Note: See TracChangeset for help on using the changeset viewer.