[Scipy-svn] r4024 - in trunk/scipy: integrate interpolate odr

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-03-15 05:52:19 -0500 (Sat, 15 Mar 2008)
New Revision: 4024

Modified:
   trunk/scipy/integrate/SConstruct
   trunk/scipy/interpolate/SConstruct
   trunk/scipy/odr/SConstruct
Log:
Merging revs 4007:4010  from branch build_with_scons.

Modified: trunk/scipy/integrate/SConstruct
===================================================================
--- trunk/scipy/integrate/SConstruct	2008-03-15 10:48:23 UTC (rev 4023)
+++ trunk/scipy/integrate/SConstruct	2008-03-15 10:52:19 UTC (rev 4024)
@@ -1,4 +1,4 @@
-# Last Change: Wed Mar 05 03:00 PM 2008 J
+# Last Change: Tue Mar 11 04:00 PM 2008 J
 # vim:syntax=python
 from os.path import join as pjoin
 import warnings
@@ -41,20 +41,20 @@
 src = [str(s) for s in env.NumpyGlob(pjoin('odepack', '*.f'))]
 odepack = env.NumpyStaticExtLibrary('odepack', source = src)
 
-#env.AppendUnique(LIBS = ['linpack_lite', 'quadpack', 'odepack', 'mach'])
 env.AppendUnique(LIBPATH = env['build_dir'])
+env.AppendUnique(LINKFLAGSEND = env['F77_LDFLAGS'])
 
+quadenv = env.Copy()
+quadenv.Prepend(LIBS = ['quadpack', 'linpack_lite', 'mach'])
+
+odenv = env.Copy()
+odenv.Prepend(LIBS = ['odepack', 'linpack_lite', 'mach'])
+
 # Build _quadpack
-env.NumpyPythonExtension('_quadpack', source = '_quadpackmodule.c', 
-                         LIBS = ['quadpack', 'linpack_lite', 'mach'],
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+quadenv.NumpyPythonExtension('_quadpack', source = '_quadpackmodule.c')
 
 # Build _odepack
-env.NumpyPythonExtension('_odepack', source = '_odepackmodule.c',
-                         LIBS = ['odepack', 'linpack_lite', 'mach'],
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+odenv.NumpyPythonExtension('_odepack', source = '_odepackmodule.c')
 
 # Build vode
-env.NumpyPythonExtension('vode', source = 'vode.pyf',
-                         LIBS = ['odepack', 'linpack_lite', 'mach'],
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+odenv.NumpyPythonExtension('vode', source = 'vode.pyf')

Modified: trunk/scipy/interpolate/SConstruct
===================================================================
--- trunk/scipy/interpolate/SConstruct	2008-03-15 10:48:23 UTC (rev 4023)
+++ trunk/scipy/interpolate/SConstruct	2008-03-15 10:52:19 UTC (rev 4024)
@@ -12,16 +12,16 @@
     raise Exception("Could not check F77 runtime, needed for interpolate")
 config.Finish()
 
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-env.AppendUnique(LINKFLAGS = env['F77_LDFLAGS'])
+env.PrependUnique(CPPPATH = get_numpy_include_dirs())
+env.PrependUnique(CPPPATH = env['F2PYINCLUDEDIR'])
+env.AppendUnique(LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # Build fitpack
 src = [str(s) for s in env.NumpyGlob(pjoin('fitpack', '*.f'))]
 fitpack = env.NumpyStaticExtLibrary('fitpack', source = src)
 
-env.AppendUnique(LIBS = ['fitpack'])
-env.AppendUnique(LIBPATH = env['build_dir'])
+env.PrependUnique(LIBS = ['fitpack'])
+env.PrependUnique(LIBPATH = [env['build_dir']])
 
 # Build _fitpack
 env.NumpyPythonExtension('_fitpack', source = '_fitpackmodule.c')

Modified: trunk/scipy/odr/SConstruct
===================================================================
--- trunk/scipy/odr/SConstruct	2008-03-15 10:48:23 UTC (rev 4023)
+++ trunk/scipy/odr/SConstruct	2008-03-15 10:52:19 UTC (rev 4024)
@@ -53,9 +53,10 @@
     libodr_src.append(pjoin('odrpack', 'd_lpkbls.f'))
 
 env.NumpyStaticExtLibrary('odrpack', source = libodr_src)
-env.AppendUnique(LIBS = 'odrpack')
-env.AppendUnique(LIBPATH = env['build_dir'])
 
+env.PrependUnique(LIBS = 'odrpack')
+env.PrependUnique(LIBPATH = env['build_dir'])
+
 # odr pyextension
 env.NumpyPythonExtension('__odrpack', '__odrpack.c',
                          LINKFLAGSEND = env['F77_LDFLAGS'])