commit 60cc64213d6b82cf69cba0ed4204e3ff9ac8bf58
author Phil Howard <phil@gadgetoid.com> Wed Mar 11 12:20:54 2015 +0000
committer Phil Howard <phil@gadgetoid.com> Wed Mar 11 12:20:54 2015 +0000
tree 9b0142608e292c6b7c93250b717cd4ccf478173f
parent 27de5a54b613c10bc1925851361c18b9dd987fc0

Synced to latest WiringPi, version bump for pip

setup.py

diff --git a/setup.py b/setup.py
index 18e8d52..b5d81bb 100755
--- a/setup.py
+++ b/setup.py
@@ -1,52 +1,17 @@
 #!/usr/bin/env python
 
 from setuptools import setup, find_packages, Extension
+from glob import glob
 
 _wiringpi2 = Extension(
     '_wiringpi2',
     include_dirs=['WiringPi/wiringPi','WiringPi/devLib'],
-    sources=[
-        'WiringPi/devLib/ds1302.c',
-        'WiringPi/devLib/gertboard.c',
-        'WiringPi/devLib/lcd128x64.c',
-        'WiringPi/devLib/lcd.c',
-        'WiringPi/devLib/maxdetect.c',
-        'WiringPi/devLib/piFace.c',
-        'WiringPi/devLib/piGlow.c',
-        'WiringPi/devLib/piNes.c',
-        'WiringPi/wiringPi/drcSerial.c',
-        'WiringPi/wiringPi/max31855.c',
-        'WiringPi/wiringPi/max5322.c',
-        'WiringPi/wiringPi/mcp23008.c',
-        'WiringPi/wiringPi/mcp23016.c',
-        'WiringPi/wiringPi/mcp23017.c',
-        'WiringPi/wiringPi/mcp23s08.c',
-        'WiringPi/wiringPi/mcp23s17.c',
-        'WiringPi/wiringPi/mcp3002.c',
-        'WiringPi/wiringPi/mcp3004.c',
-        'WiringPi/wiringPi/mcp3422.c',
-        'WiringPi/wiringPi/mcp4802.c',
-        'WiringPi/wiringPi/pcf8574.c',
-        'WiringPi/wiringPi/pcf8591.c',
-        'WiringPi/wiringPi/piHiPri.c',
-        'WiringPi/wiringPi/piThread.c',
-        'WiringPi/wiringPi/sn3218.c',
-        'WiringPi/wiringPi/softPwm.c',
-        'WiringPi/wiringPi/softServo.c',
-        'WiringPi/wiringPi/softTone.c',
-        'WiringPi/wiringPi/sr595.c',
-        'WiringPi/wiringPi/wiringPi.c',
-        'WiringPi/wiringPi/wiringPiI2C.c',
-        'WiringPi/wiringPi/wiringPiSPI.c',
-        'WiringPi/wiringPi/wiringSerial.c',
-        'WiringPi/wiringPi/wiringShift.c',
-        'wiringpi_wrap.c'
-    ]
+    sources=glob('WiringPi/devLib/*.c')+glob('WiringPi/wiringPi/*.c')+['wiringpi_wrap.c']
 )
 
 setup(
     name = 'wiringpi2',
-    version = '1.0.10',
+    version = '1.1.1',
     author = "Philip Howard",
     author_email = "phil@gadgetoid.com",
     url = 'https://github.com/Gadgetoid/WiringPi2-Python/',
@@ -57,43 +22,5 @@
     ext_modules = [ _wiringpi2 ],
     py_modules = ["wiringpi2"],
     install_requires=[],
-    headers=[
-	'WiringPi/wiringPi/wiringPi.h',
-        'WiringPi/wiringPi/wiringPi.h',
-        'WiringPi/wiringPi/wiringPiI2C.h',
-        'WiringPi/wiringPi/wiringPiSPI.h',
-        'WiringPi/wiringPi/wiringSerial.h',
-        'WiringPi/wiringPi/wiringShift.h',
-        'WiringPi/devLib/ds1302.h',
-        'WiringPi/devLib/font.h',
-        'WiringPi/devLib/gertboard.h',
-        'WiringPi/devLib/lcd128x64.h',
-        'WiringPi/devLib/lcd.h',
-        'WiringPi/devLib/maxdetect.h',
-        'WiringPi/devLib/piFace.h',
-        'WiringPi/devLib/piGlow.h',
-        'WiringPi/devLib/piNes.h',
-        'WiringPi/wiringPi/drcSerial.h',
-        'WiringPi/wiringPi/max31855.h',
-        'WiringPi/wiringPi/max5322.h',
-        'WiringPi/wiringPi/mcp23008.h',
-        'WiringPi/wiringPi/mcp23016.h',
-        'WiringPi/wiringPi/mcp23016reg.h',
-        'WiringPi/wiringPi/mcp23017.h',
-        'WiringPi/wiringPi/mcp23s08.h',
-        'WiringPi/wiringPi/mcp23s17.h',
-        'WiringPi/wiringPi/mcp23x0817.h',
-        'WiringPi/wiringPi/mcp23x08.h',
-        'WiringPi/wiringPi/mcp3002.h',
-        'WiringPi/wiringPi/mcp3004.h',
-        'WiringPi/wiringPi/mcp3422.h',
-        'WiringPi/wiringPi/mcp4802.h',
-        'WiringPi/wiringPi/pcf8574.h',
-        'WiringPi/wiringPi/pcf8591.h',
-        'WiringPi/wiringPi/sn3218.h',
-        'WiringPi/wiringPi/softPwm.h',
-        'WiringPi/wiringPi/softServo.h',
-        'WiringPi/wiringPi/softTone.h',
-        'WiringPi/wiringPi/sr595.h'
-        ]
+    headers=glob('WiringPi/wiringPi/*.h')+glob('WiringPi/devLib/*.h')
 )