Changeset 67:9de02aa380de in lemon-main

Timestamp:

02/07/08 22:23:23 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

69:914ffb9b3798, 99:dbaa96cc1013

Parents:

66:5f7a8570687d (diff), 65:bfbc57a51fbb (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) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)

lemon/Makefile.am

@@ -18 +18 @@
         lemon/concept_check.h \
         lemon/dim2.h \
+        lemon/error.h \
+        lemon/list_graph.h \
+        lemon/maps.h \
         lemon/random.h \
-        lemon/list_graph.h \
-        lemon/maps.h \
         lemon/tolerance.h
 
 bits_HEADERS += \
+        lemon/bits/alteration_notifier.h \
+        lemon/bits/array_map.h \
+        lemon/bits/base_extender.h \
+        lemon/bits/default_map.h \
+        lemon/bits/graph_extender.h \
         lemon/bits/invalid.h \
-        lemon/bits/utility.h
+        lemon/bits/map_extender.h \
+        lemon/bits/traits.h \
+        lemon/bits/utility.h \
+        lemon/bits/vector_map.h
 
 concept_HEADERS += \
-        lemon/concepts/maps.h
+        lemon/concept_check.h \
+        lemon/concepts/digraph.h \
+        lemon/concepts/graph.h \
+        lemon/concepts/maps.h \
+        lemon/concepts/graph_components.h

lemon/Makefile.am

@@ -16 +16 @@
 
 lemon_HEADERS += \
+        lemon/concept_check.h \
         lemon/dim2.h \
         lemon/error.h \

test/Makefile.am

@@ -3 +3 @@
 
 noinst_HEADERS += \
+        test/digraph_test.h \
+        test/map_test.h \
         test/test_tools.h
 
 check_PROGRAMS += \
+        test/digraph_test \
         test/dim_test \
+        test/graph_test \
         test/maps_test \
         test/random_test \
@@ -15 +19 @@
 XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
 
+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_random_test_SOURCES = test/random_test.cc

test/Makefile.am

@@ -11 +11 @@
         test/dim_test \
         test/graph_test \
+        test/maps_test \
         test/random_test \
         test/test_tools_fail \
@@ -22 +23 @@
 #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_random_test_SOURCES = test/random_test.cc
 test_test_tools_fail_SOURCES = test/test_tools_fail.cc