diff options
| author | David Cournapeau <cournape@gmail.com> | 2008-07-09 06:03:35 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2008-07-09 06:03:35 +0000 |
| commit | 0dffd02f017944c9ccfbdbe667a21fe27473a387 (patch) | |
| tree | 6fe2f904ef4517258077dae440d8a62e8240f91f | |
| parent | 06e999f3a8b458684b4cd9677417f799caf02585 (diff) | |
| download | numpy-0dffd02f017944c9ccfbdbe667a21fe27473a387.tar.gz | |
Simplify a bit more scons scripts.
| -rw-r--r-- | numpy/fft/SConscript | 5 | ||||
| -rw-r--r-- | numpy/lib/SConscript | 3 | ||||
| -rw-r--r-- | numpy/linalg/SConscript | 11 | ||||
| -rw-r--r-- | numpy/numarray/SConscript | 2 | ||||
| -rw-r--r-- | numpy/random/SConscript | 2 |
5 files changed, 8 insertions, 15 deletions
diff --git a/numpy/fft/SConscript b/numpy/fft/SConscript index c6e0445e8..42764229a 100644 --- a/numpy/fft/SConscript +++ b/numpy/fft/SConscript @@ -4,6 +4,5 @@ from numscons import GetNumpyEnvironment env = GetNumpyEnvironment(ARGUMENTS) -fftpack_lite = env.NumpyPythonExtension('fftpack_lite', - source = ['fftpack_litemodule.c', - 'fftpack.c']) +env.NumpyPythonExtension('fftpack_lite', + source = ['fftpack_litemodule.c', 'fftpack.c']) diff --git a/numpy/lib/SConscript b/numpy/lib/SConscript index 279b42319..9123a82ec 100644 --- a/numpy/lib/SConscript +++ b/numpy/lib/SConscript @@ -3,5 +3,4 @@ from numscons import GetNumpyEnvironment env = GetNumpyEnvironment(ARGUMENTS) -_compiled_base = env.NumpyPythonExtension('_compiled_base', - source = ['src/_compiled_base.c']) +env.NumpyPythonExtension('_compiled_base', source = ['src/_compiled_base.c']) diff --git a/numpy/linalg/SConscript b/numpy/linalg/SConscript index 6eba98735..78c4d569b 100644 --- a/numpy/linalg/SConscript +++ b/numpy/linalg/SConscript @@ -1,16 +1,12 @@ # Last Change: Thu Jun 12 06:00 PM 2008 J # vim:syntax=python -import os.path - -from numscons import GetNumpyEnvironment, \ - scons_get_mathlib +from numscons import GetNumpyEnvironment, scons_get_mathlib from numscons import CheckF77LAPACK from numscons import write_info env = GetNumpyEnvironment(ARGUMENTS) -config = env.NumpyConfigure(custom_tests = - {'CheckLAPACK' : CheckF77LAPACK}) +config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK}) use_lapack = config.CheckLAPACK() @@ -24,5 +20,4 @@ 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.NumpyPythonExtension('lapack_lite', source = sources) - +env.NumpyPythonExtension('lapack_lite', source = sources) diff --git a/numpy/numarray/SConscript b/numpy/numarray/SConscript index 2c8e7b016..974ea1961 100644 --- a/numpy/numarray/SConscript +++ b/numpy/numarray/SConscript @@ -5,4 +5,4 @@ from numscons import GetNumpyEnvironment env = GetNumpyEnvironment(ARGUMENTS) env.Append(CPPPATH = ['numpy']) -_capi = env.NumpyPythonExtension('_capi', source = ['_capi.c']) +env.NumpyPythonExtension('_capi', source = ['_capi.c']) diff --git a/numpy/random/SConscript b/numpy/random/SConscript index e7f5018bf..a9bc3a599 100644 --- a/numpy/random/SConscript +++ b/numpy/random/SConscript @@ -41,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.NumpyPythonExtension('mtrand', source = sources) +env.NumpyPythonExtension('mtrand', source = sources) |