COIN-OR::LEMON - Graph Library

Changeset 733:7439dc5fe1b9 in lemon for lemon/Makefile.am


Ignore:
Timestamp:
08/20/09 22:52:03 (10 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
730:9f529abcaebf (diff), 547:17cabb114d52 (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

    r547 r733  
    11EXTRA_DIST += \
    22        lemon/lemon.pc.in \
    3         lemon/CMakeLists.txt
     3        lemon/CMakeLists.txt \
     4        lemon/config.h.cmake
    45
    56pkgconfig_DATA += lemon/lemon.pc
     
    1314        lemon/lp_base.cc \
    1415        lemon/lp_skeleton.cc \
    15         lemon/random.cc
     16        lemon/random.cc \
     17        lemon/bits/windows.cc
    1618
     19nodist_lemon_HEADERS = lemon/config.h   
    1720
    1821lemon_libemon_la_CXXFLAGS = \
     22        $(AM_CXXFLAGS) \
    1923        $(GLPK_CFLAGS) \
    2024        $(CPLEX_CFLAGS) \
    2125        $(SOPLEX_CXXFLAGS) \
    22         $(CLP_CXXFLAGS)
     26        $(CLP_CXXFLAGS) \
     27        $(CBC_CXXFLAGS)
    2328
    2429lemon_libemon_la_LDFLAGS = \
     
    2631        $(CPLEX_LIBS) \
    2732        $(SOPLEX_LIBS) \
    28         $(CLP_LIBS)
     33        $(CLP_LIBS) \
     34        $(CBC_LIBS)
    2935
    3036if HAVE_GLPK
    31 lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
     37lemon_libemon_la_SOURCES += lemon/glpk.cc
    3238endif
    3339
    3440if HAVE_CPLEX
    35 lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
     41lemon_libemon_la_SOURCES += lemon/cplex.cc
    3642endif
    3743
    3844if HAVE_SOPLEX
    39 lemon_libemon_la_SOURCES += lemon/lp_soplex.cc
     45lemon_libemon_la_SOURCES += lemon/soplex.cc
    4046endif
    4147
    4248if HAVE_CLP
    43 lemon_libemon_la_SOURCES += lemon/lp_clp.cc
     49lemon_libemon_la_SOURCES += lemon/clp.cc
     50endif
     51
     52if HAVE_CBC
     53lemon_libemon_la_SOURCES += lemon/cbc.cc
    4454endif
    4555
     
    5060        lemon/bfs.h \
    5161        lemon/bin_heap.h \
     62        lemon/bucket_heap.h \
     63        lemon/cbc.h \
    5264        lemon/circulation.h \
     65        lemon/clp.h \
    5366        lemon/color.h \
    5467        lemon/concept_check.h \
     68        lemon/connectivity.h \
    5569        lemon/counter.h \
    5670        lemon/core.h \
     71        lemon/cplex.h \
    5772        lemon/dfs.h \
    5873        lemon/dijkstra.h \
    5974        lemon/dim2.h \
    6075        lemon/dimacs.h \
     76        lemon/edge_set.h \
    6177        lemon/elevator.h \
    6278        lemon/error.h \
     79        lemon/euler.h \
     80        lemon/fib_heap.h \
    6381        lemon/full_graph.h \
     82        lemon/glpk.h \
     83        lemon/gomory_hu.h \
    6484        lemon/graph_to_eps.h \
    6585        lemon/grid_graph.h \
     
    7292        lemon/lp.h \
    7393        lemon/lp_base.h \
    74         lemon/lp_clp.h \
    75         lemon/lp_cplex.h \
    76         lemon/lp_glpk.h \
    7794        lemon/lp_skeleton.h \
    78         lemon/lp_soplex.h \
    7995        lemon/maps.h \
     96        lemon/matching.h \
    8097        lemon/math.h \
    81         lemon/max_matching.h \
     98        lemon/min_cost_arborescence.h \
    8299        lemon/nauty_reader.h \
     100        lemon/network_simplex.h \
    83101        lemon/path.h \
    84102        lemon/preflow.h \
     103        lemon/radix_heap.h \
    85104        lemon/radix_sort.h \
    86105        lemon/random.h \
    87106        lemon/smart_graph.h \
     107        lemon/soplex.h \
    88108        lemon/suurballe.h \
    89109        lemon/time_measure.h \
    90110        lemon/tolerance.h \
    91         lemon/unionfind.h
     111        lemon/unionfind.h \
     112        lemon/bits/windows.h
    92113
    93114bits_HEADERS += \
    94115        lemon/bits/alteration_notifier.h \
    95116        lemon/bits/array_map.h \
    96         lemon/bits/base_extender.h \
    97117        lemon/bits/bezier.h \
    98118        lemon/bits/default_map.h \
     119        lemon/bits/edge_set_extender.h \
    99120        lemon/bits/enable_if.h \
    100121        lemon/bits/graph_adaptor_extender.h \
  • lemon/Makefile.am

    r728 r733  
    9393        lemon/lp_base.h \
    9494        lemon/lp_skeleton.h \
    95         lemon/list_graph.h \
    9695        lemon/maps.h \
    9796        lemon/matching.h \
Note: See TracChangeset for help on using the changeset viewer.