diff options
Diffstat (limited to 'silx/math/setup.py')
| -rw-r--r-- | silx/math/setup.py | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/silx/math/setup.py b/silx/math/setup.py index 288eaf6..8d54576 100644 --- a/silx/math/setup.py +++ b/silx/math/setup.py @@ -42,50 +42,37 @@ def configuration(parent_package='', top_path=None): # ===================================== # histogramnd # ===================================== - histo_dir = 'histogramnd' - histo_src = [os.path.join(histo_dir, srcf) - for srcf in ['chistogramnd.pyx', - 'src/histogramnd_c.c']] - histo_inc = [os.path.join(histo_dir, 'include'), + histo_src = [os.path.join('histogramnd', 'src', 'histogramnd_c.c'), + 'chistogramnd.pyx'] + histo_inc = [os.path.join('histogramnd', 'include'), numpy.get_include()] config.add_extension('chistogramnd', sources=histo_src, include_dirs=histo_inc, language='c') - # ===================================== - # ===================================== # ===================================== # histogramnd_lut # ===================================== - histo_dir = 'histogramnd' - histo_src = [os.path.join(histo_dir, srcf) - for srcf in ['chistogramnd_lut.pyx']] - histo_inc = [os.path.join(histo_dir, 'include'), - numpy.get_include()] - config.add_extension('chistogramnd_lut', - sources=histo_src, + sources=['chistogramnd_lut.pyx'], include_dirs=histo_inc, language='c') # ===================================== - # ===================================== - # marching cubes - mc_dir = 'marchingcubes' - mc_src = [os.path.join(mc_dir, srcf) - for srcf in ['marchingcubes.pyx', 'mc_lut.cpp']] + # ===================================== + mc_src = [os.path.join('marchingcubes', 'mc_lut.cpp'), + 'marchingcubes.pyx'] config.add_extension('marchingcubes', sources=mc_src, - include_dirs=[mc_dir, numpy.get_include()], + include_dirs=['marchingcubes', numpy.get_include()], language='c++') # min/max - combo_dir = 'combo' config.add_extension('combo', - sources=[os.path.join(combo_dir, 'combo.pyx')], - include_dirs=[combo_dir], + sources=['combo.pyx'], + include_dirs=['include'], language='c') return config |