Changeset 1106:7c4ba7daaf5f in lemon for lemon
 Timestamp:
 12/20/11 17:44:38 (9 years ago)
 Branch:
 default
 Children:
 1107:2b6bffe0e7e8, 1109:fe5718b39fda, 1112:63fd58460c39
 Parents:
 1105:4efe7b32b134 (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
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

lemon/Makefile.am
r547 r1106 1 1 EXTRA_DIST += \ 2 2 lemon/lemon.pc.in \ 3 lemon/CMakeLists.txt 3 lemon/lemon.pc.cmake \ 4 lemon/CMakeLists.txt \ 5 lemon/config.h.cmake 4 6 5 7 pkgconfig_DATA += lemon/lemon.pc … … 13 15 lemon/lp_base.cc \ 14 16 lemon/lp_skeleton.cc \ 15 lemon/random.cc 17 lemon/random.cc \ 18 lemon/bits/windows.cc 16 19 20 nodist_lemon_HEADERS = lemon/config.h 17 21 18 22 lemon_libemon_la_CXXFLAGS = \ 23 $(AM_CXXFLAGS) \ 19 24 $(GLPK_CFLAGS) \ 20 25 $(CPLEX_CFLAGS) \ 21 26 $(SOPLEX_CXXFLAGS) \ 22 $(CLP_CXXFLAGS) 27 $(CLP_CXXFLAGS) \ 28 $(CBC_CXXFLAGS) 23 29 24 30 lemon_libemon_la_LDFLAGS = \ … … 26 32 $(CPLEX_LIBS) \ 27 33 $(SOPLEX_LIBS) \ 28 $(CLP_LIBS) 34 $(CLP_LIBS) \ 35 $(CBC_LIBS) 29 36 30 37 if HAVE_GLPK 31 lemon_libemon_la_SOURCES += lemon/ lp_glpk.cc38 lemon_libemon_la_SOURCES += lemon/glpk.cc 32 39 endif 33 40 34 41 if HAVE_CPLEX 35 lemon_libemon_la_SOURCES += lemon/ lp_cplex.cc42 lemon_libemon_la_SOURCES += lemon/cplex.cc 36 43 endif 37 44 38 45 if HAVE_SOPLEX 39 lemon_libemon_la_SOURCES += lemon/ lp_soplex.cc46 lemon_libemon_la_SOURCES += lemon/soplex.cc 40 47 endif 41 48 42 49 if HAVE_CLP 43 lemon_libemon_la_SOURCES += lemon/lp_clp.cc 50 lemon_libemon_la_SOURCES += lemon/clp.cc 51 endif 52 53 if HAVE_CBC 54 lemon_libemon_la_SOURCES += lemon/cbc.cc 44 55 endif 45 56 … … 50 61 lemon/bfs.h \ 51 62 lemon/bin_heap.h \ 63 lemon/bucket_heap.h \ 64 lemon/cbc.h \ 52 65 lemon/circulation.h \ 66 lemon/clp.h \ 53 67 lemon/color.h \ 54 68 lemon/concept_check.h \ 69 lemon/connectivity.h \ 55 70 lemon/counter.h \ 56 71 lemon/core.h \ 72 lemon/cplex.h \ 57 73 lemon/dfs.h \ 58 74 lemon/dijkstra.h \ 59 75 lemon/dim2.h \ 60 76 lemon/dimacs.h \ 77 lemon/edge_set.h \ 61 78 lemon/elevator.h \ 62 79 lemon/error.h \ 80 lemon/euler.h \ 81 lemon/fib_heap.h \ 63 82 lemon/full_graph.h \ 83 lemon/glpk.h \ 84 lemon/gomory_hu.h \ 64 85 lemon/graph_to_eps.h \ 65 86 lemon/grid_graph.h \ … … 72 93 lemon/lp.h \ 73 94 lemon/lp_base.h \ 74 lemon/lp_clp.h \75 lemon/lp_cplex.h \76 lemon/lp_glpk.h \77 95 lemon/lp_skeleton.h \ 78 lemon/lp_soplex.h \79 96 lemon/maps.h \ 97 lemon/matching.h \ 80 98 lemon/math.h \ 81 lemon/m ax_matching.h \99 lemon/min_cost_arborescence.h \ 82 100 lemon/nauty_reader.h \ 101 lemon/network_simplex.h \ 83 102 lemon/path.h \ 84 103 lemon/preflow.h \ 104 lemon/radix_heap.h \ 85 105 lemon/radix_sort.h \ 86 106 lemon/random.h \ 87 107 lemon/smart_graph.h \ 108 lemon/soplex.h \ 88 109 lemon/suurballe.h \ 89 110 lemon/time_measure.h \ 90 111 lemon/tolerance.h \ 91 lemon/unionfind.h 112 lemon/unionfind.h \ 113 lemon/bits/windows.h 92 114 93 115 bits_HEADERS += \ 94 116 lemon/bits/alteration_notifier.h \ 95 117 lemon/bits/array_map.h \ 96 lemon/bits/base_extender.h \97 118 lemon/bits/bezier.h \ 98 119 lemon/bits/default_map.h \ 120 lemon/bits/edge_set_extender.h \ 99 121 lemon/bits/enable_if.h \ 100 122 lemon/bits/graph_adaptor_extender.h \ 
lemon/Makefile.am
r1102 r1106 94 94 lemon/lp_base.h \ 95 95 lemon/lp_skeleton.h \ 96 lemon/list_graph.h \97 96 lemon/maps.h \ 98 97 lemon/matching.h \
Note: See TracChangeset
for help on using the changeset viewer.