X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/a7557fb1d7c718587ced64effa42f8edd838faf8..07871354bfa8bbbacb6c6a1966f25b596119c146:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index cb65285..8cf9edc 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.10 1999/11/19 19:28:24 mdw Exp $
+## $Id: Makefile.m4,v 1.17 1999/11/25 11:38:31 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,8 +29,24 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.10  1999/11/19 19:28:24  mdw
-## Add DSA files and tests.
+## Revision 1.17  1999/11/25 11:38:31  mdw
+## Support for conversions between MPs and C integers.
+##
+## Revision 1.16  1999/11/22 20:51:33  mdw
+## Add yet more source files.
+##
+## Revision 1.15  1999/11/22 14:08:30  mdw
+## Improve dependencies for test programs.
+##
+## Revision 1.14  1999/11/22 00:17:09  mdw
+## Create object files for test programs so that rebuilding doesn't take so
+## long.
+##
+## Revision 1.12  1999/11/20 22:36:26  mdw
+## Improve dependencies.  Move mpx testing into mpx.c.
+##
+## Revision 1.11  1999/11/20 22:24:53  mdw
+## Add Diffie-Hellman support.
 ##
 ## Revision 1.10  1999/11/19 19:28:24  mdw
 ## Add DSA files and tests.
@@ -124,7 +140,7 @@ BUILT_SOURCES = \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.h')
 
 ## --- Building the main library ---
-libcatacomb_la_LDFLAGS = -version-info 0:3:0
+
 lib_LTLIBRARIES = libcatacomb.la
 
 libcatacomb_la_LDFLAGS = -version-info 0:4:0
@@ -137,8 +153,9 @@ pkginclude_HEADERS = \
 	blkc.h hash.h \
 	rc4.h \
 	rand.h noise.h \
-	dsa.h \
-	mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpmont.h \
+	key.h \
+	mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
+	mpmont.h mpcrt.h \
 	ptab.h pgen.h rabin.h \
 	dsa.h dh.h \
 	allwithsuffix(`ciphers', `cipher_modes', `.h') \
@@ -152,12 +169,16 @@ libcatacomb_la_SOURCES = \
 	key.c \
 	mpx.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-gcd.c mp-jacobi.c \
+	mpint.c \
 	mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
+	mpmont.c mpmont-mexp.c \
+	mpcrt.c \
 	ptab.c pgen.c rabin.c \
 	dsa-sign.c dsa-verify.c dsa-gen.c \
 	dh-prime.c \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
+	addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
 	addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c')
 
 des-base.lo: des_sp.h
@@ -202,20 +223,25 @@ define(`testprogs', `')
 define(`CTESTRIG',
 `define(`testprogs', testprogs \
 	$1.t)dnl
-$1.t: $1.c libcatacomb.la
-	$(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c .libs/libcatacomb.a $(LIBS) -o $1.t')
+$1.to: $1.c
+	$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c -o $1.to
+$1.t: $1.to libcatacomb.la
+	$(CC) $(LDFLAGS) $1.to .libs/libcatacomb.a $(LIBS) -o $1.t')
 
 CTESTRIG(rc4)
 adorn(`nl`'CTESTRIG(', `ciphers', `)')
-CTESTRIG(mpx-test)
+adorn(`nl`'CTESTRIG(', `hashes', `)')
 adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
 adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
 CTESTRIG(mpx)
 CTESTRIG(mptext)
 CTESTRIG(mp-arith)
 CTESTRIG(mp-gcd)
+CTESTRIG(mp-jacobi)
+CTESTRIG(mpint)
 CTESTRIG(mpmont)
 CTESTRIG(mpmont-mexp)
+CTESTRIG(mpcrt)
 CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)
@@ -223,7 +249,7 @@ CTESTRIG(dsa-verify)
 
 TESTS = testprogs
 
-CLEANFILES = *.t mptypes.h des_sp.h ptab.c ptab.h
+CLEANFILES = *.t *.to mptypes.h des_sp.h ptab.c ptab.h
 
 ## --- Makefile building (haha!) ---