Moved inclusion of files from MANIFEST.in to proper setup.py files.

stefanseefeld · Oct 5, 2005 · 2d40d9e · 2d40d9e
1 parent 77ec6f0
commit 2d40d9e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -8,7 +8,7 @@ include MANIFEST.in
 #recursive-include scipy/f2py2e/tests/mixed *.f *.f90
 ##recursive-include scipy/f2py2e/doc *.py *.txt *.tex *.html Makefile
 #recursive-include scipy/f2py2e/docs *.txt *.html *.dat *.f *.f90 *.pyf setup_example.py f2py_style.css
-include scipy/corelib/blasdot/cblas.h
-recursive-include scipy/corelib/mtrand *.c *.h *.pyx *.pxi
-prune scipy/base/include/scipy
-recursive-include scipy/base/include/scipy *object.h
+#include scipy/corelib/blasdot/cblas.h
+#recursive-include scipy/corelib/mtrand *.c *.h *.pyx *.pxi
+#prune scipy/base/include/scipy
+#recursive-include scipy/base/include/scipy *object.h
diff --git a/scipy/base/setup.py b/scipy/base/setup.py
@@ -138,6 +138,7 @@ def generate_umath_c(ext,build_dir):
             join('src','arraymethods.c'),
             join('src','scalartypes.inc.src'),
             join('src','arraytypes.inc.src'),
+            join('include','scipy','*object.h')
             ]
 
     config.add_extension('multiarray',

diff --git a/scipy/corelib/setup.py b/scipy/corelib/setup.py
@@ -15,12 +15,14 @@ def configuration(parent_package='',top_path=None):
     #blas_info = {}
     def get_dotblas_sources(ext, build_dir):
         if blas_info:
-            return ext.depends
+            return ext.depends[:1]
         return None # no extension module will be built
 
     config.add_extension('_dotblas',
                          sources = [get_dotblas_sources],
-                         depends=[join('blasdot','_dotblas.c')],
+                         depends=[join('blasdot','_dotblas.c'),
+                                  join('blasdot','cblas.h'),
+                                  ],
                          include_dirs = ['blasdot'],
                          extra_info = blas_info
                          )
@@ -38,6 +40,10 @@ def get_dotblas_sources(ext, build_dir):
                                    'distributions.c', 'gamma.c', 'polevl.c', 
                                    'isnan.c', 'const.c']],
                          libraries=['m'],
+                         depends = [join('mtrand','*.h'),
+                                    join('mtrand','*.pyx'),
+                                    join('mtrand','*.pxi'),
+                                    ]
                         )
 
     # Configure lapack_lite

diff --git a/scipy/distutils/misc_util.py b/scipy/distutils/misc_util.py
@@ -554,7 +554,6 @@ def add_extension(self,name,sources,**kw):
                 new_v = self._fix_paths(v)
                 ext_args[k] = new_v
 
-
         # Resolve out-of-tree dependencies
         libraries = ext_args.get('libraries',[])
         libnames = []