Changeset 469:04c0631fd332 in lemon-1.2 for lemon

Timestamp:

01/12/09 14:37:37 (16 years ago)

Author:

Alpar Juttner <alpar@…>

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

Message:

Merge

Files:

• lemon/Makefile.am (modified) (2 diffs)
• lemon/Makefile.am (modified) (4 diffs)

lemon/Makefile.am

@@ -61 +61 @@
         lemon/dim2.h \
         lemon/dimacs.h \
+        lemon/edge_set.h \
         lemon/elevator.h \
         lemon/error.h \
@@ -98 +99 @@
         lemon/bits/bezier.h \
         lemon/bits/default_map.h \
+        lemon/bits/edge_set_extender.h \
         lemon/bits/enable_if.h \
         lemon/bits/graph_adaptor_extender.h \

lemon/Makefile.am

@@ -8 +8 @@
 
 lemon_libemon_la_SOURCES = \
-        lemon/arg_parser.cc \
-        lemon/base.cc \
-        lemon/color.cc \
-        lemon/random.cc
+        lemon/arg_parser.cc \
+        lemon/base.cc \
+        lemon/color.cc \
+        lemon/lp_base.cc \
+        lemon/lp_skeleton.cc \
+        lemon/random.cc
 
-#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)
-#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
+
+lemon_libemon_la_CXXFLAGS = \
+        $(GLPK_CFLAGS) \
+        $(CPLEX_CFLAGS) \
+        $(SOPLEX_CXXFLAGS) \
+        $(CLP_CXXFLAGS)
+
+lemon_libemon_la_LDFLAGS = \
+        $(GLPK_LIBS) \
+        $(CPLEX_LIBS) \
+        $(SOPLEX_LIBS) \
+        $(CLP_LIBS)
+
+if HAVE_GLPK
+lemon_libemon_la_SOURCES += lemon/glpk.cc
+endif
+
+if HAVE_CPLEX
+lemon_libemon_la_SOURCES += lemon/cplex.cc
+endif
+
+if HAVE_SOPLEX
+lemon_libemon_la_SOURCES += lemon/soplex.cc
+endif
+
+if HAVE_CLP
+lemon_libemon_la_SOURCES += lemon/clp.cc
+endif
 
 lemon_HEADERS += \
         lemon/adaptors.h \
-        lemon/arg_parser.h \
+        lemon/arg_parser.h \
         lemon/assert.h \
-        lemon/bfs.h \
-        lemon/bin_heap.h \
-        lemon/circulation.h \
-        lemon/color.h \
+        lemon/bfs.h \
+        lemon/bin_heap.h \
+        lemon/circulation.h \
+        lemon/clp.h \
+        lemon/color.h \
         lemon/concept_check.h \
-        lemon/counter.h \
+        lemon/counter.h \
         lemon/core.h \
-        lemon/dfs.h \
-        lemon/dijkstra.h \
-        lemon/dim2.h \
-        lemon/dimacs.h \
+        lemon/cplex.h \
+        lemon/dfs.h \
+        lemon/dijkstra.h \
+        lemon/dim2.h \
+        lemon/dimacs.h \
         lemon/edge_set.h \
         lemon/elevator.h \
         lemon/error.h \
         lemon/full_graph.h \
-        lemon/graph_to_eps.h \
-        lemon/grid_graph.h \
+        lemon/glpk.h \
+        lemon/graph_to_eps.h \
+        lemon/grid_graph.h \
         lemon/hypercube_graph.h \
         lemon/kruskal.h \
@@ -42 +73 @@
         lemon/lgf_reader.h \
         lemon/lgf_writer.h \
+        lemon/list_graph.h \
+        lemon/lp.h \
+        lemon/lp_base.h \
+        lemon/lp_skeleton.h \
         lemon/list_graph.h \
         lemon/maps.h \
@@ -49 +84 @@
         lemon/path.h \
         lemon/preflow.h \
-        lemon/random.h \
+        lemon/radix_sort.h \
+        lemon/random.h \
         lemon/smart_graph.h \
+        lemon/soplex.h \
         lemon/suurballe.h \
-        lemon/time_measure.h \
-        lemon/tolerance.h \
+        lemon/time_measure.h \
+        lemon/tolerance.h \
         lemon/unionfind.h
 
@@ -60 +97 @@
         lemon/bits/array_map.h \
         lemon/bits/base_extender.h \
-        lemon/bits/bezier.h \
+        lemon/bits/bezier.h \
         lemon/bits/default_map.h \
         lemon/bits/edge_set_extender.h \
-        lemon/bits/enable_if.h \
+        lemon/bits/enable_if.h \
         lemon/bits/graph_adaptor_extender.h \
         lemon/bits/graph_extender.h \
         lemon/bits/map_extender.h \
         lemon/bits/path_dump.h \
+        lemon/bits/solver_bits.h \
         lemon/bits/traits.h \
         lemon/bits/variant.h \