diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-06-30 16:41:00 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-06-30 16:41:00 +0000 |
| commit | e8dda82fe6b30865aa8059df4ba3abaae6568892 (patch) | |
| tree | 911c504eecabf50d68539d692777cd34bab4c4a3 /numpy | |
| parent | 5f8a94fc19a9e2026d54215765e01eed9bcd147b (diff) | |
| download | numpy-e8dda82fe6b30865aa8059df4ba3abaae6568892.tar.gz | |
Move npymath sources into subdir, since we will add quite a few files later for complex support.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/SConscript | 2 | ||||
| -rw-r--r-- | numpy/core/setup.py | 5 | ||||
| -rw-r--r-- | numpy/core/src/npymath/_signbit.c (renamed from numpy/core/src/_signbit.c) | 0 | ||||
| -rw-r--r-- | numpy/core/src/npymath/npy_math.c.src (renamed from numpy/core/src/npy_math.c.src) | 0 | ||||
| -rw-r--r-- | numpy/core/src/npymath/npy_math_private.h (renamed from numpy/core/src/npy_math_private.h) | 0 |
5 files changed, 4 insertions, 3 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript index f09b17618..6997b8f68 100644 --- a/numpy/core/SConscript +++ b/numpy/core/SConscript @@ -313,7 +313,7 @@ ufunc_api = env.GenerateUfuncApi('ufunc_api', env.Prepend(CPPPATH = ['include', '.']) # npymath core lib -npymath_src = env.GenerateFromTemplate(pjoin('src', 'npy_math.c.src')) +npymath_src = env.GenerateFromTemplate(pjoin('src', 'npymath', 'npy_math.c.src')) env.DistutilsStaticExtLibrary("npymath", npymath_src) env.Prepend(LIBS=["npymath"]) env.Prepend(LIBPATH=["."]) diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 6671fc285..c1035aa9f 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -548,12 +548,13 @@ def configuration(parent_package='',top_path=None): return [] config.add_data_files('include/numpy/*.h') + config.add_include_dirs(join('src', 'npymath')) config.add_include_dirs(join('src', 'multiarray')) config.add_include_dirs(join('src', 'umath')) config.numpy_include_dirs.extend(config.paths('include')) - deps = [join('src','_signbit.c'), + deps = [join('src','npymath','_signbit.c'), join('include','numpy','*object.h'), 'include/numpy/fenv/fenv.c', 'include/numpy/fenv/fenv.h', @@ -579,7 +580,7 @@ def configuration(parent_package='',top_path=None): # explicitly add an extension which has generate_config_h and # generate_numpyconfig_h as sources *before* adding npymath. config.add_library('npymath', - sources=[join('src', 'npy_math.c.src')]) + sources=[join('src', 'npymath', 'npy_math.c.src')]) multiarray_deps = [ join('src', 'multiarray', 'arrayobject.h'), diff --git a/numpy/core/src/_signbit.c b/numpy/core/src/npymath/_signbit.c index a2ad38162..a2ad38162 100644 --- a/numpy/core/src/_signbit.c +++ b/numpy/core/src/npymath/_signbit.c diff --git a/numpy/core/src/npy_math.c.src b/numpy/core/src/npymath/npy_math.c.src index 66fd319ab..66fd319ab 100644 --- a/numpy/core/src/npy_math.c.src +++ b/numpy/core/src/npymath/npy_math.c.src diff --git a/numpy/core/src/npy_math_private.h b/numpy/core/src/npymath/npy_math_private.h index e76db5331..e76db5331 100644 --- a/numpy/core/src/npy_math_private.h +++ b/numpy/core/src/npymath/npy_math_private.h |