X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fpython%2Fsetup.py;h=66bdc2dd3cfeb70d4301c73178102d6c7ae895b3;hb=660e398fe9f5fc608787f8fd75a9df8aac61026f;hp=0a266d80b1c9e8e00889f45587f7a6245db8b3aa;hpb=0cd466ccd8f1149883f535868650d4236d0b7ab4;p=libsigrok.git

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 0a266d80..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>
 ##
@@ -20,14 +20,11 @@
 from setuptools import setup, find_packages, Extension
 import subprocess
 
-sr_includes = subprocess.check_output(
-    ["pkg-config", "--cflags-only-I", "libsigrok"]).rstrip().decode().split(' ')
-
-sr_libs = subprocess.check_output(
-    ["pkg-config", "--libs", "libsigrok"]).rstrip().decode().split(' ')
-
-sr_version = subprocess.check_output(
-    ["pkg-config", "--modversion", "libsigrok"]).decode().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',
@@ -40,8 +37,8 @@ setup(
             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_libs if l.startswith('-L')],
-            libraries = [l[2:] for l in sr_libs if l.startswith('-l')]
+            library_dirs = [l[2:] for l in sr_lib_dirs],
+            libraries = [l[2:] for l in sr_libs]
         )
     ],
 )