Merge branch 'aubiocmd'

diff --combined setup.py
index 9fbd19d,987ff4c..21bd495
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -2,19 -2,19 +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_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() ]
@@@ -57,7 -57,6 +57,6 @@@ distrib = setup(name='aubio'
      version = __version__,
      packages = ['aubio'],
      package_dir = {'aubio':'python/lib/aubio'},
-     scripts = ['python/scripts/aubiocut'],
      ext_modules = [aubio_extension],
      description = 'a collection of tools for music analysis',
      long_description = 'a collection of tools for music analysis',
@@@ -75,6 -74,12 +74,12 @@@
          'clean': CleanGenerated,
          'build_ext': build_ext,
          },
+     entry_points = {
+         'console_scripts': [
+             'aubio = aubio.cmd:main',
+             'aubiocut = aubio.cut:main',
+         ],
+     },
      test_suite = 'nose2.collector.collector',
      extras_require = {
          'tests': ['numpy'],