setup.py: clarify pip/aubio versions

[aubio.git] / setup.py

diff --git a/setup.py b/setup.py
index e2ff50c..9fbd19d 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -2,21 +2,19 @@
 
 import sys, os.path, glob
 from setuptools import setup, Extension
-from python.lib.moresetuptools import *
+from python.lib.moresetuptools import build_ext, CleanGenerated
 # function to generate gen/*.{c,h}
-from python.lib.gen_external import generate_external, header, output_path
 from this_version import get_aubio_version, get_aubio_pyversion
 
-__version__ = get_aubio_version()
-__pip_version__ = get_aubio_pyversion()
+__version__ = get_aubio_pyversion()
+__aubio_version__ = get_aubio_version()
 
 include_dirs = []
 library_dirs = []
-define_macros = [('AUBIO_VERSION', '%s' % __version__)]
+define_macros = [('AUBIO_VERSION', '%s' % __aubio_version__)]
 extra_link_args = []
 
 include_dirs += [ 'python/ext' ]
-include_dirs += [ output_path ] # aubio-generated.h
 try:
     import numpy
     include_dirs += [ numpy.get_include() ]
@@ -56,7 +54,7 @@ classifiers = [
     ]
 
 distrib = setup(name='aubio',
-    version = __pip_version__,
+    version = __version__,
     packages = ['aubio'],
     package_dir = {'aubio':'python/lib/aubio'},
     scripts = ['python/scripts/aubiocut'],