Changeset 469:04c0631fd332 in lemon1.2 for lemon
 Timestamp:
 01/12/09 14:37:37 (12 years ago)
 Branch:
 default
 Children:
 470:81627fa1b007, 504:c35afa9e89e7
 Parents:
 467:a1155a9e8e09 (diff), 468:68fe66e2b34a (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
r461 r469 61 61 lemon/dim2.h \ 62 62 lemon/dimacs.h \ 63 lemon/edge_set.h \ 63 64 lemon/elevator.h \ 64 65 lemon/error.h \ … … 98 99 lemon/bits/bezier.h \ 99 100 lemon/bits/default_map.h \ 101 lemon/bits/edge_set_extender.h \ 100 102 lemon/bits/enable_if.h \ 101 103 lemon/bits/graph_adaptor_extender.h \ 
lemon/Makefile.am
r468 r469 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 14 16 15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS) 16 #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS) 17 18 lemon_libemon_la_CXXFLAGS = \ 19 $(GLPK_CFLAGS) \ 20 $(CPLEX_CFLAGS) \ 21 $(SOPLEX_CXXFLAGS) \ 22 $(CLP_CXXFLAGS) 23 24 lemon_libemon_la_LDFLAGS = \ 25 $(GLPK_LIBS) \ 26 $(CPLEX_LIBS) \ 27 $(SOPLEX_LIBS) \ 28 $(CLP_LIBS) 29 30 if HAVE_GLPK 31 lemon_libemon_la_SOURCES += lemon/glpk.cc 32 endif 33 34 if HAVE_CPLEX 35 lemon_libemon_la_SOURCES += lemon/cplex.cc 36 endif 37 38 if HAVE_SOPLEX 39 lemon_libemon_la_SOURCES += lemon/soplex.cc 40 endif 41 42 if HAVE_CLP 43 lemon_libemon_la_SOURCES += lemon/clp.cc 44 endif 17 45 18 46 lemon_HEADERS += \ 19 47 lemon/adaptors.h \ 20 48 lemon/arg_parser.h \ 21 49 lemon/assert.h \ 22 lemon/bfs.h \ 23 lemon/bin_heap.h \ 24 lemon/circulation.h \ 25 lemon/color.h \ 50 lemon/bfs.h \ 51 lemon/bin_heap.h \ 52 lemon/circulation.h \ 53 lemon/clp.h \ 54 lemon/color.h \ 26 55 lemon/concept_check.h \ 27 56 lemon/counter.h \ 28 57 lemon/core.h \ 29 lemon/dfs.h \ 30 lemon/dijkstra.h \ 31 lemon/dim2.h \ 32 lemon/dimacs.h \ 58 lemon/cplex.h \ 59 lemon/dfs.h \ 60 lemon/dijkstra.h \ 61 lemon/dim2.h \ 62 lemon/dimacs.h \ 33 63 lemon/edge_set.h \ 34 64 lemon/elevator.h \ 35 65 lemon/error.h \ 36 66 lemon/full_graph.h \ 37 lemon/graph_to_eps.h \ 38 lemon/grid_graph.h \ 67 lemon/glpk.h \ 68 lemon/graph_to_eps.h \ 69 lemon/grid_graph.h \ 39 70 lemon/hypercube_graph.h \ 40 71 lemon/kruskal.h \ … … 42 73 lemon/lgf_reader.h \ 43 74 lemon/lgf_writer.h \ 75 lemon/list_graph.h \ 76 lemon/lp.h \ 77 lemon/lp_base.h \ 78 lemon/lp_skeleton.h \ 44 79 lemon/list_graph.h \ 45 80 lemon/maps.h \ … … 49 84 lemon/path.h \ 50 85 lemon/preflow.h \ 51 lemon/random.h \ 86 lemon/radix_sort.h \ 87 lemon/random.h \ 52 88 lemon/smart_graph.h \ 89 lemon/soplex.h \ 53 90 lemon/suurballe.h \ 54 55 91 lemon/time_measure.h \ 92 lemon/tolerance.h \ 56 93 lemon/unionfind.h 57 94 … … 60 97 lemon/bits/array_map.h \ 61 98 lemon/bits/base_extender.h \ 62 99 lemon/bits/bezier.h \ 63 100 lemon/bits/default_map.h \ 64 101 lemon/bits/edge_set_extender.h \ 65 102 lemon/bits/enable_if.h \ 66 103 lemon/bits/graph_adaptor_extender.h \ 67 104 lemon/bits/graph_extender.h \ 68 105 lemon/bits/map_extender.h \ 69 106 lemon/bits/path_dump.h \ 107 lemon/bits/solver_bits.h \ 70 108 lemon/bits/traits.h \ 71 109 lemon/bits/variant.h \
Note: See TracChangeset
for help on using the changeset viewer.