Missed a file. Whoops.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index eafa6e1..bf7b533 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.20 1999/12/13 15:42:50 mdw Exp $
+## $Id: Makefile.m4,v 1.24 2000/02/12 18:22:26 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,8 +29,17 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.20  1999/12/13 15:42:50  mdw
-## Version bump.
+## Revision 1.24  2000/02/12 18:22:26  mdw
+## Missed a file.  Whoops.
+##
+## Revision 1.23  2000/02/12 18:21:01  mdw
+## Overhaul of key management (again).
+##
+## Revision 1.22  1999/12/22 16:04:06  mdw
+## Lots of new files.
+##
+## Revision 1.21  1999/12/13 15:47:58  mdw
+## Fix a couple of minor bugs in the distribution set.
 ##
 ## Revision 1.19  1999/12/11 10:58:24  mdw
 ## Fix bug in test rig link flags.  Add Karatsuba squaring.
@@ -133,8 +142,8 @@ $(MODES): $(srcdir)/genmodes
 des_sp.h: des-mktab
        ./des-mktab >des_sp.h
 
-ptab.c ptab.h: genprimes
-       ./genprimes -h ptab.h -c ptab.c -m 256 -t "unsigned char" -i ptab
+primetab.c primetab.h: genprimes
+       ./genprimes -h primetab.h -c primetab.c -m 255 -t "unsigned char" -i primetab
 
 archinclude_HEADERS = mptypes.h
 
@@ -160,17 +169,18 @@ define(`emit', `$1.h ')
 pkginclude_HEADERS = \
        paranoia.h \
        blkc.h hash.h \
-       gcipher.h ghash.h gmac.h grand.c \
+       gcipher.h ghash.h gmac.h grand.h \
        ghash-def.h \
        rc4.h \
        rand.h noise.h \
-       key.h \
+       key.h key-data.h passphrase.h pixie.h lmem.h \
        lcrand.h fibrand.h \
        mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
        mpbarrett.h mpmont.h mpcrt.h \
        mprand.h \
-       ptab.h pgen.h rabin.h \
-       bbs.h dsa.h dh.h \
+       primetab.h pfilt.h primorial.h rabin.h \
+       pgen.h prim.h strongprime.h \
+       bbs.h rsa.h dh.h dsarand.h dsa.h \
        allwithsuffix(`ciphers', `cipher_modes', `.h') \
        allwithsuffix(`hashes', `hash_modes', `.h') \
        addsuffix(`cipher_modes', `-def.h') \
@@ -182,7 +192,9 @@ libcatacomb_la_SOURCES = \
        des-base.c des-base.h des_sp.h bf_ikey.h daftstory.h \
        rc4.c \
        rand.c noise.c \
-       key.c \
+       key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
+       key-misc.c key-file.c key-attr.c key-io.c key-moan.c key-error.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 \
        mp-misc.c mp-mem.c mp-const.c mp-io.c mp-arith.c mp-test.c \
@@ -192,10 +204,12 @@ libcatacomb_la_SOURCES = \
        mpbarrett.c mpmont.c mpmont-mexp.c \
        mpcrt.c \
        mprand.c \
-       ptab.c pgen.c rabin.c \
+       primetab.c pfilt.c rabin.c primorial.c \
+       pgen.c pgen-stdev.c pgen-safe.c prim.c strongprime.c \
        bbs-rand.c bbs-gen.c bbs-jump.c \
-       dsa-sign.c dsa-verify.c dsa-gen.c \
-       dh-prime.c \
+       rsa-decrypt.c rsa-gen.c rsa-recover.c \
+       dh-gen.c \
+       dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
        addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
        addsuffix(`ciphers', `.c') addsuffix(`hashes', `.c')
@@ -205,15 +219,20 @@ mpx.lo: mptypes.h
 
 ## --- Utility programs ---
 
-bin_PROGRAMS = key
-bin_SCRIPTS = catacomb-config
-noinst_PROGRAMS = des-mktab genprimes mptypes rspit
+bin_PROGRAMS = key pixie rspit distsig
+bin_SCRIPTS = catacomb-config xpixie
+noinst_PROGRAMS = des-mktab genprimes mptypes
 LDADD = libcatacomb.la
 
 key_SOURCES = keyutil.c getdate.y getdate.h
 
+pixie_SOURCES = pixie.c pixie-common.c lmem.c 
+pixie_LDADD =
+
 rspit_SOURCES = rspit.c
 
+distsig_SOURCES = distsig.c
+
 des_mktab_SOURCES = des-mktab.c
 des_mktab_LDADD =
 
@@ -223,13 +242,30 @@ genprimes_LDADD =
 mptypes_SOURCES = mptypes.c
 mptypes_LDADD =
 
+## --- Install the pixie setuid-root if we can ---
+
+changequote(<, >)
+install-exec-hook:
+       @pixie="$(bindir)/`echo pixie|sed $(transform)`"; \
+       if chown root $$pixie && chmod 4755 $$pixie; then \
+         echo "chown root $$pixie"; \
+         echo "chmod 4755 $$pixie"; \
+       else \
+         echo "***"; \
+         echo "*** You should probably install $$pixie setuid-root."; \
+         echo "***"; \
+       fi
+changequote(`, ')
+
 ## --- Documentation ---
 
 man_MANS = key.1 keyring.5
 
 ## --- Other handy definitions ---
 
-EXTRA_DIST = Makefile.m4 genmodes $(man_MANS)
+EXTRA_DIST = \
+       Makefile.m4 genmodes $(man_MANS) xpixie \
+       README.cipher README.hash README.random README.mp
 
 dist-hook:
        @ln getdate.c $(distdir) || ln $(srcdir)/getdate.c $(distdir) || true
@@ -276,7 +312,7 @@ CTESTRIG(bbs-jump)
 
 TESTS = testprogs
 
-CLEANFILES = *.t *.to mptypes.h des_sp.h ptab.c ptab.h
+CLEANFILES = *.t *.to mptypes.h des_sp.h primetab.c primetab.h
 
 ## --- Makefile building (haha!) ---