X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/0cbfe12eb239d2fbfe95a3f798308f861bc6a819..2b645fb792c62ae0d38fcde4c39e1bd0889b0e06:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 0f2e3c3..f2422f1 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.57 2002/10/15 22:58:29 mdw Exp $
+## $Id: Makefile.m4,v 1.60 2003/05/16 01:12:37 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,15 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.60  2003/05/16 01:12:37  mdw
+## Ship `rc2-tab.h' and `skipjack-tab.h'.
+##
+## Revision 1.59  2003/05/16 00:54:50  mdw
+## Install pixie to fake root if wanted.  Ship `desx-tab.h'
+##
+## Revision 1.58  2002/10/19 17:56:50  mdw
+## Fix bit operations.  Test them (a bit) better.
+##
 ## Revision 1.57  2002/10/15 22:58:29  mdw
 ## Fast estimation of number representation lengths.
 ##
@@ -301,7 +310,7 @@ pkginclude_HEADERS = \
 	blkc.h hash.h gcipher.h ghash.h gmac.h grand.h ghash-def.h \
 	lcrand.h fibrand.h rc4.h seal.h rand.h noise.h fipstest.h maurer.h \
 	key.h key-data.h passphrase.h pixie.h lmem.h \
-	mpx.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
+	mpx.h bitops.h mpw.h mpscan.h mparena.h mp.h mptext.h mpint.h \
 	exp.h mpbarrett.h mpmont.h mpcrt.h mprand.h mpmul.h \
 	gfx.h \
 	primetab.h pfilt.h rabin.h \
@@ -353,6 +362,9 @@ libcatacomb_la_SOURCES = \
 	gfshare.c \
 	MP_SOURCES karatsuba.h \
 	des-base.c des-base.h \
+	desx-tab.h \
+	rc2-tab.h \
+	skipjack-tab.h \
 	cast-s.c cast-sk.c cast-base.h cast-tab.h \
 	rijndael-base.c rijndael-base.h \
 	md2-tab.h \
@@ -380,7 +392,7 @@ patsubst(PGEN_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: primetab.h
 bin_PROGRAMS = dsig key pixie rspit factorial hashsum mkphrase
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = \
-	genprimes mptypes serpent-check \
+	genprimes mptypes serpent-check bittest \
 	addsuffix(`gen_tables', `-mktab')
 LDADD = libcatacomb.la
 
@@ -392,6 +404,8 @@ factorial_SOURCES = factorial.c
 pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c
 pixie_LDADD =
 mkphrase_SOURCES = mkphrase.c
+bittest_SOURCES = bittest.c
+bittest_LDADD = 
 
 define(`emit', `
 patsubst(_item, `[^a-zA-Z0-9]', `_')_mktab_SOURCES = _item`'-mktab.c
@@ -415,7 +429,7 @@ mptypes_LDADD =
 changequote(<, >)
 install: install-exec-hook
 install-exec-hook:
-	@pixie="$(bindir)/`echo pixie|sed $(transform)`"; \
+	@pixie="$(DESTDIR)$(bindir)/`echo pixie|sed $(transform)`"; \
 	if chown root $$pixie && chmod 4755 $$pixie; then \
 	  echo "chown root $$pixie"; \
 	  echo "chmod 4755 $$pixie"; \
@@ -500,7 +514,7 @@ CTESTRIG(gfshare)
 CTESTRIG(share)
 CTESTRIG(rho)
 
-TESTS = serpent-check testprogs
+TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
 	*.t *.to \