From 3fe3eae5e61875c7f3f177c5ccce2f0cf6787216 Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Tue, 15 Aug 2000 21:46:20 +0000
Subject: [PATCH] Set up the dependencies on primetab.[ch] and mptypes.h
 properly. There's some m4 hacking, but it's worth it not to have to recompile
 all the cipher modes.

---
 Makefile.m4 | 50 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/Makefile.m4 b/Makefile.m4
index 42e4125..c51d03f 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.40 2000/08/06 10:50:55 mdw Exp $
+## $Id: Makefile.m4,v 1.41 2000/08/15 21:46:20 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,11 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.41  2000/08/15 21:46:20  mdw
+## Set up the dependencies on primetab.[ch] and mptypes.h properly.
+## There's some m4 hacking, but it's worth it not to have to recompile all
+## the cipher modes.
+##
 ## Revision 1.40  2000/08/06 10:50:55  mdw
 ## (mkphrase): New program for generating random passphrases with measured
 ## strength.
@@ -218,8 +223,8 @@ gen_tables
 
 primetab.h: primetab.c
 primetab.c: genprimes
-	./genprimes -h primetab.h -c primetab.c -m 255 \
-		-t "unsigned char" -i primetab
+	./genprimes -h primetab.h -c primetab.c -n 256 \
+		-t "unsigned short" -i primetab
 archinclude_HEADERS = mptypes.h
 mptypes.h: mptypes
 	./mptypes >mptypes.h
@@ -257,34 +262,40 @@ pkginclude_HEADERS = \
 	addsuffix(`cipher_modes', `-def.h') \
 	addsuffix(`hash_modes', `-def.h')
 
-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 skipjack-tab.h tiger-base.h \
-	daftstory.h \
-	lcrand.c fibrand.c rc4.c seal.c rand.c noise.c fipstest.c maurer.c \
-	arena.c \
-	passphrase.c pixie-client.c pixie-common.c lmem.c \
-	mpx.c mpx-kmul.c mpx-ksqr.c mpx-kmac.h mpscan.c mparena.c \
+define(`MP_SOURCES',
+	`mpx.c mpx-kmul.c mpx-ksqr.c mpscan.c mparena.c \
 	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 \
-	pfilt.c rabin.c primorial.c \
+	rho.c \
+	PGEN_SOURCES')
+
+define(`PGEN_SOURCES',
+	`pfilt.c rabin.c primorial.c \
 	pgen.c pgen-stdev.c pgen-safe.c pgen-gcd.c prim.c strongprime.c \
 	limlee.c \
 	bbs-rand.c bbs-gen.c bbs-jump.c bbs-fetch.c \
 	rsa-priv.c rsa-pub.c rsa-gen.c rsa-recover.c rsa-fetch.c \
-	oaep.c pkcs1.c pss.c \
 	dh-gen.c dh-limlee.c dh-fetch.c \
 	dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c \
-	gfshare.c share.c \
-	rho.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 \
-	primetab.c \
+	primetab.c share.c')
+
+libcatacomb_la_SOURCES = \
+	grand.c keysz.c \
+	lcrand.c fibrand.c rc4.c seal.c rand.c noise.c fipstest.c maurer.c \
+	arena.c \
+	passphrase.c pixie-client.c pixie-common.c lmem.c \
+	oaep.c pkcs1.c pss.c \
+	gfshare.c \
+	MP_SOURCES mpx-kmac.h \
+	des-base.c des-base.h \
+	cast-s.c cast-sk.c cast-base.h cast-tab.h \
+	serpent-sbox.h skipjack-tab.h tiger-base.h \
+	daftstory.h \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
 	addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c')
@@ -296,7 +307,8 @@ square.lo: square-tab.h
 rijndael.lo: rijndael-tab.h
 tiger.lo: tiger-tab.h
 gfshare.lo: gfshare-tab.h
-$(libcatacomb_la_OBJECTS) dsig.o keyutil.o rspit.o: mptypes.h primetab.h
+patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: mptypes.h
+patsubst(PGEN_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: primetab.h
 
 ## --- Utility programs ---
 
-- 
2.11.0