[Scipy-svn] r5333 - trunk/scipy/interpolate

scipy-svn@scip... scipy-svn@scip...
Tue Jan 6 13:09:04 CST 2009


Author: cdavid
Date: 2009-01-06 13:09:00 -0600 (Tue, 06 Jan 2009)
New Revision: 5333

Modified:
   trunk/scipy/interpolate/SConscript
Log:
BUG: Fix fitpack scons build/

Modified: trunk/scipy/interpolate/SConscript
===================================================================
--- trunk/scipy/interpolate/SConscript	2009-01-06 17:03:22 UTC (rev 5332)
+++ trunk/scipy/interpolate/SConscript	2009-01-06 19:09:00 UTC (rev 5333)
@@ -13,31 +13,32 @@
 config.Finish()
 
 # Build fitpack
-src = [pjoin("fitpack", s) for s in ["bispev.f", "clocur.f", "cocosp.f",
-"concon.f", "concur.f", "cualde.f", "curev.f", "curfit.f", "dblint.f",
-"evapol.f", "fourco.f", "fpader.f", "fpadno.f", "fpadpo.f", "fpback.f",
-"fpbacp.f", "fpbfout.f", "fpbisp.f", "fpbspl.f", "fpchec.f", "fpched.f",
-"fpchep.f", "fpclos.f", "fpcoco.f", "fpcons.f", "fpcosp.f", "fpcsin.f",
-"fpcurf.f", "fpcuro.f", "fpcyt1.f", "fpcyt2.f", "fpdeno.f", "fpdisc.f",
-"fpfrno.f", "fpgivs.f", "fpgrdi.f", "fpgrpa.f", "fpgrre.f", "fpgrsp.f",
-"fpinst.f", "fpintb.f", "fpknot.f", "fpopdi.f", "fpopsp.f", "fporde.f",
-"fppara.f", "fppasu.f", "fpperi.f", "fppocu.f", "fppogr.f", "fppola.f",
-"fprank.f", "fprati.f", "fpregr.f", "fprota.f", "fprppo.f", "fprpsp.f",
-"fpseno.f", "fpspgr.f", "fpsphe.f", "fpsuev.f", "fpsurf.f", "fpsysy.f",
-"fptrnp.f", "fptrpe.f", "insert.f", "parcur.f", "parder.f", "parsur.f",
-"percur.f", "pogrid.f", "polar.f", "profil.f", "regrid.f", "spalde.f",
-"spgrid.f", "sphere.f", "splder.f", "splev.f", "splint.f", "sproot.f",
-"surev.f", "surfit.f"]]
+src = [pjoin("fitpack", s) for s in ["bispev.f", "bispeu.f", "clocur.f",
+"cocosp.f", "concon.f", "concur.f", "cualde.f", "curev.f", "curfit.f",
+"dblint.f", "evapol.f", "fourco.f", "fpader.f", "fpadno.f", "fpadpo.f",
+"fpback.f", "fpbacp.f", "fpbfout.f", "fpbisp.f", "fpbspl.f", "fpchec.f",
+"fpched.f", "fpchep.f", "fpclos.f", "fpcoco.f", "fpcons.f", "fpcosp.f",
+"fpcsin.f", "fpcurf.f", "fpcuro.f", "fpcyt1.f", "fpcyt2.f", "fpdeno.f",
+"fpdisc.f", "fpfrno.f", "fpgivs.f", "fpgrdi.f", "fpgrpa.f", "fpgrre.f",
+"fpgrsp.f", "fpinst.f", "fpintb.f", "fpknot.f", "fpopdi.f", "fpopsp.f",
+"fporde.f", "fppara.f", "fppasu.f", "fpperi.f", "fppocu.f", "fppogr.f",
+"fppola.f", "fprank.f", "fprati.f", "fpregr.f", "fprota.f", "fprppo.f",
+"fprpsp.f", "fpseno.f", "fpspgr.f", "fpsphe.f", "fpsuev.f", "fpsurf.f",
+"fpsysy.f", "fptrnp.f", "fptrpe.f", "insert.f", "parcur.f", "parder.f",
+"parsur.f", "percur.f", "pogrid.f", "polar.f", "profil.f", "regrid.f",
+"spalde.f", "spgrid.f", "sphere.f", "splder.f", "splev.f", "splint.f",
+"sproot.f", "surev.f", "surfit.f"]]
 fitpack = env.DistutilsStaticExtLibrary('fitpack', source = src)
 
-env.PrependUnique(LIBS = ['fitpack'])
 env.PrependUnique(LIBPATH = ['.'])
 
 # Build _fitpack
-env.NumpyPythonExtension('_fitpack', source = 'src/_fitpackmodule.c')
+env.NumpyPythonExtension('_fitpack', source = 'src/_fitpackmodule.c', 
+		LIBS="fitpack")
 
 # Build dfitpack
-env.NumpyPythonExtension('dfitpack', source = 'src/fitpack.pyf')
+env.NumpyPythonExtension('dfitpack', source = 'src/fitpack.pyf',
+		LIBS="fitpack")
 
 # Build _interpolate
 env.NumpyPythonExtension('_interpolate', source = 'src/_interpolate.cpp',



More information about the Scipy-svn mailing list