X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/cc44d54e791d4237a81d35353d21f81f3f19c870..31cb4e2ef91d4ab2a6cc2d5fea5ac790be8f3801:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 34528fb..63c7f35 100644
--- 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.28 2000/06/18 23:31:18 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,13 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## 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 +202,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,22 +223,18 @@ 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 \
 	mpint.c \
@@ -247,6 +249,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')