1.1 --- a/lemon/Makefile.am Mon Jan 12 12:22:11 2009 +0000
1.2 +++ b/lemon/Makefile.am Tue Dec 02 21:40:33 2008 +0100
1.3 @@ -10,10 +10,32 @@
1.4 lemon/arg_parser.cc \
1.5 lemon/base.cc \
1.6 lemon/color.cc \
1.7 + lemon/lp_base.cc \
1.8 + lemon/lp_skeleton.cc \
1.9 lemon/random.cc
1.10
1.11 -#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)
1.12 -#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
1.13 +
1.14 +lemon_libemon_la_CXXFLAGS = \
1.15 + $(GLPK_CFLAGS) \
1.16 + $(CPLEX_CFLAGS) \
1.17 + $(SOPLEX_CXXFLAGS)
1.18 +
1.19 +lemon_libemon_la_LDFLAGS = \
1.20 + $(GLPK_LIBS) \
1.21 + $(CPLEX_LIBS) \
1.22 + $(SOPLEX_LIBS)
1.23 +
1.24 +if HAVE_GLPK
1.25 +lemon_libemon_la_SOURCES += lemon/lp_glpk.cc lemon/mip_glpk.cc
1.26 +endif
1.27 +
1.28 +if HAVE_CPLEX
1.29 +lemon_libemon_la_SOURCES += lemon/lp_cplex.cc lemon/mip_cplex.cc
1.30 +endif
1.31 +
1.32 +if HAVE_SOPLEX
1.33 +lemon_libemon_la_SOURCES += lemon/lp_soplex.cc
1.34 +endif
1.35
1.36 lemon_HEADERS += \
1.37 lemon/adaptors.h \
1.38 @@ -41,6 +63,14 @@
1.39 lemon/lgf_reader.h \
1.40 lemon/lgf_writer.h \
1.41 lemon/list_graph.h \
1.42 + lemon/lp.h \
1.43 + lemon/lp_base.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/maps.h \
1.51 lemon/math.h \
1.52 lemon/max_matching.h \
1.53 @@ -64,6 +94,7 @@
1.54 lemon/bits/enable_if.h \
1.55 lemon/bits/graph_adaptor_extender.h \
1.56 lemon/bits/graph_extender.h \
1.57 + lemon/bits/lp_id.h \
1.58 lemon/bits/map_extender.h \
1.59 lemon/bits/path_dump.h \
1.60 lemon/bits/traits.h \