1.1 --- a/lemon/Makefile.am Mon Jan 12 12:25:55 2009 +0000
1.2 +++ b/lemon/Makefile.am Mon Jan 12 12:26:01 2009 +0000
1.3 @@ -28,19 +28,19 @@
1.4 $(CLP_LIBS)
1.5
1.6 if HAVE_GLPK
1.7 -lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
1.8 +lemon_libemon_la_SOURCES += lemon/glpk.cc
1.9 endif
1.10
1.11 if HAVE_CPLEX
1.12 -lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
1.13 +lemon_libemon_la_SOURCES += lemon/cplex.cc
1.14 endif
1.15
1.16 if HAVE_SOPLEX
1.17 -lemon_libemon_la_SOURCES += lemon/lp_soplex.cc
1.18 +lemon_libemon_la_SOURCES += lemon/soplex.cc
1.19 endif
1.20
1.21 if HAVE_CLP
1.22 -lemon_libemon_la_SOURCES += lemon/lp_clp.cc
1.23 +lemon_libemon_la_SOURCES += lemon/clp.cc
1.24 endif
1.25
1.26 lemon_HEADERS += \
1.27 @@ -50,10 +50,12 @@
1.28 lemon/bfs.h \
1.29 lemon/bin_heap.h \
1.30 lemon/circulation.h \
1.31 + lemon/clp.h \
1.32 lemon/color.h \
1.33 lemon/concept_check.h \
1.34 lemon/counter.h \
1.35 lemon/core.h \
1.36 + lemon/cplex.h \
1.37 lemon/dfs.h \
1.38 lemon/dijkstra.h \
1.39 lemon/dim2.h \
1.40 @@ -61,6 +63,7 @@
1.41 lemon/elevator.h \
1.42 lemon/error.h \
1.43 lemon/full_graph.h \
1.44 + lemon/glpk.h \
1.45 lemon/graph_to_eps.h \
1.46 lemon/grid_graph.h \
1.47 lemon/hypercube_graph.h \
1.48 @@ -71,11 +74,7 @@
1.49 lemon/list_graph.h \
1.50 lemon/lp.h \
1.51 lemon/lp_base.h \
1.52 - lemon/lp_clp.h \
1.53 - lemon/lp_cplex.h \
1.54 - lemon/lp_glpk.h \
1.55 lemon/lp_skeleton.h \
1.56 - lemon/lp_soplex.h \
1.57 lemon/list_graph.h \
1.58 lemon/maps.h \
1.59 lemon/math.h \
1.60 @@ -86,6 +85,7 @@
1.61 lemon/radix_sort.h \
1.62 lemon/random.h \
1.63 lemon/smart_graph.h \
1.64 + lemon/soplex.h \
1.65 lemon/suurballe.h \
1.66 lemon/time_measure.h \
1.67 lemon/tolerance.h \