Changeset 65:bfbc57a51fbb in lemon-main

Timestamp:

02/06/08 11:52:58 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

24:1f781d1f9b79 (diff), 31:742abd64255e (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 (redo buggy merge ad7f593399b0)

Files:

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

lemon/Makefile.am

@@ -16 +16 @@
 
 lemon_HEADERS += \
+        lemon/concept_check.h \
         lemon/dim2.h \
         lemon/random.h \
         lemon/list_graph.h \
+        lemon/maps.h \
         lemon/tolerance.h
 
@@ -25 +27 @@
         lemon/bits/utility.h
 
-concept_HEADERS +=
+concept_HEADERS += \
+        lemon/concepts/maps.h

lemon/Makefile.am

@@ -8 +8 @@
 
 lemon_libemon_la_SOURCES = \
-        lemon/base.cc
+        lemon/base.cc \
+        lemon/random.cc
+
 
 lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
@@ -15 +17 @@
 lemon_HEADERS += \
         lemon/concept_check.h \
+        lemon/dim2.h \
+        lemon/random.h \
         lemon/list_graph.h \
         lemon/maps.h \

test/Makefile.am

@@ -7 +7 @@
 check_PROGRAMS += \
         test/dim_test \
+        test/maps_test \
         test/random_test \
         test/test_tools_fail \
@@ -15 +16 @@
 
 test_dim_test_SOURCES = test/dim_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

test/Makefile.am

@@ -4 +4 @@
 noinst_HEADERS += \
         test/test_tools.h
- 
+
 check_PROGRAMS += \
+        test/dim_test \
         test/maps_test \
+        test/random_test \
         test/test_tools_fail \
         test/test_tools_pass
- 
+
 TESTS += $(check_PROGRAMS)
 XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
 
+test_dim_test_SOURCES = test/dim_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
 test_test_tools_pass_SOURCES = test/test_tools_pass.cc