setup.py: Do VPATH search for swig/enums.i

[libsigrok.git] / bindings / python / setup.py

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 9b5e998417c7222d19542494ef45025477695871..35b113abc4b7febade3ea5db5b2e229478b79f2a 100644 (file)
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -35,11 +35,11 @@ sr_includes, sr_lib_dirs, sr_libs, (sr_version,) = [
 
 includes = ['../../include', '../cxx/include']
 includes += [os.path.join(srcdir, path) for path in includes]
-includes += ['../..', '../../include/libsigrok', '../cxx/include/libsigrok']
+includes += ['../..']
 includes += [i[2:] for i in sr_includes]
 includes += [np.get_include(), ]
 libdirs = ['../../.libs', '../cxx/.libs'] + [l[2:] for l in sr_lib_dirs]
-libs = [l[2:] for l in sr_libs] + ['sigrokxx']
+libs = [l[2:] for l in sr_libs] + ['sigrokcxx']
 
 def vpath(file):
     vfile = os.path.join(srcdir, file)
@@ -77,7 +77,8 @@ setup(
     ext_modules = [
         Extension('sigrok.core._classes',
             sources = [vpath('sigrok/core/classes.i')],
-            swig_opts = ['-c++', '-threads', '-Isigrok/core'] + 
+            swig_opts = ['-c++', '-threads', '-Isigrok/core',
+                         '-I..', '-I%s' % os.path.join(srcdir, '..')] +
                 ['-I%s' % i for i in includes],
             extra_compile_args = ['-std=c++11', '-Wno-uninitialized'],
             include_dirs = includes,