Merge remote-tracking branch 'origin/HEAD'

[catacomb-python] / setup.py

diff --git a/setup.py b/setup.py
old mode 100644 (file)
new mode 100755 (executable)
index 927d1d2..fe0ed53
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,11 @@
 #! /usr/bin/python
 
-import os as OS
-import subprocess as SUB
-
 import distutils.core as DC
 import mdwsetup as MS
 
-MS.pkg_config('catacomb', '2.1.1')
+MS.pkg_config('catacomb', '2.3.0.1+4')
 MS.pkg_config('mLib', '2.0.4')
 
-MS.generate('algorithms.h')
-
 cat = DC.Extension('catacomb._base',
                    ['catacomb.c', 'bytestring.c', 'buffer.c',
                     'rand.c', 'algorithms.c', 'pubkey.c', 'pgen.c',
@@ -21,8 +16,7 @@ cat = DC.Extension('catacomb._base',
                    library_dirs = MS.uniquify(MS.LIBDIRS),
                    libraries = MS.uniquify(MS.LIBS))
 
-DC.setup(name = 'catacomb-python',
-         version = MS.auto_version(),
+MS.setup(name = 'catacomb-python',
          description = 'Interface to Catacomb cryptographic library',
          url = 'http://www.distorted.org.uk/~mdw/Catacomb-2.1.0',
          author = 'Straylight/Edgeware',
@@ -30,4 +24,5 @@ DC.setup(name = 'catacomb-python',
          license = 'GNU General Public License',
          packages = ['catacomb'],
          scripts = ['pwsafe'],
+         genfiles = [MS.Generate('algorithms.h')],
          ext_modules = [cat])