setup.py: clean up imports

diff --git a/python/lib/moresetuptools.py b/python/lib/moresetuptools.py
index f26aa32..87818f2 100644 (file)
--- a/python/lib/moresetuptools.py
+++ b/python/lib/moresetuptools.py
@@ -176,6 +176,7 @@ class build_ext(_build_ext):
                 # add libaubio sources and look for optional deps with pkg-config
                 add_local_aubio_sources(extension, usedouble=enable_double)
         # generate files python/gen/*.c, python/gen/aubio-generated.h
+        extension.include_dirs += [ output_path ]
         extension.sources += generate_external(header, output_path, overwrite = False,
                 usedouble=enable_double)
         return _build_ext.build_extension(self, extension)

diff --git a/setup.py b/setup.py
index e2ff50c..03092a8 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -2,9 +2,8 @@
 
 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()
@@ -16,7 +15,6 @@ define_macros = [('AUBIO_VERSION', '%s' % __version__)]
 extra_link_args = []
 
 include_dirs += [ 'python/ext' ]
-include_dirs += [ output_path ] # aubio-generated.h
 try:
     import numpy
     include_dirs += [ numpy.get_include() ]