X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/ee39a683a2b623a1da0747ec20f20b63470a2db6..8c5956c14f5834a072e1a9345ae1f356b14164ca:/math/Makefile.am

diff --git a/math/Makefile.am b/math/Makefile.am
index 2a60ee0f..7c4ffed4 100644
--- a/math/Makefile.am
+++ b/math/Makefile.am
@@ -39,9 +39,9 @@ TEST_LIBS		 = libmath.la
 ## The `mpgen' tool for dealing with these things.
 mpgen			 = $(srcdir)/mpgen
 EXTRA_DIST		+= mpgen
-AM_V_MPGEN		 = $(AM_V_MPGEN_$(V))
-AM_V_MPGEN_		 = $(AM_V_MPGEN_$(AM_DEFAULT_VERBOSITY))
-AM_V_MPGEN_0		 = @echo "  MPGEN  $@";
+AM_V_MPGEN		 = $(AM_V_MPGEN_@AM_V@)
+AM_V_MPGEN_		 = $(AM_V_MPGEN_@AM_DEFAULT_V@)
+AM_V_MPGEN_0		 = @echo "  MPGEN    $@";
 MPGEN			 = $(AM_V_MPGEN)$(PYTHON) $(mpgen)
 
 ## The type information collected by `configure'.
@@ -197,6 +197,7 @@ mpx_mul4_t_SOURCES	 = mpx-mul4-test.c $(MPX_MUL4_SOURCES)
 mpx_mul4_t_CPPFLAGS	 = \
 	$(AM_CPPFLAGS) \
 	-DTEST_MUL4 -DSRCDIR="\"$(srcdir)\""
+mpx_mul4_t_LDFLAGS	 = $(TEST_LDFLAGS)
 mpx_mul4_t_LDADD	 = $(top_builddir)/libcatacomb.la $(mLib_LIBS)
 EXTRA_DIST		+= t/mpx-mul4
 
@@ -245,9 +246,10 @@ libmath_la_SOURCES	+= pfilt.c
 pkginclude_HEADERS	+= pgen.h
 libmath_la_SOURCES	+= pgen.c
 libmath_la_SOURCES	+= pgen-gcd.c
+libmath_la_SOURCES	+= pgen-granfrob.c
 libmath_la_SOURCES	+= pgen-simul.c
 libmath_la_SOURCES	+= pgen-stdev.c
-TESTS			+= pgen.t$(EXEEXT)
+TESTS			+= pgen.t$(EXEEXT) pgen-granfrob.t$(EXEEXT)
 EXTRA_DIST		+= t/pgen
 
 ## Finding primitive elements in finite fields.
@@ -428,7 +430,28 @@ check_PROGRAMS		+= f25519-p10.t
 f25519_p10_t_SOURCES	 = f25519.c
 f25519_p10_t_CPPFLAGS	 = $(AM_CPPFLAGS) -DTEST_RIG -DSRCDIR="\"$(srcdir)\""
 f25519_p10_t_CPPFLAGS	+= -DF25519_IMPL=10
+f25519_p10_t_LDFLAGS	 = $(TEST_LDFLAGS)
 f25519_p10_t_LDADD	 = $(TEST_LIBS) $(top_builddir)/libcatacomb.la
 f25519_p10_t_LDADD	+= $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
 
+pkginclude_HEADERS	+= fgoldi.h
+libmath_la_SOURCES	+= fgoldi.c
+TESTS			+= fgoldi.t$(EXEEXT)
+TESTS			+= fgoldi-p12.t$(EXEEXT)
+EXTRA_DIST		+= t/fgoldi
+
+check_PROGRAMS		+= fgoldi-p12.t
+fgoldi_p12_t_SOURCES	 = fgoldi.c
+fgoldi_p12_t_CPPFLAGS	 = $(AM_CPPFLAGS) -DTEST_RIG -DSRCDIR="\"$(srcdir)\""
+fgoldi_p12_t_CPPFLAGS	+= -DFGOLDI_IMPL=12
+fgoldi_p12_t_LDFLAGS	 = $(TEST_LDFLAGS)
+fgoldi_p12_t_LDADD	 = $(TEST_LIBS) $(top_builddir)/libcatacomb.la
+fgoldi_p12_t_LDADD	+= $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
+
+pkginclude_HEADERS	+= scaf.h
+libmath_la_SOURCES	+= scaf.c
+
+pkginclude_HEADERS	+= montladder.h
+pkginclude_HEADERS	+= scmul.h
+
 ###----- That's all, folks --------------------------------------------------