COIN-OR::LEMON - Graph Library

Changeset 469:04c0631fd332 in lemon-1.2 for lemon


Ignore:
Timestamp:
01/12/09 14:37:37 (11 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
470:81627fa1b007, 504:c35afa9e89e7
Parents:
467:a1155a9e8e09 (diff), 468:68fe66e2b34a (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

    r461 r469  
    6161        lemon/dim2.h \
    6262        lemon/dimacs.h \
     63        lemon/edge_set.h \
    6364        lemon/elevator.h \
    6465        lemon/error.h \
     
    9899        lemon/bits/bezier.h \
    99100        lemon/bits/default_map.h \
     101        lemon/bits/edge_set_extender.h \
    100102        lemon/bits/enable_if.h \
    101103        lemon/bits/graph_adaptor_extender.h \
  • lemon/Makefile.am

    r468 r469  
    88
    99lemon_libemon_la_SOURCES = \
    10         lemon/arg_parser.cc \
    11         lemon/base.cc \
    12         lemon/color.cc \
    13         lemon/random.cc
     10        lemon/arg_parser.cc \
     11        lemon/base.cc \
     12        lemon/color.cc \
     13        lemon/lp_base.cc \
     14        lemon/lp_skeleton.cc \
     15        lemon/random.cc
    1416
    15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)
    16 #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
     17
     18lemon_libemon_la_CXXFLAGS = \
     19        $(GLPK_CFLAGS) \
     20        $(CPLEX_CFLAGS) \
     21        $(SOPLEX_CXXFLAGS) \
     22        $(CLP_CXXFLAGS)
     23
     24lemon_libemon_la_LDFLAGS = \
     25        $(GLPK_LIBS) \
     26        $(CPLEX_LIBS) \
     27        $(SOPLEX_LIBS) \
     28        $(CLP_LIBS)
     29
     30if HAVE_GLPK
     31lemon_libemon_la_SOURCES += lemon/glpk.cc
     32endif
     33
     34if HAVE_CPLEX
     35lemon_libemon_la_SOURCES += lemon/cplex.cc
     36endif
     37
     38if HAVE_SOPLEX
     39lemon_libemon_la_SOURCES += lemon/soplex.cc
     40endif
     41
     42if HAVE_CLP
     43lemon_libemon_la_SOURCES += lemon/clp.cc
     44endif
    1745
    1846lemon_HEADERS += \
    1947        lemon/adaptors.h \
    20         lemon/arg_parser.h \
     48        lemon/arg_parser.h \
    2149        lemon/assert.h \
    22         lemon/bfs.h \
    23         lemon/bin_heap.h \
    24         lemon/circulation.h \
    25         lemon/color.h \
     50        lemon/bfs.h \
     51        lemon/bin_heap.h \
     52        lemon/circulation.h \
     53        lemon/clp.h \
     54        lemon/color.h \
    2655        lemon/concept_check.h \
    27         lemon/counter.h \
     56        lemon/counter.h \
    2857        lemon/core.h \
    29         lemon/dfs.h \
    30         lemon/dijkstra.h \
    31         lemon/dim2.h \
    32         lemon/dimacs.h \
     58        lemon/cplex.h \
     59        lemon/dfs.h \
     60        lemon/dijkstra.h \
     61        lemon/dim2.h \
     62        lemon/dimacs.h \
    3363        lemon/edge_set.h \
    3464        lemon/elevator.h \
    3565        lemon/error.h \
    3666        lemon/full_graph.h \
    37         lemon/graph_to_eps.h \
    38         lemon/grid_graph.h \
     67        lemon/glpk.h \
     68        lemon/graph_to_eps.h \
     69        lemon/grid_graph.h \
    3970        lemon/hypercube_graph.h \
    4071        lemon/kruskal.h \
     
    4273        lemon/lgf_reader.h \
    4374        lemon/lgf_writer.h \
     75        lemon/list_graph.h \
     76        lemon/lp.h \
     77        lemon/lp_base.h \
     78        lemon/lp_skeleton.h \
    4479        lemon/list_graph.h \
    4580        lemon/maps.h \
     
    4984        lemon/path.h \
    5085        lemon/preflow.h \
    51         lemon/random.h \
     86        lemon/radix_sort.h \
     87        lemon/random.h \
    5288        lemon/smart_graph.h \
     89        lemon/soplex.h \
    5390        lemon/suurballe.h \
    54         lemon/time_measure.h \
    55         lemon/tolerance.h \
     91        lemon/time_measure.h \
     92        lemon/tolerance.h \
    5693        lemon/unionfind.h
    5794
     
    6097        lemon/bits/array_map.h \
    6198        lemon/bits/base_extender.h \
    62         lemon/bits/bezier.h \
     99        lemon/bits/bezier.h \
    63100        lemon/bits/default_map.h \
    64101        lemon/bits/edge_set_extender.h \
    65         lemon/bits/enable_if.h \
     102        lemon/bits/enable_if.h \
    66103        lemon/bits/graph_adaptor_extender.h \
    67104        lemon/bits/graph_extender.h \
    68105        lemon/bits/map_extender.h \
    69106        lemon/bits/path_dump.h \
     107        lemon/bits/solver_bits.h \
    70108        lemon/bits/traits.h \
    71109        lemon/bits/variant.h \
Note: See TracChangeset for help on using the changeset viewer.