1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From: Ole Streicher <olebole@debian.org>
Date: Tue, 27 Jun 2017 22:03:46 +0200
Subject: Use system provided libwcstools instead of local copy Also,
build the swig wrapper from its source file.
---
PyWCSTools/wcssubs-3.9.5/wcs.i | 2 +-
setup.py | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/PyWCSTools/wcssubs-3.9.5/wcs.i b/PyWCSTools/wcssubs-3.9.5/wcs.i
index e63c5ba..2860834 100644
--- a/PyWCSTools/wcssubs-3.9.5/wcs.i
+++ b/PyWCSTools/wcssubs-3.9.5/wcs.i
@@ -14,7 +14,7 @@
/* %feature("autodoc", "1") */
%{
-#include "wcs.h"
+#include <wcs/wcs.h>
%}
/* WORKING */
diff --git a/setup.py b/setup.py
index 7898a20..8e2fd6d 100644
--- a/setup.py
+++ b/setup.py
@@ -83,12 +83,11 @@ with World Coordinate System (WCS) information through PyWCSTools - a simple wra
PyWCSTools is distributed (and developed) as part of astLib.""",
packages=['astLib', 'PyWCSTools'],
package_data={'astLib': ['data/*']},
- cmdclass={"build_ext": build_PyWCSTools_ext},
scripts=exampleScripts,
ext_modules=[
- Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],
- extra_objects=oFiles),
- Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],
- extra_objects=oFiles)
+ Extension('PyWCSTools._wcscon', [sourceDir+"wcscon.i"],
+ swig_opts=['-outdir', 'PyWCSTools/'], libraries=['wcstools']),
+ Extension('PyWCSTools._wcs', [sourceDir+"wcs.i"],
+ swig_opts=['-outdir', 'PyWCSTools/'], libraries=['wcstools'])
]
)
|