X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/3bef8c146b00ba0e71b0db29ef3a5b00a533a10a..2e8eb64a72472bea4faba1cee5edde4fe3616808:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 549eac2..cb60ae6 100644
--- 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.54 2001/05/07 17:32:52 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## 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,7 +230,7 @@ _(tea) _(xtea) dnl
 _(rc2) _(rc5) dnl
 _(skipjack) dnl
 _(cast128) _(cast256) dnl
-_(square) _(rijndael) dnl
+_(square) _(rijndael) _(rijndael192) _(rijndael256) dnl
 _(serpent)')
 define(`cipher_modes', `_(ecb) _(cbc) _(cfb) _(ofb) _(counter)')
 
@@ -250,15 +253,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 +273,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') \
@@ -339,6 +342,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 +354,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