Changes in / [74:9394072da54f:75:6265aa2f9d7e] in lemon-main

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• lemon/Makefile.am (modified) (1 diff)
• lemon/error.h (added)
• lemon/math.h (added)
• lemon/random.h (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/error_test.cc (added)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
 LDADD = $(top_builddir)/lemon/libemon.la
 

configure.ac

@@ -14 +14 @@
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc])
 AC_CONFIG_SRCDIR([lemon/list_graph.h])
 AC_CONFIG_HEADERS([config.h lemon/config.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/math.h \
         lemon/random.h \
-        lemon/list_graph.h \
         lemon/tolerance.h
 

lemon/random.h

@@ -68 +68 @@
 
 #include <ctime>
-#include <cmath>
-
+
+#include <lemon/math.h>
 #include <lemon/dim2.h>
+
 ///\ingroup misc
 ///\file
@@ -760 +761 @@
       double xi,nu;
       const double delta = k-std::floor(k);
-      const double v0=M_E/(M_E-delta);
+      const double v0=E/(E-delta);
       do {
         double V0=1.0-real<double>();

test/Makefile.am

@@ -11 +11 @@
         test/dim_test \
         test/graph_test \
+        test/maps_test \
         test/random_test \
         test/test_tools_fail \
@@ -20 +21 @@
 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_test_tools_fail_SOURCES = test/test_tools_fail.cc