Use NumpyPythonExtension instead of DistutilsPythonExtension where possible.

5 files changed, 10 insertions, 17 deletions

diff --git a/numpy/fft/SConscript b/numpy/fft/SConscript
index 741d6ab90..c6e0445e8 100644
--- a/numpy/fft/SConscript
+++ b/numpy/fft/SConscript
@@ -1,10 +1,9 @@
 # Last Change: Thu Jun 12 06:00 PM 2008 J
 # vim:syntax=python
-from numscons import GetNumpyEnvironment, scons_get_paths
+from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
 
-fftpack_lite = env.DistutilsPythonExtension('fftpack_lite', 
+fftpack_lite = env.NumpyPythonExtension('fftpack_lite', 
                                         source = ['fftpack_litemodule.c', 
                                                   'fftpack.c'])
diff --git a/numpy/lib/SConscript b/numpy/lib/SConscript
index 06cc9380b..279b42319 100644
--- a/numpy/lib/SConscript
+++ b/numpy/lib/SConscript
@@ -1,9 +1,7 @@
 # Last Change: Thu Jun 12 06:00 PM 2008 J
 # vim:syntax=python
-from numscons import GetNumpyEnvironment, scons_get_paths
+from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
-
-_compiled_base = env.DistutilsPythonExtension('_compiled_base', 
+_compiled_base = env.NumpyPythonExtension('_compiled_base', 
                                         source = ['src/_compiled_base.c'])
diff --git a/numpy/linalg/SConscript b/numpy/linalg/SConscript
index 366697bd5..6eba98735 100644
--- a/numpy/linalg/SConscript
+++ b/numpy/linalg/SConscript
@@ -2,13 +2,12 @@
 # vim:syntax=python
 import os.path
 
-from numscons import GetNumpyEnvironment, scons_get_paths, \
+from numscons import GetNumpyEnvironment, \
                      scons_get_mathlib
 from numscons import CheckF77LAPACK
 from numscons import write_info
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
 
 config = env.NumpyConfigure(custom_tests = 
     {'CheckLAPACK' : CheckF77LAPACK})
@@ -25,5 +24,5 @@ sources = ['lapack_litemodule.c']
 if not use_lapack:
     sources.extend(['python_xerbla.c', 'zlapack_lite.c', 'dlapack_lite.c',
                     'blas_lite.c', 'dlamch.c', 'f2c_lite.c'])
-lapack_lite = env.DistutilsPythonExtension('lapack_lite', source = sources)
+lapack_lite = env.NumpyPythonExtension('lapack_lite', source = sources)
             
diff --git a/numpy/numarray/SConscript b/numpy/numarray/SConscript
index 766e8e9df..2c8e7b016 100644
--- a/numpy/numarray/SConscript
+++ b/numpy/numarray/SConscript
@@ -1,9 +1,8 @@
 # Last Change: Thu Jun 12 06:00 PM 2008 J
 # vim:syntax=python
-from numscons import GetNumpyEnvironment, scons_get_paths
+from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
 env.Append(CPPPATH = ['numpy'])
 
-_capi = env.DistutilsPythonExtension('_capi', source = ['_capi.c'])
+_capi = env.NumpyPythonExtension('_capi', source = ['_capi.c'])
diff --git a/numpy/random/SConscript b/numpy/random/SConscript
index 5beee13d4..e7f5018bf 100644
--- a/numpy/random/SConscript
+++ b/numpy/random/SConscript
@@ -2,8 +2,7 @@
 # vim:syntax=python
 import os
 
-from numscons import GetNumpyEnvironment, scons_get_paths, \
-                                  scons_get_mathlib
+from numscons import GetNumpyEnvironment, scons_get_mathlib
 
 def CheckWincrypt(context):
     from copy import deepcopy
@@ -28,7 +27,6 @@ int main(int argc, char *argv[])
     return st[0]
     
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
 
 mlib = scons_get_mathlib(env)
 env.AppendUnique(LIBS = mlib)
@@ -43,4 +41,4 @@ sources = [os.path.join('mtrand', x) for x in
            ['mtrand.c', 'randomkit.c', 'initarray.c', 'distributions.c']]
 
 # XXX: Pyrex dependency
-mtrand = env.DistutilsPythonExtension('mtrand', source = sources)
+mtrand = env.NumpyPythonExtension('mtrand', source = sources)