[Scipy-svn] r4438 - in trunk/scipy: lib/lapack linalg stats

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-06-12 05:59:41 -0500 (Thu, 12 Jun 2008)
New Revision: 4438

Modified:
   trunk/scipy/lib/lapack/SConscript
   trunk/scipy/linalg/SConscript
   trunk/scipy/stats/SConscript
Log:
Replace depreacted NumpyF2py builder by their new names.

Modified: trunk/scipy/lib/lapack/SConscript
===================================================================
--- trunk/scipy/lib/lapack/SConscript	2008-06-12 10:58:13 UTC (rev 4437)
+++ trunk/scipy/lib/lapack/SConscript	2008-06-12 10:59:41 UTC (rev 4438)
@@ -84,7 +84,7 @@
 #----------------
 # calc_lwork:
 #----------------
-calc_src = env.NumpyF2py(pjoin('calc_lworkmodule.c'), 
+calc_src = env.F2py(pjoin('calc_lworkmodule.c'), 
                          source = pjoin('calc_lwork.f'))
 env.DistutilsPythonExtension('calc_lwork', source = calc_src + ['calc_lwork.f'],
                          LINKFLAGSEND = env['F77_LDFLAGS'])

Modified: trunk/scipy/linalg/SConscript
===================================================================
--- trunk/scipy/linalg/SConscript	2008-06-12 10:58:13 UTC (rev 4437)
+++ trunk/scipy/linalg/SConscript	2008-06-12 10:59:41 UTC (rev 4438)
@@ -139,7 +139,7 @@
 #   _flinalg
 #----------------
 flinalg_fsrc = [pjoin('src', i) for i in ['det.f', 'lu.f']]
-flinalg_src = fenv.NumpyF2py(pjoin('src', '_flinalgmodule.c'), flinalg_fsrc)
+flinalg_src = fenv.F2py(pjoin('src', '_flinalgmodule.c'), flinalg_fsrc)
 
 fenv.DistutilsPythonExtension('_flinalg', source = flinalg_src + flinalg_fsrc)
 
@@ -147,7 +147,7 @@
 # calc_lwork:
 #----------------
 calc_fsrc = [pjoin('src', 'calc_lwork.f')]
-calc_src = env.NumpyF2py(pjoin('src', 'calc_lworkmodule.c'), calc_fsrc)
+calc_src = env.F2py(pjoin('src', 'calc_lworkmodule.c'), calc_fsrc)
 fenv.DistutilsPythonExtension('calc_lwork', calc_src + calc_fsrc)
 
 #--------------

Modified: trunk/scipy/stats/SConscript
===================================================================
--- trunk/scipy/stats/SConscript	2008-06-12 10:58:13 UTC (rev 4437)
+++ trunk/scipy/stats/SConscript	2008-06-12 10:59:41 UTC (rev 4438)
@@ -30,7 +30,7 @@
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # futil extension
-futil_src = env.NumpyF2py(pjoin('futilmodule.c'), pjoin('futil.f'))
+futil_src = env.F2py(pjoin('futilmodule.c'), pjoin('futil.f'))
 env.DistutilsPythonExtension('futil', source = futil_src + ['futil.f'],
                          LINKFLAGSEND = env['F77_LDFLAGS'])