equal
deleted
inserted
replaced
16 |
16 |
17 |
17 |
18 lemon_libemon_la_CXXFLAGS = \ |
18 lemon_libemon_la_CXXFLAGS = \ |
19 $(GLPK_CFLAGS) \ |
19 $(GLPK_CFLAGS) \ |
20 $(CPLEX_CFLAGS) \ |
20 $(CPLEX_CFLAGS) \ |
21 $(SOPLEX_CXXFLAGS) |
21 $(SOPLEX_CXXFLAGS) \ |
|
22 $(CLP_CXXFLAGS) |
22 |
23 |
23 lemon_libemon_la_LDFLAGS = \ |
24 lemon_libemon_la_LDFLAGS = \ |
24 $(GLPK_LIBS) \ |
25 $(GLPK_LIBS) \ |
25 $(CPLEX_LIBS) \ |
26 $(CPLEX_LIBS) \ |
26 $(SOPLEX_LIBS) |
27 $(SOPLEX_LIBS) \ |
|
28 $(CLP_LIBS) |
27 |
29 |
28 if HAVE_GLPK |
30 if HAVE_GLPK |
29 lemon_libemon_la_SOURCES += lemon/lp_glpk.cc lemon/mip_glpk.cc |
31 lemon_libemon_la_SOURCES += lemon/lp_glpk.cc |
30 endif |
32 endif |
31 |
33 |
32 if HAVE_CPLEX |
34 if HAVE_CPLEX |
33 lemon_libemon_la_SOURCES += lemon/lp_cplex.cc lemon/mip_cplex.cc |
35 lemon_libemon_la_SOURCES += lemon/lp_cplex.cc |
34 endif |
36 endif |
35 |
37 |
36 if HAVE_SOPLEX |
38 if HAVE_SOPLEX |
37 lemon_libemon_la_SOURCES += lemon/lp_soplex.cc |
39 lemon_libemon_la_SOURCES += lemon/lp_soplex.cc |
|
40 endif |
|
41 |
|
42 if HAVE_CLP |
|
43 lemon_libemon_la_SOURCES += lemon/lp_clp.cc |
38 endif |
44 endif |
39 |
45 |
40 lemon_HEADERS += \ |
46 lemon_HEADERS += \ |
41 lemon/adaptors.h \ |
47 lemon/adaptors.h \ |
42 lemon/arg_parser.h \ |
48 lemon/arg_parser.h \ |
63 lemon/lgf_reader.h \ |
69 lemon/lgf_reader.h \ |
64 lemon/lgf_writer.h \ |
70 lemon/lgf_writer.h \ |
65 lemon/list_graph.h \ |
71 lemon/list_graph.h \ |
66 lemon/lp.h \ |
72 lemon/lp.h \ |
67 lemon/lp_base.h \ |
73 lemon/lp_base.h \ |
|
74 lemon/lp_clp.h \ |
68 lemon/lp_cplex.h \ |
75 lemon/lp_cplex.h \ |
69 lemon/lp_glpk.h \ |
76 lemon/lp_glpk.h \ |
70 lemon/lp_skeleton.h \ |
77 lemon/lp_skeleton.h \ |
71 lemon/lp_soplex.h \ |
78 lemon/lp_soplex.h \ |
72 lemon/mip_cplex.h \ |
79 lemon/list_graph.h \ |
73 lemon/mip_glpk.h \ |
|
74 lemon/maps.h \ |
80 lemon/maps.h \ |
75 lemon/math.h \ |
81 lemon/math.h \ |
76 lemon/max_matching.h \ |
82 lemon/max_matching.h \ |
77 lemon/nauty_reader.h \ |
83 lemon/nauty_reader.h \ |
78 lemon/path.h \ |
84 lemon/path.h \ |
92 lemon/bits/bezier.h \ |
98 lemon/bits/bezier.h \ |
93 lemon/bits/default_map.h \ |
99 lemon/bits/default_map.h \ |
94 lemon/bits/enable_if.h \ |
100 lemon/bits/enable_if.h \ |
95 lemon/bits/graph_adaptor_extender.h \ |
101 lemon/bits/graph_adaptor_extender.h \ |
96 lemon/bits/graph_extender.h \ |
102 lemon/bits/graph_extender.h \ |
97 lemon/bits/lp_id.h \ |
|
98 lemon/bits/map_extender.h \ |
103 lemon/bits/map_extender.h \ |
99 lemon/bits/path_dump.h \ |
104 lemon/bits/path_dump.h \ |
|
105 lemon/bits/solver_bits.h \ |
100 lemon/bits/traits.h \ |
106 lemon/bits/traits.h \ |
101 lemon/bits/variant.h \ |
107 lemon/bits/variant.h \ |
102 lemon/bits/vector_map.h |
108 lemon/bits/vector_map.h |
103 |
109 |
104 concept_HEADERS += \ |
110 concept_HEADERS += \ |