Changeset 658:85cb3aa71cce in lemon for lemon/Makefile.am

Timestamp:

04/21/09 16:18:54 (15 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

659:0c8e5c688440, 660:b1811c363299, 666:ec817dfc2cb7

Parents:

647:0ba8dfce7259 (diff), 657:dacc2cee2b4c (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 and fix

Files:

• lemon/Makefile.am (modified) (1 diff)
• lemon/Makefile.am (modified) (5 diffs)

lemon/Makefile.am

@@ -94 +94 @@
         lemon/min_cost_arborescence.h \
         lemon/nauty_reader.h \
+        lemon/network_simplex.h \
         lemon/path.h \
         lemon/preflow.h \

lemon/Makefile.am

@@ -13 +13 @@
         lemon/lp_base.cc \
         lemon/lp_skeleton.cc \
-        lemon/random.cc \
+        lemon/random.cc \
         lemon/bits/windows.cc
 
 
 lemon_libemon_la_CXXFLAGS = \
+        $(AM_CXXFLAGS) \
         $(GLPK_CFLAGS) \
         $(CPLEX_CFLAGS) \
         $(SOPLEX_CXXFLAGS) \
-        $(CLP_CXXFLAGS)
+        $(CLP_CXXFLAGS) \
+        $(CBC_CXXFLAGS)
 
 lemon_libemon_la_LDFLAGS = \
@@ -27 +29 @@
         $(CPLEX_LIBS) \
         $(SOPLEX_LIBS) \
-        $(CLP_LIBS)
+        $(CLP_LIBS) \
+        $(CBC_LIBS)
 
 if HAVE_GLPK
@@ -43 +46 @@
 if HAVE_CLP
 lemon_libemon_la_SOURCES += lemon/clp.cc
+endif
+
+if HAVE_CBC
+lemon_libemon_la_SOURCES += lemon/cbc.cc
 endif
 
@@ -69 +76 @@
         lemon/full_graph.h \
         lemon/glpk.h \
+        lemon/gomory_hu.h \
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \
@@ -82 +90 @@
         lemon/list_graph.h \
         lemon/maps.h \
+        lemon/matching.h \
         lemon/math.h \
-        lemon/max_matching.h \
         lemon/min_cost_arborescence.h \
         lemon/nauty_reader.h \