[Scipy-svn] r4434 - in trunk/scipy: integrate interpolate odr optimize sparse/linalg/eigen/arpack special stats

scipy-svn@scip... scipy-svn@scip...
Thu Jun 12 05:38:43 CDT 2008


Author: cdavid
Date: 2008-06-12 05:38:29 -0500 (Thu, 12 Jun 2008)
New Revision: 4434

Modified:
   trunk/scipy/integrate/SConscript
   trunk/scipy/interpolate/SConscript
   trunk/scipy/odr/SConscript
   trunk/scipy/optimize/SConscript
   trunk/scipy/sparse/linalg/eigen/arpack/SConscript
   trunk/scipy/special/SConscript
   trunk/scipy/stats/SConscript
Log:
Replace build_dir by current directory when used as a LIBPATH.

Modified: trunk/scipy/integrate/SConscript
===================================================================
--- trunk/scipy/integrate/SConscript	2008-06-12 10:25:25 UTC (rev 4433)
+++ trunk/scipy/integrate/SConscript	2008-06-12 10:38:29 UTC (rev 4434)
@@ -1,4 +1,4 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
+# Last Change: Thu Jun 12 07:00 PM 2008 J
 # vim:syntax=python
 from os.path import join as pjoin
 import warnings
@@ -42,7 +42,7 @@
 src = [str(s) for s in env.NumpyGlob(pjoin('odepack', '*.f'))]
 odepack = env.DistutilsStaticExtLibrary('odepack', source = src)
 
-env.AppendUnique(LIBPATH = env['build_dir'])
+env.AppendUnique(LIBPATH = '.')
 env.AppendUnique(LINKFLAGSEND = env['F77_LDFLAGS'])
 
 quadenv = env.Clone()

Modified: trunk/scipy/interpolate/SConscript
===================================================================
--- trunk/scipy/interpolate/SConscript	2008-06-12 10:25:25 UTC (rev 4433)
+++ trunk/scipy/interpolate/SConscript	2008-06-12 10:38:29 UTC (rev 4434)
@@ -1,4 +1,4 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
+# Last Change: Thu Jun 12 07:00 PM 2008 J
 # vim:syntax=python
 from os.path import join as pjoin
 
@@ -22,7 +22,7 @@
 fitpack = env.DistutilsStaticExtLibrary('fitpack', source = src)
 
 env.PrependUnique(LIBS = ['fitpack'])
-env.PrependUnique(LIBPATH = [env['build_dir']])
+env.PrependUnique(LIBPATH = ['.'])
 
 # Build _fitpack
 env.DistutilsPythonExtension('_fitpack', source = '_fitpackmodule.c')

Modified: trunk/scipy/odr/SConscript
===================================================================
--- trunk/scipy/odr/SConscript	2008-06-12 10:25:25 UTC (rev 4433)
+++ trunk/scipy/odr/SConscript	2008-06-12 10:38:29 UTC (rev 4434)
@@ -1,4 +1,4 @@
-# Last Change: Wed Mar 05 04:00 PM 2008 J
+# Last Change: Thu Jun 12 07:00 PM 2008 J
 # vim:syntax=python
 
 import os
@@ -55,7 +55,7 @@
 env.DistutilsStaticExtLibrary('odrpack', source = libodr_src)
 
 env.PrependUnique(LIBS = 'odrpack')
-env.PrependUnique(LIBPATH = env['build_dir'])
+env.PrependUnique(LIBPATH = '.')
 
 # odr pyextension
 env.DistutilsPythonExtension('__odrpack', '__odrpack.c',

Modified: trunk/scipy/optimize/SConscript
===================================================================
--- trunk/scipy/optimize/SConscript	2008-06-12 10:25:25 UTC (rev 4433)
+++ trunk/scipy/optimize/SConscript	2008-06-12 10:38:29 UTC (rev 4434)
@@ -1,4 +1,4 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
+# Last Change: Thu Jun 12 07:00 PM 2008 J
 # vim:syntax=python
 
 import os
@@ -56,7 +56,7 @@
 env.DistutilsStaticExtLibrary('rootfind', source = rootfind_src)
 
 env.AppendUnique(LIBS = ['minpack', 'rootfind'])
-env.AppendUnique(LIBPATH = env['build_dir'])
+env.AppendUnique(LIBPATH = '.')
 
 # _minpack pyextension
 env.DistutilsPythonExtension('_minpack', '_minpackmodule.c',

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-06-12 10:25:25 UTC (rev 4433)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-06-12 10:38:29 UTC (rev 4434)
@@ -35,7 +35,7 @@
 
 env.AppendUnique(CPPPATH = pjoin('ARPACK', 'SRC'))
 env.AppendUnique(F77PATH = pjoin(env['src_dir'], 'ARPACK', 'SRC'))
-env.AppendUnique(LIBPATH = env['build_dir'])
+env.AppendUnique(LIBPATH = '.')
 arpack_lib = env.DistutilsStaticExtLibrary('arpack', source = src)
 
 # Build _arpack extension

Modified: trunk/scipy/special/SConscript
===================================================================
--- trunk/scipy/special/SConscript	2008-06-12 10:25:25 UTC (rev 4433)
+++ trunk/scipy/special/SConscript	2008-06-12 10:38:29 UTC (rev 4434)
@@ -1,4 +1,4 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
+# Last Change: Thu Jun 12 07:00 PM 2008 J
 # vim:syntax=python
 from os.path import join as pjoin, basename as pbasename
 import sys
@@ -46,7 +46,7 @@
 build_lib('cdflib', '.f', 'cdf')
 build_lib('specfun', '.f', 'specfunlib')
 
-env.AppendUnique(LIBPATH = [env['build_dir']])
+env.AppendUnique(LIBPATH = ['.'])
 
 # Cephes extension
 src = ['_cephesmodule.c', 'amos_wrappers.c', 'specfun_wrappers.c', \

Modified: trunk/scipy/stats/SConscript
===================================================================
--- trunk/scipy/stats/SConscript	2008-06-12 10:25:25 UTC (rev 4433)
+++ trunk/scipy/stats/SConscript	2008-06-12 10:38:29 UTC (rev 4434)
@@ -1,4 +1,4 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
+# Last Change: Thu Jun 12 07:00 PM 2008 J
 # vim:syntax=python
 from os.path import join as pjoin
 
@@ -21,7 +21,7 @@
 src = env.NumpyGlob(pjoin('statlib', '*.f' ))
 env.DistutilsStaticExtLibrary('statlibimp', source = src)
 
-env.AppendUnique(LIBPATH = [env['build_dir']])
+env.AppendUnique(LIBPATH = '.')
 
 # Statlib extension
 env.DistutilsPythonExtension('statlib', source = 'statlib.pyf', 



More information about the Scipy-svn mailing list