More changes. Still embryonic.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index cb65285..dca555f 100644 (file)
--- 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.19 1999/12/11 10:58:24 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,8 +29,30 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.10  1999/11/19 19:28:24  mdw
-## Add DSA files and tests.
+## 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.
+##
+## 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,10 +146,10 @@ 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
+libcatacomb_la_LDFLAGS = -version-info 0:5:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
@@ -135,29 +157,44 @@ define(`emit', `$1.h ')
 pkginclude_HEADERS = \
        paranoia.h \
        blkc.h hash.h \
+       gcipher.h ghash.h gmac.h grand.c \
+       ghash-def.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 \
+       lcrand.h fibrand.h \
+       mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
+       mpbarrett.h mpmont.h mpcrt.h \
+       mprand.h \
        ptab.h pgen.h rabin.h \
-       dsa.h dh.h \
+       bbs.h dsa.h dh.h \
        allwithsuffix(`ciphers', `cipher_modes', `.h') \
-       allwithsuffix(`hashes', `hash_modes', `.h')
+       allwithsuffix(`hashes', `hash_modes', `.h') \
+       addsuffix(`cipher_modes', `-def.h') \
+       addsuffix(`hash_modes', `-def.h')
 
 define(`emit', `$1.c ')
 libcatacomb_la_SOURCES = \
+       grand.c \
        des-base.c des-base.h des_sp.h bf_ikey.h daftstory.h \
        rc4.c \
        rand.c noise.c \
        key.c \
-       mpx.c mpscan.c mparena.c \
+       lcrand.c fibrand.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-gcd.c mp-jacobi.c \
+       mpint.c \
        mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
+       mpbarrett.c mpmont.c mpmont-mexp.c \
+       mpcrt.c \
+       mprand.c \
        ptab.c pgen.c rabin.c \
+       bbs-rand.c bbs-gen.c bbs-jump.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
@@ -167,11 +204,13 @@ mpx.lo: mptypes.h
 
 bin_PROGRAMS = key
 bin_SCRIPTS = catacomb-config
-noinst_PROGRAMS = des-mktab genprimes mptypes
+noinst_PROGRAMS = des-mktab genprimes mptypes rspit
 LDADD = libcatacomb.la
 
 key_SOURCES = keyutil.c getdate.y getdate.h
 
+rspit_SOURCES = rspit.c
+
 des_mktab_SOURCES = des-mktab.c
 des_mktab_LDADD =
 
@@ -202,28 +241,39 @@ 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 $1.o libcatacomb.la
+       $(CC) $(CFLAGS) $(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(lcrand)
 CTESTRIG(mpx)
-CTESTRIG(mptext)
+CTESTRIG(mpx-kmul)
+CTESTRIG(mpx-ksqr)
 CTESTRIG(mp-arith)
 CTESTRIG(mp-gcd)
+CTESTRIG(mp-jacobi)
+CTESTRIG(mptext)
+CTESTRIG(mpint)
+CTESTRIG(mpbarrett)
 CTESTRIG(mpmont)
 CTESTRIG(mpmont-mexp)
+CTESTRIG(mpcrt)
 CTESTRIG(pgen)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)
 CTESTRIG(dsa-verify)
+CTESTRIG(bbs-rand)
+CTESTRIG(bbs-jump)
 
 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!) ---