COIN-OR::LEMON - Graph Library

Changeset 356:99f1bdf8f7db in lemon-1.2 for lemon


Ignore:
Timestamp:
11/04/08 11:21:22 (15 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
350:c6c6e1d863c4 (diff), 355:aa75d24ba7d0 (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
  • lemon/Makefile.am

    r349 r356  
    2929        lemon/dim2.h \
    3030        lemon/error.h \
     31        lemon/full_graph.h \
    3132        lemon/graph_to_eps.h \
    3233        lemon/grid_graph.h \
  • lemon/Makefile.am

    r353 r356  
    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 += \
     
    3231        lemon/full_graph.h \
    3332        lemon/graph_to_eps.h \
     33        lemon/grid_graph.h \
    3434        lemon/kruskal.h \
    3535        lemon/lgf_reader.h \
     
    3838        lemon/maps.h \
    3939        lemon/math.h \
     40        lemon/max_matching.h \
     41        lemon/nauty_reader.h \
    4042        lemon/path.h \
    4143        lemon/random.h \
    4244        lemon/smart_graph.h \
     45        lemon/suurballe.h \
    4346        lemon/time_measure.h \
    4447        lemon/tolerance.h \
Note: See TracChangeset for help on using the changeset viewer.