perftest: Optionally disable group checking.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index d593d8c..e85d17c 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -90,7 +90,8 @@ _(safer) _(mars) _(tiger) dnl
 _(gfshare) _(gfx-sqr)')
 
 autoheaders: \
-  addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h mplimits.h
+  addsuffix(`gen_tables', `-tab.h') \
+  primetab.h wheel.h mptypes.h mplimits.h
 define(`emit', `
 _item`'-tab.h: _item`'-mktab$(EXEEXT)
        ./_item`'-mktab >_item`'-tab.h.new
@@ -102,6 +103,13 @@ primetab.c: genprimes$(EXEEXT)
        ./genprimes -h primetab.h -c primetab.c \
                -s CATACOMB_PRIMETAB_H -n 256 \
                -t "unsigned short" -i primetab
+
+wheel.h: wheel.c
+wheel.c: genwheel$(EXEEXT)
+       ./genwheel -h wheel.h -c wheel.c \
+               -s CATACOMB_WHEEL_H -n 5 \
+               -t "unsigned char" -i wheel
+
 archinclude_HEADERS = mptypes.h mplimits.h
 mptypes.h: mptypes$(EXEEXT)
        ./mptypes >mptypes.h.new
@@ -155,7 +163,8 @@ BUILT_SOURCES = \
 
 lib_LTLIBRARIES = libcatacomb.la
 
-libcatacomb_la_LDFLAGS = -version-info 3:0:1
+libcatacomb_la_LIBADD = $(CATACOMB_LIBS)
+libcatacomb_la_LDFLAGS = -version-info 3:1:1
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
@@ -168,8 +177,8 @@ pkginclude_HEADERS = \
        exp.h mpbarrett.h mpmont.h mpreduce.h mp-exp.h \
        mpcrt.h mprand.h mpmul.h \
        gfx.h gf.h gfreduce.h gfn.h gf-exp.h \
-       primetab.h pfilt.h rabin.h \
-       pgen.h prim.h strongprime.h limlee.h keycheck.h \
+       primetab.h wheel.h pfilt.h rabin.h \
+       pgen.h primeiter.h prim.h strongprime.h limlee.h keycheck.h \
        bbs.h rsa.h dh.h dsarand.h dsa.h gdsa.h gkcdsa.h \
        tlsprf.h sslprf.h \
        gfshare.h share.h \
@@ -214,7 +223,7 @@ define(`EC_SOURCES',
        ec-fetch.c ec-raw.c g-ec.c')
 
 define(`PGEN_SOURCES',
-       `pfilt.c rabin.c \
+       `pfilt.c primeiter.c rabin.c \
        pgen.c pgen-stdev.c pgen-gcd.c pgen-simul.c \
          prim.c strongprime.c limlee.c \
        keycheck.c keycheck-mp.c keycheck-report.c \
@@ -222,12 +231,12 @@ define(`PGEN_SOURCES',
        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-kcdsa.c dh-check.c dh-fetch.c dh-param.c \
-       dsarand.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-check.c \
+       dsarand.c dsa-misc.c dsa-sign.c dsa-verify.c dsa-gen.c dsa-check.c \
        gdsa.c gkcdsa.c \
        key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
        key-pack.c key-misc.c key-file.c key-attr.c key-io.c key-moan.c \
        key-error.c key-fetch.c \
-       primetab.c share.c')
+       primetab.c wheel.c share.c')
 
 libcatacomb_la_SOURCES = \
        grand.c keysz.c keysz-conv.c \
@@ -269,9 +278,10 @@ bin_PROGRAMS = \
        dsig key pixie cookie rspit factorial hashsum mkphrase \
        catcrypt catsign
 noinst_LIBRARIES = libcatcrypt.a
-bin_SCRIPTS = catacomb-config xpixie
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = catacomb.pc
 noinst_PROGRAMS = \
-       genprimes mptypes genlimits serpent-check bittest mpdump \
+       genprimes genwheel mptypes genlimits serpent-check bittest mpdump \
        perftest \
        addsuffix(`gen_tables', `-mktab')
 LDADD = libcatcrypt.a libcatacomb.la
@@ -282,7 +292,7 @@ libcatcrypt_a_SOURCES = LIBCAT_SRC getdate.y
 
 patsubst(MP_BASE MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o \
        patsubst(LIBCAT_SRC, `\.c\>', `.o'): \
-       mptypes.h primetab.h
+       mptypes.h primetab.h wheel.h
 patsubst(MP_SOURCES, `\.c\>', `.lo'): mplimits.h
 
 dsig_SOURCES = dsig.c
@@ -295,7 +305,7 @@ rspit_SOURCES = rspit.c
 factorial_SOURCES = factorial.c
 perftest_SOURCES = perftest.c
 pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c passphrase.c
-pixie_LDADD =
+pixie_LDADD = $(PIXIE_LIBS)
 pixie_CFLAGS = $(AM_CFLAGS)
 mkphrase_SOURCES = mkphrase.c
 bittest_SOURCES = bittest.c
@@ -312,10 +322,13 @@ serpent_check_LDADD =
 genprimes_SOURCES = genprimes.c
 genprimes_LDADD =
 
+genwheel_SOURCES = genwheel.c
+genwheel_LDADD =
+
 mptypes_SOURCES = mptypes.c
 mptypes_LDADD =
 
-genlimits_SOURCES = genlimits.c MP_BASE
+genlimits_SOURCES = genlimits.c MP_BASE mptypes.h
 genlimits_LDADD =
 genlimits_CFLAGS = $(AM_CFLAGS)
 
@@ -442,6 +455,7 @@ CTESTRIG(group-test)
 CTESTRIG(gdsa)
 CTESTRIG(gkcdsa)
 CTESTRIG(pgen)
+CTESTRIG(primeiter)
 CTESTRIG(dsa-gen)
 CTESTRIG(dsa-sign)
 CTESTRIG(dsa-verify)
@@ -455,7 +469,8 @@ TESTS = serpent-check bittest testprogs
 
 CLEANFILES = \
        *.t$(EXEEXT) *.to *.kr.old \
-       mptypes.h primetab.c primetab.h ectab.c ptab.c bintab.c \
+       mptypes.h primetab.c primetab.h wheel.c wheel.h \
+       ectab.c ptab.c bintab.c \
        addsuffix(`gen_tables', `-tab.h')
 
 ## --- Makefile building (haha!) ---