X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/bba24c1d073873d99fd56ef038e9306bdfafe8cc..771e95d2917ed740dc94a2d21e6439da6c29fc06:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 3ad34ec..c9b517e 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.18 1999/12/10 23:30:01 mdw Exp $
+## $Id: Makefile.m4,v 1.21 1999/12/13 15:47:58 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,12 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.21  1999/12/13 15:47:58  mdw
+## Fix a couple of minor bugs in the distribution set.
+##
+## Revision 1.19  1999/12/11 10:58:24  mdw
+## Fix bug in test rig link flags.  Add Karatsuba squaring.
+##
 ## Revision 1.18  1999/12/10 23:30:01  mdw
 ## Lots of new files.
 ##
@@ -146,7 +152,7 @@ BUILT_SOURCES = \
 
 lib_LTLIBRARIES = libcatacomb.la
 
-libcatacomb_la_LDFLAGS = -version-info 0:5:0
+libcatacomb_la_LDFLAGS = -version-info 1:0:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
@@ -154,7 +160,7 @@ define(`emit', `$1.h ')
 pkginclude_HEADERS = \
 	paranoia.h \
 	blkc.h hash.h \
-	gcipher.h ghash.h gmac.h grand.c \
+	gcipher.h ghash.h gmac.h grand.h \
 	ghash-def.h \
 	rc4.h \
 	rand.h noise.h \
@@ -178,7 +184,7 @@ libcatacomb_la_SOURCES = \
 	rand.c noise.c \
 	key.c \
 	lcrand.c fibrand.c \
-	mpx.c mpx-kmul.c mpscan.c mparena.c \
+	mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c \
 	mp-misc.c mp-mem.c mp-const.c mp-io.c mp-arith.c mp-test.c \
 	mp-gcd.c mp-jacobi.c \
 	mpint.c \
@@ -223,7 +229,9 @@ man_MANS = key.1 keyring.5
 
 ## --- Other handy definitions ---
 
-EXTRA_DIST = Makefile.m4 genmodes $(man_MANS)
+EXTRA_DIST = \
+	Makefile.m4 genmodes $(man_MANS) \
+	README.cipher README.hash README.random README.mp
 
 dist-hook:
 	@ln getdate.c $(distdir) || ln $(srcdir)/getdate.c $(distdir) || true
@@ -241,7 +249,7 @@ define(`CTESTRIG',
 $1.to: $1.c
 	$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c -o $1.to
 $1.t: $1.to $1.o libcatacomb.la
-	$(CC) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t')
+	$(CC) $(CFLAGS) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t')
 
 CTESTRIG(rc4)
 adorn(`nl`'CTESTRIG(', `ciphers', `)')
@@ -251,6 +259,7 @@ adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
 CTESTRIG(lcrand)
 CTESTRIG(mpx)
 CTESTRIG(mpx-kmul)
+CTESTRIG(mpx-ksqr)
 CTESTRIG(mp-arith)
 CTESTRIG(mp-gcd)
 CTESTRIG(mp-jacobi)