Fix header paths braindamage in the tests directory too.

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3df22604a38dd7d4872759c3f8b1a64445713ec8..42c562960842e416b19202fa2f8458625df426bc 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -16,7 +16,7 @@ CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CXXCPP = @CXXCPP@
-INCLUDES = -I../include -I${top_srcdir}/include -I${srcdir} -I${top_srcdir}/src -I${top_srcdir}/src/base -I${top_srcdir}/src/float -I${top_srcdir}/src/float/lfloat -I${top_srcdir}/src/integer -I${top_srcdir}/src/base/random -I${top_srcdir}/src/base/digitseq -I${top_srcdir}/src/base/digit -I../src/base -I${top_srcdir}/src/base
+INCLUDES = -I../include -I${top_srcdir}/include -I${srcdir} -I${top_srcdir}/src -I$(top_builddir)/src
 override CPPFLAGS += ${INCLUDES}
 LIBTOOL = @LIBTOOL@
 LIBTOOL_LINK = ${LIBTOOL} --mode=link

diff --git a/tests/test_MI.cc b/tests/test_MI.cc
index 691565da7b9c4b3ca92ad3c5b6a15b7c4faa9aff..89d0a402c86c3c82e499b4370249d2f17eebeb0d 100644 (file)
--- a/tests/test_MI.cc
+++ b/tests/test_MI.cc
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "cl_macros.h"
+#include "base/cl_macros.h"
 
 extern int test_MI_canonhom (int iterations);
 extern int test_MI_plus (int iterations);

diff --git a/tests/timeLFRAmul.cc b/tests/timeLFRAmul.cc
index af6a41fa2644d3cb128abb304e65e046f2010fef..3db524b1bba813742b5118c940111a533dad54ac 100644 (file)
--- a/tests/timeLFRAmul.cc
+++ b/tests/timeLFRAmul.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/integer.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/rational.h>
 #include <cln/float_io.h>
 #include <cln/random.h>

diff --git a/tests/timeLFatan-compare.cc b/tests/timeLFatan-compare.cc
index 1f27540832c49e3e11482c710be7cf00848a502a..6910c60e8ffec50f0e9db5fcc4759f4ff9261197 100644 (file)
--- a/tests/timeLFatan-compare.cc
+++ b/tests/timeLFatan-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFatan.cc b/tests/timeLFatan.cc
index ee2ac785b9bfe82aa0937bf10108f6d2a36e77dc..481d164efebd3534c0e50ca7dbbdff2ad8d08021 100644 (file)
--- a/tests/timeLFatan.cc
+++ b/tests/timeLFatan.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFatanh-compare.cc b/tests/timeLFatanh-compare.cc
index fc6415d47270161322eb73d1431278309b6f0908..36343d739a34baf2b14d5e2c6d1b4cd7825ef300 100644 (file)
--- a/tests/timeLFatanh-compare.cc
+++ b/tests/timeLFatanh-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/complex.h>
 #include <cln/real.h>
 #include <cln/random.h>

diff --git a/tests/timeLFatanh.cc b/tests/timeLFatanh.cc
index 1d46238918696303b883b6779402acc642d6b79c..ea1551acf82e4d5b23204b1c180ccef1a2437661 100644 (file)
--- a/tests/timeLFatanh.cc
+++ b/tests/timeLFatanh.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/complex.h>
 #include <cln/complex_io.h>
 #include <cln/real.h>

diff --git a/tests/timeLFcos-compare.cc b/tests/timeLFcos-compare.cc
index aefbd567ee66776917ca711a087316543bb8176f..63159cea441bd48b5a233473d2a8cbcf2b42c0da 100644 (file)
--- a/tests/timeLFcos-compare.cc
+++ b/tests/timeLFcos-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFcos.cc b/tests/timeLFcos.cc
index 1681351de7a88f583990be5c1cbf84ab7f089d59..7d5ac8f59b28d123fab69e9ff0bb3b7f6301f994 100644 (file)
--- a/tests/timeLFcos.cc
+++ b/tests/timeLFcos.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFcosh.cc b/tests/timeLFcosh.cc
index 9f346cab0354c80f677392e0815a1669c9fa2610..3d6e17820988b3a177431b1a519c7b5a1bf23178 100644 (file)
--- a/tests/timeLFcosh.cc
+++ b/tests/timeLFcosh.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFexp-compare.cc b/tests/timeLFexp-compare.cc
index 16fd06a60e88ed07fc713908ce49ec9f5612afe2..e963ce936e2c9062009a353a3ae78f958c81c9e1 100644 (file)
--- a/tests/timeLFexp-compare.cc
+++ b/tests/timeLFexp-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFexp.cc b/tests/timeLFexp.cc
index 18c6fab7dd9463ea66233702b1267888bd6d8017..f060ac6dfba1ac95b28af2d490d5cc68f3a03b71 100644 (file)
--- a/tests/timeLFexp.cc
+++ b/tests/timeLFexp.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFln-compare.cc b/tests/timeLFln-compare.cc
index ba82b6dc5597ad63fada0b0a7d91c7d2fc4b6e05..9fa5eb9a0c7fe1573c62d7855252190f7cd578ef 100644 (file)
--- a/tests/timeLFln-compare.cc
+++ b/tests/timeLFln-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFln.cc b/tests/timeLFln.cc
index 224258cfd050627bddeab8e9e29ef969c512cce9..f59eadc67ba1df9d7efe9a7536694fbb87710a3d 100644 (file)
--- a/tests/timeLFln.cc
+++ b/tests/timeLFln.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFsin-compare.cc b/tests/timeLFsin-compare.cc
index eda9b7db71ac16237b0b48b0c2b54012a74a68e9..d6e26fce6af4bff119f2c626872db56f2a7ee5c7 100644 (file)
--- a/tests/timeLFsin-compare.cc
+++ b/tests/timeLFsin-compare.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/float.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFsin.cc b/tests/timeLFsin.cc
index 2df7ab14dfd8dbb97153ca75c21fd7b1bfca34b0..01cc7418a35d4d1f4fc556ddc2864d769e80f581 100644 (file)
--- a/tests/timeLFsin.cc
+++ b/tests/timeLFsin.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFsinh.cc b/tests/timeLFsinh.cc
index c8f71708353d893e26e76ecb31927345a05391da..a95406bae6429031f63c384c4ae66e2bdd62b014 100644 (file)
--- a/tests/timeLFsinh.cc
+++ b/tests/timeLFsinh.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeLFsqrt.cc b/tests/timeLFsqrt.cc
index 5ace7352bb3e5a5733f2afe424a54d70d1c4a97e..02722cd155029611ed77bd19f37afface7dea2cf 100644 (file)
--- a/tests/timeLFsqrt.cc
+++ b/tests/timeLFsqrt.cc
@@ -3,7 +3,7 @@
 #include <cln/float.h>
 #include <cln/float_io.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/real.h>
 #include <cln/random.h>
 #include <cstdlib>

diff --git a/tests/timeRALFdiv.cc b/tests/timeRALFdiv.cc
index 74e79f80b0163041b2d18a6cc2e3e2cfc483c092..ec990bc2b707fe473e63907b0aa8b0b226200294 100644 (file)
--- a/tests/timeRALFdiv.cc
+++ b/tests/timeRALFdiv.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/integer.h>
 #include <cln/lfloat.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 #include <cln/rational.h>
 #include <cln/float_io.h>
 #include <cln/random.h>

diff --git a/tests/timecatalan.cc b/tests/timecatalan.cc
index a0cb8221892eed303bb428e128c08d340c684d92..fbb24ad8b4642e41efedfc68a11a84249fb4c861 100644 (file)
--- a/tests/timecatalan.cc
+++ b/tests/timecatalan.cc
@@ -6,7 +6,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 using namespace cln;
 
 int main (int argc, char * argv[])

diff --git a/tests/timediv2adic-compare.cc b/tests/timediv2adic-compare.cc
index e8dabb076231faa92d2467f208c094ce8f075d58..b682aa437b213c254df377455a3bec1e07ed9413 100644 (file)
--- a/tests/timediv2adic-compare.cc
+++ b/tests/timediv2adic-compare.cc
@@ -1,10 +1,10 @@
 #include <cln/number.h>
 #include <cln/io.h>
 #include <cln/integer.h>
-#include "cl_DS.h"
-#include "cl_2DS.h"
+#include "base/digitseq/cl_DS.h"
+#include "base/digitseq/cl_2DS.h"
 #include <cln/random.h>
-#include "cl_random_impl.h"
+#include "base/random/cl_random_impl.h"
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>

diff --git a/tests/timediv2adic.cc b/tests/timediv2adic.cc
index 9ccc7778422121e6026641bee240eb68258869b9..7918c97c10bd9164f9399cd30494af0cf9102170 100644 (file)
--- a/tests/timediv2adic.cc
+++ b/tests/timediv2adic.cc
@@ -1,10 +1,10 @@
 #include <cln/number.h>
 #include <cln/io.h>
 #include <cln/integer.h>
-#include "cl_DS.h"
-#include "cl_2DS.h"
+#include "base/digitseq/cl_DS.h"
+#include "base/digitseq/cl_2DS.h"
 #include <cln/random.h>
-#include "cl_random_impl.h"
+#include "base/random/cl_random_impl.h"
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>

diff --git a/tests/timeeuler.cc b/tests/timeeuler.cc
index 5d2633b41176ffff645d2e2a118fb9ee892f02ea..40f44eace139ddc8f9610b9cb8247a4f4f6464c9 100644 (file)
--- a/tests/timeeuler.cc
+++ b/tests/timeeuler.cc
@@ -6,7 +6,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 using namespace cln;
 
 int main (int argc, char * argv[])

diff --git a/tests/timefact.cc b/tests/timefact.cc
index 894f02800770f7ff50fdb27426a22a3f87cdc33f..572640c0de53b13a748b560bc60d3b2c71ceb93f 100644 (file)
--- a/tests/timefact.cc
+++ b/tests/timefact.cc
@@ -2,7 +2,7 @@
 #include <cln/io.h>
 #include <cln/integer.h>
 #include <cln/random.h>
-#include "cl_I.h"
+#include "integer/cl_I.h"
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>

diff --git a/tests/timerecip2adic-compare.cc b/tests/timerecip2adic-compare.cc
index 4e8857f3b52d35e2f3584f76ad69acbcee6ddc60..bf9bc3eebe23f4fe0f215997797a889aaee024dc 100644 (file)
--- a/tests/timerecip2adic-compare.cc
+++ b/tests/timerecip2adic-compare.cc
@@ -1,10 +1,10 @@
 #include <cln/number.h>
 #include <cln/io.h>
 #include <cln/integer.h>
-#include "cl_DS.h"
-#include "cl_2DS.h"
+#include "base/digitseq/cl_DS.h"
+#include "base/digitseq/cl_2DS.h"
 #include <cln/random.h>
-#include "cl_random_impl.h"
+#include "base/random/cl_random_impl.h"
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>

diff --git a/tests/timerecip2adic.cc b/tests/timerecip2adic.cc
index 366f79b2e94ccfb4edbfdd58ada3efbeac5e7df9..fa2c38e0aa83eb1e40b92b90e78a2544e7a0b047 100644 (file)
--- a/tests/timerecip2adic.cc
+++ b/tests/timerecip2adic.cc
@@ -1,10 +1,10 @@
 #include <cln/number.h>
 #include <cln/io.h>
 #include <cln/integer.h>
-#include "cl_DS.h"
-#include "cl_2DS.h"
+#include "base/digitseq/cl_DS.h"
+#include "base/digitseq/cl_2DS.h"
 #include <cln/random.h>
-#include "cl_random_impl.h"
+#include "base/random/cl_random_impl.h"
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>

diff --git a/tests/timezeta3.cc b/tests/timezeta3.cc
index b0f8608030e5014853e9e6321c65153d25687b9f..eae434fc9ad8845e74b2b09d171850123b56db8b 100644 (file)
--- a/tests/timezeta3.cc
+++ b/tests/timezeta3.cc
@@ -5,7 +5,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cln/timing.h>
-#include "cl_LF.h"
+#include "float/lfloat/cl_LF.h"
 using namespace cln;
 
 int main (int argc, char * argv[])