General utilities cleanup. Add signature support to catcrypt. Throw in

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index bb976cc..1cccc9b 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-m4-*-
 ##
-## $Id: Makefile.m4,v 1.81 2004/04/08 16:17:32 mdw Exp $
+## $Id$
 ##
 ## Makefile for Catacomb
 ##
@@ -245,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
@@ -305,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 ---