Import buf stuff from tripe.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 19c6eba..2285689 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.56 2001/06/16 13:01:10 mdw Exp $
+## $Id: Makefile.m4,v 1.61 2003/10/11 21:02:33 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,21 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.61  2003/10/11 21:02:33  mdw
+## Import buf stuff from tripe.
+##
+## 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.
+##
 ## Revision 1.56  2001/06/16 13:01:10  mdw
 ## New source files and tests.
 ##
@@ -289,16 +304,16 @@ BUILT_SOURCES = \
 
 lib_LTLIBRARIES = libcatacomb.la
 
-libcatacomb_la_LDFLAGS = -version-info 2:0:0
+libcatacomb_la_LDFLAGS = -version-info 2:1:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
 pkginclude_HEADERS = \
-       arena.h paranoia.h \
+       arena.h paranoia.h buf.h \
        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 \
@@ -317,6 +332,7 @@ define(`MP_SOURCES',
        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 \
+       mptext-len.c \
        exp.c mpcrt.c mpmul.c mprand.c \
        mpbarrett.c mpbarrett-mexp.c mpbarrett-exp.h \
        mpmont.c mpmont-mexp.c mpmont-exp.h \
@@ -343,12 +359,15 @@ define(`PGEN_SOURCES',
 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 \
+       arena.c buf.c \
        passphrase.c pixie-client.c pixie-common.c lmem.c \
        oaep.c pkcs1.c pss.c tlsprf.c sslprf.c \
        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 \
@@ -376,7 +395,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
 
@@ -388,6 +407,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
@@ -411,7 +432,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"; \
@@ -496,7 +517,7 @@ CTESTRIG(gfshare)
 CTESTRIG(share)
 CTESTRIG(rho)
 
-TESTS = serpent-check testprogs
+TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
        *.t *.to \