From 2bd25f52b467b347a60f98ce41cc7b25472a224b Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Thu, 6 Sep 2012 19:57:13 +0000
Subject: [PATCH] Simplified setup.py for new Python module

The removed parts are not necessary since the compiled module no
longer links to the Cantera shared library.
---
 interfaces/cython/setup.py.in | 12 ++----------
 src/python/SConscript         |  2 --
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/interfaces/cython/setup.py.in b/interfaces/cython/setup.py.in
index 12fdb7758..9bc9ea7ce 100644
--- a/interfaces/cython/setup.py.in
+++ b/interfaces/cython/setup.py.in
@@ -3,20 +3,13 @@ from setuptools import setup, find_packages, Extension
 from distutils.sysconfig import get_config_var
 from Cython.Distutils import build_ext
 
-dataFiles = ['_cantera%s' % get_config_var('SO')]
-if os.name == 'nt':
-    dataFiles.append('cantera_shared.dll')
-else:
-    dataFiles.append('libcantera_shared.so')
-
 exts = [Extension("cantera._cantera",
                   ["cantera/_cantera.pyx"],
                   include_dirs=@py_include_dirs@,
                   language="c++",
                   libraries=@py_cantera_libs@,
                   library_dirs=@py_libdirs@,
-                  extra_compile_args=@py_extra_compiler_args@,
-                  extra_link_args=@py_extra_link_args@)]
+                  extra_compile_args=@py_extra_compiler_args@)]
 
 setup(name="Cantera",
       version="@cantera_version@",
@@ -29,5 +22,4 @@ setup(name="Cantera",
       packages = find_packages(),
       cmdclass = {'build_ext': build_ext},
       ext_modules = exts,
-      package_data = {'cantera': dataFiles,
-                      'cantera.data': ['*.xml', '*.cti']})
+      package_data = {'cantera.data': ['*.xml', '*.cti']})
diff --git a/src/python/SConscript b/src/python/SConscript
index 5f806fdb8..79f085cea 100644
--- a/src/python/SConscript
+++ b/src/python/SConscript
@@ -121,10 +121,8 @@ localenv['py_cantera_libs'] = repr(localenv['cantera_libs'])
 localenv['py_libdirs'] = repr([x for x in libDirs if x])
 
 if localenv['CC'] == 'cl':
-    localenv['py_extra_link_args'] = repr([])
     localenv['py_extra_compiler_args'] = repr(['/EHsc'])
 else:
-    localenv['py_extra_link_args'] = repr(['-Wl,-rpath=$$ORIGIN'])
     localenv['py_extra_compiler_args'] = repr([])
 
 dataFiles = localenv.RecursiveInstall('#interfaces/cython/cantera/data',