New functions for freeing public and private keys. Remove bad type name

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 34528fb..6b2d503 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.26 2000/06/17 10:33:43 mdw Exp $
+## $Id: Makefile.m4,v 1.31 2000/06/25 13:02:07 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,22 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.31  2000/06/25 13:02:07  mdw
+## Fix cleaning of generated files.
+##
+## Revision 1.30  2000/06/22 19:10:33  mdw
+## Fix Makefile to test mp-sqrt.c.
+##
+## Revision 1.29  2000/06/22 19:04:19  mdw
+## More new functions to be added.
+##
+## Revision 1.28  2000/06/18 23:31:18  mdw
+## Rearrange build order to ensure that `mptypes.h' exists by the time it's
+## needed.
+##
+## Revision 1.27  2000/06/17 13:28:50  mdw
+## Minor tidying and fixing.
+##
 ## Revision 1.26  2000/06/17 10:33:43  mdw
 ## Lots of new ciphers and other files.
 ##
@@ -195,7 +211,6 @@ libcatacomb_la_LDFLAGS = -version-info 2:0:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
-define(`emit', `$1.h ')
 pkginclude_HEADERS = \
        arena.h paranoia.h \
        blkc.h hash.h \
@@ -217,24 +232,20 @@ pkginclude_HEADERS = \
        addsuffix(`cipher_modes', `-def.h') \
        addsuffix(`hash_modes', `-def.h')
 
-define(`emit', `$1.c ')
 libcatacomb_la_SOURCES = \
        grand.c keysz.c \
        des-base.c des-base.h \
        cast-s.c cast-sk.c cast-base.h cast-tab.h \
+       serpent-sbox.h \
        daftstory.h \
        rc4.c seal.c \
        rand.c noise.c fipstest.c maurer.c \
        arena.c \
-       key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
-               key-pack.c \
-       key-misc.c key-file.c key-attr.c key-io.c key-moan.c key-error.c \
-               key-fetch.c \
        passphrase.c pixie-client.c pixie-common.c lmem.c \
        lcrand.c fibrand.c \
-       mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c \
+       mpx.c mpx-kmul.c mpx-ksqr.c mpx-kmac.h 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 \
+       mp-sqrt.c mp-gcd.c mp-jacobi.c mp-modsqrt.c \
        mpint.c \
        mptext.c mptext-file.c mptext-string.c mptext-dstr.c \
        mpbarrett.c mpmont.c mpmont-mexp.c \
@@ -247,6 +258,10 @@ libcatacomb_la_SOURCES = \
        dh-gen.c dh-fetch.c \
        dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-fetch.c \
        gfshare.c share.c \
+       key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
+               key-pack.c \
+       key-misc.c key-file.c key-attr.c key-io.c key-moan.c key-error.c \
+               key-fetch.c \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
        addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
        addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c')
@@ -360,8 +375,10 @@ CTESTRIG(mpx)
 CTESTRIG(mpx-kmul)
 CTESTRIG(mpx-ksqr)
 CTESTRIG(mp-arith)
+CTESTRIG(mp-modsqrt)
 CTESTRIG(mp-gcd)
 CTESTRIG(mp-jacobi)
+CTESTRIG(mp-sqrt)
 CTESTRIG(mptext)
 CTESTRIG(mpint)
 CTESTRIG(mpbarrett)
@@ -382,7 +399,7 @@ TESTS = testprogs
 CLEANFILES = \
        *.t *.to \
        mptypes.h primetab.c primetab.h \
-       des-sp.h twofish-tab.h blowfish-tab.h
+       des-tab.h twofish-tab.h blowfish-tab.h gfshare-tab.h rijndael-tab.h
 
 ## --- Makefile building (haha!) ---