X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fpython%2Fsetup.py;h=66bdc2dd3cfeb70d4301c73178102d6c7ae895b3;hb=5a7e62211c4714ea2aac35baac10cf448373d4f5;hp=403d9a2e1e34e2797d3352654512f4b39a078528;hpb=8dc93c841f73dd2dbb252c1be42701a5e03d2f26;p=libsigrok.git

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 403d9a2e..66bdc2dd 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -1,5 +1,5 @@
 ##
-## This file is part of the sigrok project.
+## This file is part of the libsigrok project.
 ##
 ## Copyright (C) 2013 Martin Ling <martin-sigrok@earth.li>
 ##
@@ -17,30 +17,28 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-from distutils.core import setup, Extension
+from setuptools import setup, find_packages, Extension
 import subprocess
 
-sr_includes = subprocess.check_output(
-    ["pkg-config", "--cflags", "libsigrok"]).rstrip().split(' ')
-
-sr_libs = subprocess.check_output(
-    ["pkg-config", "--libs", "libsigrok"]).rstrip().split(' ')
-
-sr_version = subprocess.check_output(
-    ["pkg-config", "--version", "libsigrok"]).rstrip()
+sr_includes, sr_lib_dirs, sr_libs, (sr_version,) = [
+    subprocess.check_output(
+        ["pkg-config", option, "libsigrok"]).decode().rstrip().split(' ')
+    for option in
+        ("--cflags-only-I", "--libs-only-L", "--libs-only-l", "--modversion")]
 
 setup(
     name = 'libsigrok',
+    namespace_packages = ['sigrok'],
+    packages = find_packages(),
     version = sr_version,
     description = "libsigrok API wrapper",
-    py_modules = ['libsigrok'],
     ext_modules = [
-        Extension('_libsigrok',
-            sources = ['libsigrok_python.i'],
-            swig_opts = sr_includes,
-            include_dirs = [i[2:] for i in sr_includes if i.startswith('-I')],
-            library_dirs = [l[2:] for l in sr_libs if l.startswith('-L')],
-            libraries = [l[2:] for l in sr_libs if l.startswith('-l')]
+        Extension('sigrok.core._lowlevel',
+            sources = ['sigrok/core/lowlevel.i'],
+            swig_opts = ['-threads'] + sr_includes,
+            include_dirs = [i[2:] for i in sr_includes],
+            library_dirs = [l[2:] for l in sr_lib_dirs],
+            libraries = [l[2:] for l in sr_libs]
         )
     ],
 )