X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/18f3a602d58936c59f8fbf98b22273e9c94ff402..2a3c9d9a943cda6de14e9dd1f98d37eea2103ffa:/setup.py

diff --git a/setup.py b/setup.py
index 1f45f69..87a321c 100755
--- a/setup.py
+++ b/setup.py
@@ -3,14 +3,16 @@
 import distutils.core as DC
 import mdwsetup as MS
 
-MS.pkg_config('catacomb', '2.3.0.1+4')
-MS.pkg_config('mLib', '2.0.4')
+MS.pkg_config('catacomb', '2.5.0')
+MS.pkg_config('mLib', '2.4.99~')
 
 cat = DC.Extension('catacomb._base',
                    ['catacomb.c', 'bytestring.c', 'buffer.c',
                     'rand.c', 'algorithms.c', 'pubkey.c', 'pgen.c',
                     'mp.c', 'field.c', 'ec.c', 'group.c', 'passphrase.c',
-                    'share.c', 'key.c', 'util.c'],
+                    'share.c', 'key.c',
+                    'pyke/pyke.c', 'pyke/pyke-mLib.c',
+                    'pyke/mapping.c', 'pyke/mapping-mLib.c'],
                    ##extra_compile_args = ['-O0'],
                    include_dirs = MS.uniquify(MS.INCLUDEDIRS),
                    library_dirs = MS.uniquify(MS.LIBDIRS),
@@ -23,6 +25,12 @@ MS.setup(name = 'catacomb-python',
          author_email = 'mdw@distorted.org.uk',
          license = 'GNU General Public License',
          packages = ['catacomb'],
-         scripts = ['pwsafe'],
+         scripts = ['pock', 'pwsafe'],
+         data_files = [('share/man/man1', ['pock.1', 'pwsafe.1'])],
          genfiles = [MS.Generate('algorithms.h')],
+         unittest_dir = "t",
+         unittests = ["t-misc", "t-algorithms", "t-bytes", "t-buffer",
+                      "t-convert", "t-ec", "t-field", "t-group", "t-key",
+                      "t-mp", "t-passphrase", "t-pgen", "t-pubkey",
+                      "t-rand", "t-rat", "t-share"],
          ext_modules = [cat])