COIN-OR::LEMON - Graph Library

Changeset 575:88bd39ef7d98 in lemon for lemon


Ignore:
Timestamp:
02/23/09 13:26:21 (15 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
574:c458e02723b1 (diff), 522:7f8560cb9d65 (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

    r522 r575  
    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 \
     16        lemon/bits/windows.cc
    1417
    15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)
    16 #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
     18
     19lemon_libemon_la_CXXFLAGS = \
     20        $(GLPK_CFLAGS) \
     21        $(CPLEX_CFLAGS) \
     22        $(SOPLEX_CXXFLAGS) \
     23        $(CLP_CXXFLAGS)
     24
     25lemon_libemon_la_LDFLAGS = \
     26        $(GLPK_LIBS) \
     27        $(CPLEX_LIBS) \
     28        $(SOPLEX_LIBS) \
     29        $(CLP_LIBS)
     30
     31if HAVE_GLPK
     32lemon_libemon_la_SOURCES += lemon/glpk.cc
     33endif
     34
     35if HAVE_CPLEX
     36lemon_libemon_la_SOURCES += lemon/cplex.cc
     37endif
     38
     39if HAVE_SOPLEX
     40lemon_libemon_la_SOURCES += lemon/soplex.cc
     41endif
     42
     43if HAVE_CLP
     44lemon_libemon_la_SOURCES += lemon/clp.cc
     45endif
    1746
    1847lemon_HEADERS += \
    1948        lemon/adaptors.h \
    20         lemon/arg_parser.h \
     49        lemon/arg_parser.h \
    2150        lemon/assert.h \
    22         lemon/bfs.h \
    23         lemon/bin_heap.h \
    24         lemon/circulation.h \
    25         lemon/color.h \
     51        lemon/bfs.h \
     52        lemon/bin_heap.h \
     53        lemon/circulation.h \
     54        lemon/clp.h \
     55        lemon/color.h \
    2656        lemon/concept_check.h \
    27         lemon/counter.h \
     57        lemon/connectivity.h \
     58        lemon/counter.h \
    2859        lemon/core.h \
    29         lemon/dfs.h \
    30         lemon/dijkstra.h \
    31         lemon/dim2.h \
    32         lemon/dimacs.h \
     60        lemon/cplex.h \
     61        lemon/dfs.h \
     62        lemon/dijkstra.h \
     63        lemon/dim2.h \
     64        lemon/dimacs.h \
     65        lemon/edge_set.h \
    3366        lemon/elevator.h \
    3467        lemon/error.h \
     68        lemon/euler.h \
    3569        lemon/full_graph.h \
    36         lemon/graph_to_eps.h \
    37         lemon/grid_graph.h \
     70        lemon/glpk.h \
     71        lemon/graph_to_eps.h \
     72        lemon/grid_graph.h \
    3873        lemon/hypercube_graph.h \
    3974        lemon/kruskal.h \
     
    4176        lemon/lgf_reader.h \
    4277        lemon/lgf_writer.h \
     78        lemon/list_graph.h \
     79        lemon/lp.h \
     80        lemon/lp_base.h \
     81        lemon/lp_skeleton.h \
    4382        lemon/list_graph.h \
    4483        lemon/maps.h \
     
    4988        lemon/path.h \
    5089        lemon/preflow.h \
    51         lemon/random.h \
     90        lemon/radix_sort.h \
     91        lemon/random.h \
    5292        lemon/smart_graph.h \
     93        lemon/soplex.h \
    5394        lemon/suurballe.h \
    54         lemon/time_measure.h \
    55         lemon/tolerance.h \
    56         lemon/unionfind.h
     95        lemon/time_measure.h \
     96        lemon/tolerance.h \
     97        lemon/unionfind.h \
     98        lemon/bits/windows.h
    5799
    58100bits_HEADERS += \
     
    60102        lemon/bits/array_map.h \
    61103        lemon/bits/base_extender.h \
    62         lemon/bits/bezier.h \
     104        lemon/bits/bezier.h \
    63105        lemon/bits/default_map.h \
    64         lemon/bits/enable_if.h \
     106        lemon/bits/edge_set_extender.h \
     107        lemon/bits/enable_if.h \
    65108        lemon/bits/graph_adaptor_extender.h \
    66109        lemon/bits/graph_extender.h \
    67110        lemon/bits/map_extender.h \
    68111        lemon/bits/path_dump.h \
     112        lemon/bits/solver_bits.h \
    69113        lemon/bits/traits.h \
    70114        lemon/bits/variant.h \
  • lemon/Makefile.am

    r569 r575  
    8484        lemon/math.h \
    8585        lemon/max_matching.h \
     86        lemon/min_cost_arborescence.h \
    8687        lemon/nauty_reader.h \
    8788        lemon/path.h \
Note: See TracChangeset for help on using the changeset viewer.