1.1 --- a/lemon/Makefile.am Tue Dec 02 21:40:33 2008 +0100
1.2 +++ b/lemon/Makefile.am Tue Dec 02 22:48:28 2008 +0100
1.3 @@ -18,25 +18,31 @@
1.4 lemon_libemon_la_CXXFLAGS = \
1.5 $(GLPK_CFLAGS) \
1.6 $(CPLEX_CFLAGS) \
1.7 - $(SOPLEX_CXXFLAGS)
1.8 + $(SOPLEX_CXXFLAGS) \
1.9 + $(CLP_CXXFLAGS)
1.10
1.11 lemon_libemon_la_LDFLAGS = \
1.12 $(GLPK_LIBS) \
1.13 $(CPLEX_LIBS) \
1.14 - $(SOPLEX_LIBS)
1.15 + $(SOPLEX_LIBS) \
1.16 + $(CLP_LIBS)
1.17
1.18 if HAVE_GLPK
1.19 -lemon_libemon_la_SOURCES += lemon/lp_glpk.cc lemon/mip_glpk.cc
1.20 +lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
1.21 endif
1.22
1.23 if HAVE_CPLEX
1.24 -lemon_libemon_la_SOURCES += lemon/lp_cplex.cc lemon/mip_cplex.cc
1.25 +lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
1.26 endif
1.27
1.28 if HAVE_SOPLEX
1.29 lemon_libemon_la_SOURCES += lemon/lp_soplex.cc
1.30 endif
1.31
1.32 +if HAVE_CLP
1.33 +lemon_libemon_la_SOURCES += lemon/lp_clp.cc
1.34 +endif
1.35 +
1.36 lemon_HEADERS += \
1.37 lemon/adaptors.h \
1.38 lemon/arg_parser.h \
1.39 @@ -65,12 +71,12 @@
1.40 lemon/list_graph.h \
1.41 lemon/lp.h \
1.42 lemon/lp_base.h \
1.43 + lemon/lp_clp.h \
1.44 lemon/lp_cplex.h \
1.45 lemon/lp_glpk.h \
1.46 lemon/lp_skeleton.h \
1.47 lemon/lp_soplex.h \
1.48 - lemon/mip_cplex.h \
1.49 - lemon/mip_glpk.h \
1.50 + lemon/list_graph.h \
1.51 lemon/maps.h \
1.52 lemon/math.h \
1.53 lemon/max_matching.h \
1.54 @@ -94,9 +100,9 @@
1.55 lemon/bits/enable_if.h \
1.56 lemon/bits/graph_adaptor_extender.h \
1.57 lemon/bits/graph_extender.h \
1.58 - lemon/bits/lp_id.h \
1.59 lemon/bits/map_extender.h \
1.60 lemon/bits/path_dump.h \
1.61 + lemon/bits/solver_bits.h \
1.62 lemon/bits/traits.h \
1.63 lemon/bits/variant.h \
1.64 lemon/bits/vector_map.h