X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b817bfc642225b8c3c0b6a7e42d1fb949b61a606..38b901110909d19388502b487f0529514cf853ff:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 890dc8f..1cccc9b 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.80 2004/04/08 01:36:15 mdw Exp $
+## $Id$
 ##
 ## Makefile for Catacomb
 ##
@@ -199,6 +199,7 @@ define(`PGEN_SOURCES',
 	keycheck.c keycheck-mp.c keycheck-report.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-check.c dh-fetch.c dh-param.c \
 	dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-check.c \
 	gdsa.c gkcdsa.c \
@@ -212,7 +213,7 @@ libcatacomb_la_SOURCES = \
 	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 tlsprf.c sslprf.c \
+	tlsprf.c sslprf.c \
 	gfshare.c \
 	MP_SOURCES karatsuba.h \
 	gciphertab.c ghashtab.c gmactab.c \
@@ -244,18 +245,29 @@ patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: \
 
 ## --- Utility programs ---
 
-bin_PROGRAMS = dsig key pixie rspit factorial hashsum mkphrase
+bin_PROGRAMS = \
+	dsig key pixie cookie rspit factorial hashsum mkphrase catcrypt
+noinst_LIBRARIES = libcatcrypt.a
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = \
 	genprimes mptypes serpent-check bittest mpdump \
+	perftest \
 	addsuffix(`gen_tables', `-mktab')
-LDADD = libcatacomb.la
-
-dsig_SOURCES = dsig.c getdate.y getdate.h
-key_SOURCES = keyutil.c getdate.y getdate.h
+LDADD = libcatacomb.la libcatcrypt.a
+
+libcatcrypt_a_SOURCES = \
+	cc.h getdate.h \
+	cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-list.c \
+	getdate.y
+	
+dsig_SOURCES = dsig.c
+cookie_SOURCES = cookie.c
+catcrypt_SOURCES = catcrypt.c
+key_SOURCES = keyutil.c
 hashsum_SOURCES = hashsum.c
 rspit_SOURCES = rspit.c
 factorial_SOURCES = factorial.c
+perftest_SOURCES = perftest.c
 pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c
 pixie_LDADD =
 mkphrase_SOURCES = mkphrase.c
@@ -304,7 +316,7 @@ changequote(`, ')
 
 ## --- Documentation ---
 
-man_MANS = key.1 hashsum.1 keyring.5 pixie.1
+man_MANS = key.1 dsig.1 cookie.1 catcrypt.1 hashsum.1 keyring.5 pixie.1
 
 ## --- Other handy definitions ---