diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2011-06-19 19:26:32 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-06-19 19:26:32 -0600 |
| commit | e4d790f005331e5ff59d54b9954ab56ec847bafc (patch) | |
| tree | f79af5d51d1418066701e7bcfb5e183ba0b3cfb0 /numpy/core/SConscript | |
| parent | bdb5ed82298f170abaf14393843538a8f3af9d36 (diff) | |
| download | numpy-e4d790f005331e5ff59d54b9954ab56ec847bafc.tar.gz | |
ENH: Generate the npysort library for linking during build, but do not
install it.
Diffstat (limited to 'numpy/core/SConscript')
| -rw-r--r-- | numpy/core/SConscript | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript index e059a1353..c57549c20 100644 --- a/numpy/core/SConscript +++ b/numpy/core/SConscript @@ -384,7 +384,6 @@ nditer_src = env.GenerateFromTemplate( lowlevel_strided_loops_src = env.GenerateFromTemplate( pjoin('src', 'multiarray', 'lowlevel_strided_loops.c.src')) einsum_src = env.GenerateFromTemplate(pjoin('src', 'multiarray', 'einsum.c.src')) -#sortmodule_src = env.GenerateFromTemplate(pjoin('src', 'npysort','sortmodule.c.src')) umathmodule_src = env.GenerateFromTemplate(pjoin('src', 'umath', 'umathmodule.c.src')) umath_tests_src = env.GenerateFromTemplate(pjoin('src', 'umath', @@ -433,16 +432,10 @@ env.Install('$distutils_installdir/lib/npy-pkg-config', npymath_ini) # npysort core lib npysort_src = [env.GenerateFromTemplate(pjoin('src', 'npysort', 'sort.c.src'))] -env.DistutilsInstalledStaticExtLibrary("npysort", npysort_src, install_dir='lib') +env.StaticExtLibrary("npysort", npysort_src) env.Prepend(LIBS=["npysort"]) env.Prepend(LIBPATH=["."]) -subst_dict = {'@prefix@': '$distutils_install_prefix', - '@pkgname@': 'numpy.core', '@sep@': os.path.sep} -npysort_ini = env.SubstInFile(pjoin('lib', 'npy-pkg-config', 'npysort.ini'), - 'npysort.ini.in', SUBST_DICT=subst_dict) -env.Install('$distutils_installdir/lib/npy-pkg-config', npysort_ini) - #----------------- # Build multiarray #----------------- |