Merge branch 'reverting-lapack-refactor' into tmp

* reverting-lapack-refactor: MAINT: update .c files from modified .pyx files RF: refactor import_array as documented BF: recythonize routines.pyx to fix import error MAINT: fix cythonize Makefile target Revert "Merge pull request nipy#328 from alexis-roche/remove-lapack-linking"
matthew-brett · Aug 29, 2015 · 41d20a1 · 41d20a1
2 parents 3def993 + 14e5332
commit 41d20a1
Show file tree

Hide file tree

Showing 50 changed files with 16,866 additions and 20,942 deletions.
diff --git a/Makefile b/Makefile
@@ -108,7 +108,7 @@ tox-stale:
 
 recythonize:
 	# Recythonize all pyx files
-	find . -name "*.pyx" -exec cython -I libcstat/wrapper {} \;
+	find . -name "*.pyx" -exec cython -I libcstat/wrapper -I lib/fff_python_wrapper {} \;
 
 # Website stuff
 $(WWW_DIR):

diff --git a/lib/fff/fff_base.c b/lib/fff/fff_base.c
@@ -44,6 +44,8 @@ unsigned int fff_nbytes(fff_datatype type)
 }
 
 
+
+
 int fff_is_integer(fff_datatype type)
 {
   int ok = 0;