adapt numpy.linalg to new scons build_dir architecture.

2 files changed, 31 insertions, 29 deletions

diff --git a/numpy/linalg/SConscript b/numpy/linalg/SConscript
new file mode 100644
index 000000000..366697bd5
--- /dev/null
+++ b/numpy/linalg/SConscript
@@ -0,0 +1,29 @@
+# Last Change: Thu Jun 12 06:00 PM 2008 J
+# vim:syntax=python
+import os.path
+
+from numscons import GetNumpyEnvironment, scons_get_paths, \
+                     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})
+
+use_lapack = config.CheckLAPACK()
+
+mlib = scons_get_mathlib(env)
+env.AppendUnique(LIBS = mlib)
+
+config.Finish()
+write_info(env)
+
+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)
+            
diff --git a/numpy/linalg/SConstruct b/numpy/linalg/SConstruct
index 5c7747cdd..a377d8391 100644
--- a/numpy/linalg/SConstruct
+++ b/numpy/linalg/SConstruct
@@ -1,29 +1,2 @@
-# Last Change: Tue May 20 05:00 PM 2008 J
-# vim:syntax=python
-import os.path
-
-from numscons import GetNumpyEnvironment, scons_get_paths, \
-                     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})
-
-use_lapack = config.CheckLAPACK()
-
-mlib = scons_get_mathlib(env)
-env.AppendUnique(LIBS = mlib)
-
-config.Finish()
-write_info(env)
-
-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)
-            
+from numscons import GetInitEnvironment
+GetInitEnvironment(ARGUMENTS).DistutilsSConscript('SConscript')