Changeset 528:88bd39ef7d98 in lemon1.2 for lemon
 Timestamp:
 02/23/09 13:26:21 (15 years ago)
 Branch:
 default
 Parents:
 527:c458e02723b1 (diff), 490: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
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

lemon/Makefile.am
r490 r528 8 8 9 9 lemon_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 14 17 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 19 lemon_libemon_la_CXXFLAGS = \ 20 $(GLPK_CFLAGS) \ 21 $(CPLEX_CFLAGS) \ 22 $(SOPLEX_CXXFLAGS) \ 23 $(CLP_CXXFLAGS) 24 25 lemon_libemon_la_LDFLAGS = \ 26 $(GLPK_LIBS) \ 27 $(CPLEX_LIBS) \ 28 $(SOPLEX_LIBS) \ 29 $(CLP_LIBS) 30 31 if HAVE_GLPK 32 lemon_libemon_la_SOURCES += lemon/glpk.cc 33 endif 34 35 if HAVE_CPLEX 36 lemon_libemon_la_SOURCES += lemon/cplex.cc 37 endif 38 39 if HAVE_SOPLEX 40 lemon_libemon_la_SOURCES += lemon/soplex.cc 41 endif 42 43 if HAVE_CLP 44 lemon_libemon_la_SOURCES += lemon/clp.cc 45 endif 17 46 18 47 lemon_HEADERS += \ 19 48 lemon/adaptors.h \ 20 49 lemon/arg_parser.h \ 21 50 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 \ 26 56 lemon/concept_check.h \ 27 lemon/counter.h \ 57 lemon/connectivity.h \ 58 lemon/counter.h \ 28 59 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 \ 33 66 lemon/elevator.h \ 34 67 lemon/error.h \ 68 lemon/euler.h \ 35 69 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 \ 38 73 lemon/hypercube_graph.h \ 39 74 lemon/kruskal.h \ … … 41 76 lemon/lgf_reader.h \ 42 77 lemon/lgf_writer.h \ 78 lemon/list_graph.h \ 79 lemon/lp.h \ 80 lemon/lp_base.h \ 81 lemon/lp_skeleton.h \ 43 82 lemon/list_graph.h \ 44 83 lemon/maps.h \ … … 49 88 lemon/path.h \ 50 89 lemon/preflow.h \ 51 lemon/random.h \ 90 lemon/radix_sort.h \ 91 lemon/random.h \ 52 92 lemon/smart_graph.h \ 93 lemon/soplex.h \ 53 94 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 57 99 58 100 bits_HEADERS += \ … … 60 102 lemon/bits/array_map.h \ 61 103 lemon/bits/base_extender.h \ 62 104 lemon/bits/bezier.h \ 63 105 lemon/bits/default_map.h \ 64 lemon/bits/enable_if.h \ 106 lemon/bits/edge_set_extender.h \ 107 lemon/bits/enable_if.h \ 65 108 lemon/bits/graph_adaptor_extender.h \ 66 109 lemon/bits/graph_extender.h \ 67 110 lemon/bits/map_extender.h \ 68 111 lemon/bits/path_dump.h \ 112 lemon/bits/solver_bits.h \ 69 113 lemon/bits/traits.h \ 70 114 lemon/bits/variant.h \ 
lemon/Makefile.am
r522 r528 84 84 lemon/math.h \ 85 85 lemon/max_matching.h \ 86 lemon/min_cost_arborescence.h \ 86 87 lemon/nauty_reader.h \ 87 88 lemon/path.h \
Note: See TracChangeset
for help on using the changeset viewer.