Changeset 368:99f1bdf8f7db in lemon for lemon/Makefile.am

Timestamp:

11/04/08 11:21:22 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

362:c6c6e1d863c4 (diff), 367:aa75d24ba7d0 (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) (1 diff)
• lemon/Makefile.am (modified) (3 diffs)

lemon/Makefile.am

@@ -29 +29 @@
         lemon/dim2.h \
         lemon/error.h \
+        lemon/full_graph.h \
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \

lemon/Makefile.am

@@ -13 +13 @@
         lemon/random.cc
 
-
-lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
-lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
+#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
+#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
 
 lemon_HEADERS += \
@@ -32 +31 @@
         lemon/full_graph.h \
         lemon/graph_to_eps.h \
+        lemon/grid_graph.h \
         lemon/kruskal.h \
         lemon/lgf_reader.h \
@@ -38 +38 @@
         lemon/maps.h \
         lemon/math.h \
+        lemon/max_matching.h \
+        lemon/nauty_reader.h \
         lemon/path.h \
         lemon/random.h \
         lemon/smart_graph.h \
+        lemon/suurballe.h \
         lemon/time_measure.h \
         lemon/tolerance.h \