Changeset 101:70f3967ca6eb in lemon-main

Timestamp:

03/20/08 13:12:24 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

95:cc7e6b8b59bf (diff), 100:4f754b4cf82b (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) (3 diffs)
• lemon/Makefile.am (modified) (3 diffs)

lemon/Makefile.am

@@ -18 +18 @@
 lemon_HEADERS += \
         lemon/arg_parser.h \
-        lemon/concept_check.h \
+        lemon/bfs.h \
+        lemon/bin_heap.h \
+        lemon/dfs.h \
+        lemon/dijkstra.h \
         lemon/dim2.h \
         lemon/error.h \
+        lemon/graph_utils.h \
         lemon/list_graph.h \
         lemon/maps.h \
         lemon/math.h \
+        lemon/path.h \
         lemon/random.h \
         lemon/tolerance.h
@@ -35 +40 @@
         lemon/bits/invalid.h \
         lemon/bits/map_extender.h \
+        lemon/bits/path_dump.h \
         lemon/bits/traits.h \
         lemon/bits/utility.h \
@@ -43 +49 @@
         lemon/concepts/digraph.h \
         lemon/concepts/graph.h \
+        lemon/concepts/heap.h \
         lemon/concepts/maps.h \
+        lemon/concepts/path.h \
         lemon/concepts/graph_components.h

lemon/Makefile.am

@@ -8 +8 @@
 
 lemon_libemon_la_SOURCES = \
+        lemon/arg_parser.cc \
         lemon/base.cc \
         lemon/random.cc
@@ -16 +17 @@
 
 lemon_HEADERS += \
+        lemon/arg_parser.h \
         lemon/bfs.h \
         lemon/bin_heap.h \
@@ -25 +27 @@
         lemon/list_graph.h \
         lemon/maps.h \
+        lemon/math.h \
         lemon/path.h \
         lemon/random.h \