Indentation fix.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 549eac2..19c6eba 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.53 2001/04/29 18:11:19 mdw Exp $
+## $Id: Makefile.m4,v 1.56 2001/06/16 13:01:10 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,15 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.56  2001/06/16 13:01:10  mdw
+## New source files and tests.
+##
+## Revision 1.55  2001/05/08 22:17:41  mdw
+## New cipher Noekeon added.
+##
+## Revision 1.54  2001/05/07 17:32:52  mdw
+## New Rijndael block sizes.
+##
 ## Revision 1.53  2001/04/29 18:11:19  mdw
 ## New block cipher MARS.
 ##
@@ -227,8 +236,8 @@ _(tea) _(xtea) dnl
 _(rc2) _(rc5) dnl
 _(skipjack) dnl
 _(cast128) _(cast256) dnl
-_(square) _(rijndael) dnl
-_(serpent)')
+_(square) _(rijndael) _(rijndael192) _(rijndael256) dnl
+_(serpent) _(noekeon)')
 define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
 
 define(`hashes', `dnl
@@ -250,15 +259,15 @@ modes-stamp: genmodes
        echo datestamp >modes-stamp
 
 define(`gen_tables', `dnl
-_(des) _(blowfish) _(twofish) _(square) _(rijndael) dnl
+_(des) _(blowfish) _(twofish) dnl
+_(square) _(rijndael) dnl
 _(safer) _(mars) _(tiger) dnl
 _(gfshare) _(gfx-sqr)')
 
 autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
 define(`emit', `
 _item`'-tab.h: _item`'-mktab
-       ./_item`'-mktab >_item`'-tab.h
-_item`'.lo: _item`'-tab.h')dnl
+       ./_item`'-mktab >_item`'-tab.h')dnl
 gen_tables
 
 primetab.h: primetab.c
@@ -270,7 +279,7 @@ mptypes.h: mptypes
        ./mptypes >mptypes.h
 
 BUILT_SOURCES = \
-       getdate.c \
+       getdate.c modes-stamp \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \
        addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
@@ -290,7 +299,7 @@ pkginclude_HEADERS = \
        lcrand.h fibrand.h rc4.h seal.h rand.h noise.h fipstest.h maurer.h \
        key.h key-data.h passphrase.h pixie.h lmem.h \
        mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
-       mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.h \
+       exp.h mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.h \
        gfx.h \
        primetab.h pfilt.h rabin.h \
        pgen.h prim.h strongprime.h limlee.h keycheck.h \
@@ -308,7 +317,9 @@ define(`MP_SOURCES',
        mp-misc.c mp-mem.c mp-const.c mp-io.c mp-arith.c mp-test.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 mpcrt.c mpmul.c mprand.c \
+       exp.c mpcrt.c mpmul.c mprand.c \
+       mpbarrett.c mpbarrett-mexp.c mpbarrett-exp.h \
+       mpmont.c mpmont-mexp.c mpmont-exp.h \
        rho.c \
        GF_SOURCES PGEN_SOURCES')
 
@@ -339,6 +350,7 @@ libcatacomb_la_SOURCES = \
        MP_SOURCES karatsuba.h \
        des-base.c des-base.h \
        cast-s.c cast-sk.c cast-base.h cast-tab.h \
+       rijndael-base.c rijndael-base.h \
        md2-tab.h \
        serpent-sbox.h skipjack-tab.h tiger-base.h \
        daftstory.h \
@@ -350,7 +362,9 @@ des-base.lo: des-tab.h
 blowfish.lo: blowfish-tab.h
 twofish.lo: twofish-tab.h
 square.lo: square-tab.h
-rijndael.lo: rijndael-tab.h
+rijndael-base.lo: rijndael-tab.h
+safer.lo: safer-tab.h
+mars.lo: mars-tab.h
 tiger.lo: tiger-tab.h
 gfshare.lo: gfshare-tab.h
 gfx-sqr.lo: gfx-sqr-tab.h
@@ -465,6 +479,7 @@ CTESTRIG(mp-sqrt)
 CTESTRIG(mptext)
 CTESTRIG(mpint)
 CTESTRIG(mpbarrett)
+CTESTRIG(mpbarrett-mexp)
 CTESTRIG(mpmont)
 CTESTRIG(mpmont-mexp)
 CTESTRIG(mpcrt)