Move contents of gfpmath to numbertheory. Adjust dependencies.

5 files changed, 3 insertions, 15 deletions

diff --git a/src/math/gfpmath/info.txt b/src/math/gfpmath/info.txt
deleted file mode 100644
index 482773cda..000000000
--- a/src/math/gfpmath/info.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-define BIGINT_GFP
-
-<header:public>
-curve_gfp.h
-point_gfp.h
-</header:public>
-
-<source>
-point_gfp.cpp
-</source>
-
-<requires>
-bigint
-numbertheory
-</requires>
diff --git a/src/math/gfpmath/curve_gfp.h b/src/math/numbertheory/curve_gfp.h
index 697065dfe..697065dfe 100644
--- a/src/math/gfpmath/curve_gfp.h
+++ b/src/math/numbertheory/curve_gfp.h
diff --git a/src/math/numbertheory/info.txt b/src/math/numbertheory/info.txt
index 19abfaaa0..58851e055 100644
--- a/src/math/numbertheory/info.txt
+++ b/src/math/numbertheory/info.txt
@@ -4,7 +4,9 @@ define BIGINT_MATH
 
 <header:public>
 blinding.h
+curve_gfp.h
 numthry.h
+point_gfp.h
 pow_mod.h
 reducer.h
 </header:public>
@@ -20,6 +22,7 @@ jacobi.cpp
 make_prm.cpp
 mp_numth.cpp
 numthry.cpp
+point_gfp.cpp
 pow_mod.cpp
 powm_fw.cpp
 powm_mnt.cpp
diff --git a/src/math/gfpmath/point_gfp.cpp b/src/math/numbertheory/point_gfp.cpp
index 06c42d18c..06c42d18c 100644
--- a/src/math/gfpmath/point_gfp.cpp
+++ b/src/math/numbertheory/point_gfp.cpp
diff --git a/src/math/gfpmath/point_gfp.h b/src/math/numbertheory/point_gfp.h
index 0741b5e56..0741b5e56 100644
--- a/src/math/gfpmath/point_gfp.h
+++ b/src/math/numbertheory/point_gfp.h