Put multiarray modul sources into separate directory.

1 files changed, 22 insertions, 13 deletions

diff --git a/numpy/core/SConscript b/numpy/core/SConscript
index 5334f441f..90090ae5c 100644
--- a/numpy/core/SConscript
+++ b/numpy/core/SConscript
@@ -1,4 +1,4 @@
-# Last Change: Thu Apr 23 08:00 PM 2009 J
+# Last Change: Thu Apr 23 09:00 PM 2009 J
 # vim:syntax=python
 import os
 import sys
@@ -252,10 +252,12 @@ env.Append(BUILDERS = {'GenerateMultiarrayApi' : array_api_gen_bld,
 #------------------------
 # Generate generated code
 #------------------------
-scalartypes_src = env.GenerateFromTemplate(pjoin('src', 'scalartypes.c.src'))
+scalartypes_src = env.GenerateFromTemplate(
+    pjoin('src', 'multiarray', 'scalartypes.c.src'))
 umath_funcs_src = env.GenerateFromTemplate(pjoin('src', 'umath_funcs.inc.src'))
 umath_loops_src = env.GenerateFromTemplate(pjoin('src', 'umath_loops.c.src'))
-arraytypes_src = env.GenerateFromTemplate(pjoin('src', 'arraytypes.c.src'))
+arraytypes_src = env.GenerateFromTemplate(
+    pjoin('src', 'multiarray', 'arraytypes.c.src'))
 sortmodule_src = env.GenerateFromTemplate(pjoin('src', '_sortmodule.c.src'))
 umathmodule_src = env.GenerateFromTemplate(pjoin('src', 'umathmodule.c.src'))
 umath_tests_src = env.GenerateFromTemplate(pjoin('src', 'umath_tests.c.src'))
@@ -282,16 +284,23 @@ env.Prepend(LIBPATH=["."])
 #-----------------
 # Build multiarray
 #-----------------
-multiarray_src = [pjoin('src', 'multiarraymodule.c'),
-    pjoin('src', 'ucsnarrow.c'),
-    pjoin('src', 'hashdescr.c'), pjoin('src', 'arrayobject.c'),
-    pjoin('src', 'numpyos.c'), pjoin('src', 'arrayflagsobject.c'),
-    pjoin('src', 'arraydescr.c'), pjoin('src', 'arrayiterators.c'),
-    pjoin('src', 'arraymapping.c'), pjoin('src', 'arraynumber.c'),
-    pjoin('src', 'arraygetset.c'), pjoin('src', 'arraysequence.c'),
-    pjoin('src', 'arraymethods.c'), pjoin('src', 'arrayctors.c'),
-    pjoin('src', 'arrayconvert_datatype.c'), pjoin('src', 'arrayconvert.c'),
-    pjoin('src', 'arrayshape.c'), pjoin('src', 'array_item_selection.c')]
+multiarray_src = [pjoin('src', 'multiarray', 'multiarraymodule.c'),
+    pjoin('src', 'multiarray', 'hashdescr.c'),
+    pjoin('src', 'multiarray', 'arrayobject.c'),
+    pjoin('src', 'multiarray', 'numpyos.c'),
+    pjoin('src', 'multiarray', 'flagsobject.c'),
+    pjoin('src', 'multiarray', 'descriptor.c'),
+    pjoin('src', 'multiarray', 'iterators.c'),
+    pjoin('src', 'multiarray', 'mapping.c'),
+    pjoin('src', 'multiarray', 'number.c'),
+    pjoin('src', 'multiarray', 'getset.c'),
+    pjoin('src', 'multiarray', 'sequence.c'),
+    pjoin('src', 'multiarray', 'methods.c'),
+    pjoin('src', 'multiarray', 'ctors.c'),
+    pjoin('src', 'multiarray', 'convert_datatype.c'),
+    pjoin('src', 'multiarray', 'convert.c'),
+    pjoin('src', 'multiarray', 'shape.c'),
+    pjoin('src', 'multiarray', 'item_selection.c')]
 multiarray_src.extend(arraytypes_src)
 multiarray_src.extend(scalartypes_src)
 multiarray = env.DistutilsPythonExtension('multiarray', source = multiarray_src)