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