Changeset 686:7439dc5fe1b9 in lemon-main

Timestamp:

08/20/09 22:52:03 (15 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

683:9f529abcaebf (diff), 513:17cabb114d52 (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) (5 diffs)
• lemon/Makefile.am (modified) (1 diff)

lemon/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST += \
         lemon/lemon.pc.in \
-        lemon/CMakeLists.txt
+        lemon/CMakeLists.txt \
+        lemon/config.h.cmake
 
 pkgconfig_DATA += lemon/lemon.pc
@@ -13 +14 @@
         lemon/lp_base.cc \
         lemon/lp_skeleton.cc \
-        lemon/random.cc
+        lemon/random.cc \
+        lemon/bits/windows.cc
 
+nodist_lemon_HEADERS = lemon/config.h   
 
 lemon_libemon_la_CXXFLAGS = \
+        $(AM_CXXFLAGS) \
         $(GLPK_CFLAGS) \
         $(CPLEX_CFLAGS) \
         $(SOPLEX_CXXFLAGS) \
-        $(CLP_CXXFLAGS)
+        $(CLP_CXXFLAGS) \
+        $(CBC_CXXFLAGS)
 
 lemon_libemon_la_LDFLAGS = \
@@ -26 +31 @@
         $(CPLEX_LIBS) \
         $(SOPLEX_LIBS) \
-        $(CLP_LIBS)
+        $(CLP_LIBS) \
+        $(CBC_LIBS)
 
 if HAVE_GLPK
-lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
+lemon_libemon_la_SOURCES += lemon/glpk.cc
 endif
 
 if HAVE_CPLEX
-lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
+lemon_libemon_la_SOURCES += lemon/cplex.cc
 endif
 
 if HAVE_SOPLEX
-lemon_libemon_la_SOURCES += lemon/lp_soplex.cc
+lemon_libemon_la_SOURCES += lemon/soplex.cc
 endif
 
 if HAVE_CLP
-lemon_libemon_la_SOURCES += lemon/lp_clp.cc
+lemon_libemon_la_SOURCES += lemon/clp.cc
+endif
+
+if HAVE_CBC
+lemon_libemon_la_SOURCES += lemon/cbc.cc
 endif
 
@@ -50 +60 @@
         lemon/bfs.h \
         lemon/bin_heap.h \
+        lemon/bucket_heap.h \
+        lemon/cbc.h \
         lemon/circulation.h \
+        lemon/clp.h \
         lemon/color.h \
         lemon/concept_check.h \
+        lemon/connectivity.h \
         lemon/counter.h \
         lemon/core.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/euler.h \
+        lemon/fib_heap.h \
         lemon/full_graph.h \
+        lemon/glpk.h \
+        lemon/gomory_hu.h \
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \
@@ -72 +92 @@
         lemon/lp.h \
         lemon/lp_base.h \
-        lemon/lp_clp.h \
-        lemon/lp_cplex.h \
-        lemon/lp_glpk.h \
         lemon/lp_skeleton.h \
-        lemon/lp_soplex.h \
         lemon/maps.h \
+        lemon/matching.h \
         lemon/math.h \
-        lemon/max_matching.h \
+        lemon/min_cost_arborescence.h \
         lemon/nauty_reader.h \
+        lemon/network_simplex.h \
         lemon/path.h \
         lemon/preflow.h \
+        lemon/radix_heap.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/unionfind.h
+        lemon/unionfind.h \
+        lemon/bits/windows.h
 
 bits_HEADERS += \
         lemon/bits/alteration_notifier.h \
         lemon/bits/array_map.h \
-        lemon/bits/base_extender.h \
         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

@@ -93 +93 @@
         lemon/lp_base.h \
         lemon/lp_skeleton.h \
-        lemon/list_graph.h \
         lemon/maps.h \
         lemon/matching.h \