Changeset 337:560e4b6d020d in lemon-main

Timestamp:

10/22/08 23:14:00 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

333:9c2a532aa5ef (diff), 336:052cecabcb71 (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:

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

doc/Makefile.am

@@ -15 +15 @@
 
 DOC_EPS_IMAGES18 = \
+        grid_graph.eps \
         nodeshape_0.eps \
         nodeshape_1.eps \

doc/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST += \
         doc/Doxyfile.in \
+        doc/DoxygenLayout.xml \
         doc/coding_style.dox \
         doc/dirs.dox \
@@ -7 +8 @@
         doc/license.dox \
         doc/mainpage.dox \
+        doc/migration.dox \
+        doc/named-param.dox \
         doc/namespaces.dox \
         doc/html \

lemon/Makefile.am

@@ -30 +30 @@
         lemon/error.h \
         lemon/graph_to_eps.h \
+        lemon/grid_graph.h \
         lemon/kruskal.h \
         lemon/lgf_reader.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 += \
@@ -38 +37 @@
         lemon/maps.h \
         lemon/math.h \
+        lemon/max_matching.h \
         lemon/path.h \
         lemon/random.h \