COIN-OR::LEMON - Graph Library

Changeset 337:560e4b6d020d in lemon-1.2


Ignore:
Timestamp:
10/22/08 23:14:00 (11 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
333:9c2a532aa5ef (diff), 336:052cecabcb71 (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:
4 edited

Legend:

Unmodified
Added
Removed
  • doc/Makefile.am

    r317 r337  
    1515
    1616DOC_EPS_IMAGES18 = \
     17        grid_graph.eps \
    1718        nodeshape_0.eps \
    1819        nodeshape_1.eps \
  • doc/Makefile.am

    r335 r337  
    11EXTRA_DIST += \
    22        doc/Doxyfile.in \
     3        doc/DoxygenLayout.xml \
    34        doc/coding_style.dox \
    45        doc/dirs.dox \
     
    78        doc/license.dox \
    89        doc/mainpage.dox \
     10        doc/migration.dox \
     11        doc/named-param.dox \
    912        doc/namespaces.dox \
    1013        doc/html \
  • lemon/Makefile.am

    r326 r337  
    3030        lemon/error.h \
    3131        lemon/graph_to_eps.h \
     32        lemon/grid_graph.h \
    3233        lemon/kruskal.h \
    3334        lemon/lgf_reader.h \
  • lemon/Makefile.am

    r334 r337  
    1313        lemon/random.cc
    1414
    15 
    16 lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
    17 lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
     15#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
     16#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
    1817
    1918lemon_HEADERS += \
     
    3837        lemon/maps.h \
    3938        lemon/math.h \
     39        lemon/max_matching.h \
    4040        lemon/path.h \
    4141        lemon/random.h \
Note: See TracChangeset for help on using the changeset viewer.