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

diff --git a/math/Makefile.am b/math/Makefile.am
index 1eb0534b..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'.
@@ -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
 
@@ -428,6 +429,7 @@ 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)
 
@@ -441,6 +443,7 @@ 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)
 
@@ -448,5 +451,6 @@ pkginclude_HEADERS	+= scaf.h
 libmath_la_SOURCES	+= scaf.c
 
 pkginclude_HEADERS	+= montladder.h
+pkginclude_HEADERS	+= scmul.h
 
 ###----- That's all, folks --------------------------------------------------