Minor tidying and fixing.

diff --git a/Makefile.m4 b/Makefile.m4
index 34528fb..6cee1b2 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.27 2000/06/17 13:28:50 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## 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 +198,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,11 +219,11 @@ 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 \
@@ -232,7 +234,7 @@ libcatacomb_la_SOURCES = \
                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 \