X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/3119b3ae038717e3860a7ee0fda55098af389809..6a024d24d97cb5d42c0091571735475b849f59f4:/math/Makefile.am

diff --git a/math/Makefile.am b/math/Makefile.am
index 0afee1f1..21ff172c 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'.
@@ -181,12 +181,25 @@ TESTS			+= mpx-kmul.t$(EXEEXT) mpx-ksqr.t$(EXEEXT)
 noinst_PROGRAMS		+= bittest
 TESTS			+= bittest
 EXTRA_DIST		+= t/mpx
+
 if CPUFAM_X86
-libmath_la_SOURCES	+= mpx-mul4-x86-sse2.S
+MPX_MUL4_SOURCES	 = mpx-mul4-x86-sse2.S
+check_PROGRAMS		+= mpx-mul4.t
+TESTS			+= mpx-mul4.t$(EXEEXT)
 endif
 if CPUFAM_AMD64
-libmath_la_SOURCES	+= mpx-mul4-amd64-sse2.S
+MPX_MUL4_SOURCES	 = mpx-mul4-amd64-sse2.S
+check_PROGRAMS		+= mpx-mul4.t
+TESTS			+= mpx-mul4.t$(EXEEXT)
 endif
+libmath_la_SOURCES	+= $(MPX_MUL4_SOURCES)
+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
 
 ## A quick-and-dirty parser, used for parsing descriptions of groups, fields,
 ## etc.
@@ -401,4 +414,43 @@ ectab.c: $(mpgen) typeinfo.py ectab.in
 	$(MPGEN) ectab $(srcdir)/ectab.in >ectab.c.new && \
 		mv ectab.c.new ectab.c
 
+###--------------------------------------------------------------------------
+### Other strange things.
+
+pkginclude_HEADERS	+= qfarith.h
+
+pkginclude_HEADERS	+= f25519.h
+libmath_la_SOURCES	+= f25519.c
+TESTS			+= f25519.t$(EXEEXT)
+TESTS			+= f25519-p10.t$(EXEEXT)
+EXTRA_DIST		+= t/f25519
+
+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 --------------------------------------------------