Rearrange build order to ensure that `mptypes.h' exists by the time it's

needed.

diff --git a/Makefile.m4 b/Makefile.m4
index 6cee1b2..63c7f35 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
 ## -*-makefile-*-
 ##

-## $Id: Makefile.m4,v 1.27 2000/06/17 13:28:50 mdw Exp $
+## $Id: Makefile.m4,v 1.28 2000/06/18 23:31:18 mdw Exp $

 ##
 ## Makefile for Catacomb
 ##
 ##
 ## Makefile for Catacomb
 ##


@@ -29,6 +29,10 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
 ##----- 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.27  2000/06/17 13:28:50  mdw
 ## Minor tidying and fixing.
 ##


@@ -228,10 +232,6 @@ libcatacomb_la_SOURCES = \
        rc4.c seal.c \
        rand.c noise.c fipstest.c maurer.c \
        arena.c \
        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 mpx-kmac.h mpscan.c mparena.c \
        passphrase.c pixie-client.c pixie-common.c lmem.c \
        lcrand.c fibrand.c \
        mpx.c mpx-kmul.c mpx-ksqr.c mpx-kmac.h mpscan.c mparena.c \


@@ -249,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 \
        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')
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
        addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
        addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c')