Changeset 99:dbaa96cc1013 in lemon-main

Timestamp:

02/07/08 22:28:39 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

98:c4582fc14f58 (diff), 67:9de02aa380de (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) (2 diffs)
• lemon/Makefile.am (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)

lemon/Makefile.am

@@ -21 +21 @@
         lemon/list_graph.h \
         lemon/maps.h \
+        lemon/path.h \
         lemon/random.h \
         lemon/tolerance.h
@@ -41 +42 @@
         lemon/concepts/graph.h \
         lemon/concepts/maps.h \
+        lemon/concepts/path.h \
         lemon/concepts/graph_components.h

lemon/Makefile.am

@@ -16 +16 @@
 
 lemon_HEADERS += \
+        lemon/concept_check.h \
         lemon/dim2.h \
+        lemon/error.h \
+        lemon/list_graph.h \
         lemon/maps.h \
         lemon/path.h \
         lemon/random.h \
-        lemon/list_graph.h \
         lemon/tolerance.h
 

test/Makefile.am

@@ -13 +13 @@
         test/maps_test \
         test/random_test \
+        test/path_test \
         test/test_tools_fail \
         test/test_tools_pass
@@ -24 +25 @@
 test_graph_test_SOURCES = test/graph_test.cc
 test_maps_test_SOURCES = test/maps_test.cc
+test_path_test_SOURCES = test/path_test.cc
 test_random_test_SOURCES = test/random_test.cc
 test_test_tools_fail_SOURCES = test/test_tools_fail.cc

test/Makefile.am

@@ -11 +11 @@
         test/dim_test \
         test/graph_test \
+        test/maps_test \
         test/random_test \
         test/path_test \
@@ -21 +22 @@
 test_digraph_test_SOURCES = test/digraph_test.cc
 test_dim_test_SOURCES = test/dim_test.cc
+#test_error_test_SOURCES = test/error_test.cc
 test_graph_test_SOURCES = test/graph_test.cc
+test_maps_test_SOURCES = test/maps_test.cc
 test_path_test_SOURCES = test/path_test.cc
 test_random_test_SOURCES = test/random_test.cc