python/: move source files to ext/

diff --git a/python/aubio-types.h b/python/ext/aubio-types.h
similarity index 100%
rename from python/aubio-types.h
rename to python/ext/aubio-types.h

diff --git a/python/aubiomodule.c b/python/ext/aubiomodule.c
similarity index 100%
rename from python/aubiomodule.c
rename to python/ext/aubiomodule.c

diff --git a/python/aubioproxy.c b/python/ext/aubioproxy.c
similarity index 100%
rename from python/aubioproxy.c
rename to python/ext/aubioproxy.c

diff --git a/python/aubiowraphell.h b/python/ext/aubiowraphell.h
similarity index 100%
rename from python/aubiowraphell.h
rename to python/ext/aubiowraphell.h

diff --git a/python/py-cvec.c b/python/ext/py-cvec.c
similarity index 100%
rename from python/py-cvec.c
rename to python/ext/py-cvec.c

diff --git a/python/py-fft.c b/python/ext/py-fft.c
similarity index 100%
rename from python/py-fft.c
rename to python/ext/py-fft.c

diff --git a/python/py-filter.c b/python/ext/py-filter.c
similarity index 100%
rename from python/py-filter.c
rename to python/ext/py-filter.c

diff --git a/python/py-filterbank.c b/python/ext/py-filterbank.c
similarity index 100%
rename from python/py-filterbank.c
rename to python/ext/py-filterbank.c

diff --git a/python/py-phasevoc.c b/python/ext/py-phasevoc.c
similarity index 100%
rename from python/py-phasevoc.c
rename to python/ext/py-phasevoc.c

diff --git a/python/gen_pyobject.py b/python/gen_pyobject.py
index 20f4534a14c1d79ae4b6b946df74c5c28d7f232e..14920fbca808b56a28f92379fe480bb7fba35db3 100644 (file)
--- a/python/gen_pyobject.py
+++ b/python/gen_pyobject.py
@@ -172,7 +172,7 @@ def gen_new_init(newfunc, name):
 // WARNING: this file is generated, DO NOT EDIT
 
 // WARNING: if you haven't read the first line yet, please do so
-#include "aubiowraphell.h"
+#include "ext/aubiowraphell.h"
 
 typedef struct
 {

diff --git a/python/setup.py b/python/setup.py
index 55a6f8827e5a198be19fe5c39c9b0831acf05ee2..104154658aa7535391e108da383420d10d443078 100755 (executable)
--- a/python/setup.py
+++ b/python/setup.py
@@ -17,16 +17,17 @@ include_dirs = ['../build/src', '../src', '.' ]
 library_dirs = filter (lambda x: os.path.isdir(x), library_dirs)
 include_dirs = filter (lambda x: os.path.isdir(x), include_dirs)
 
-aubio_extension = Extension("aubio._aubio",
-        ["aubiomodule.c",
-            "aubioproxy.c",
-            "py-cvec.c",
+aubio_extension = Extension("aubio._aubio", [
+            "ext/aubiomodule.c",
+            "ext/aubioproxy.c",
+            "ext/ufuncs.c",
+            "ext/py-cvec.c",
             # example without macro
-            "py-filter.c",
+            "ext/py-filter.c",
             # macroised
-            "py-filterbank.c",
-            "py-fft.c",
-            "py-phasevoc.c",
+            "ext/py-filterbank.c",
+            "ext/py-fft.c",
+            "ext/py-phasevoc.c",
             # generated files
             ] + generate_object_files(),
         include_dirs = include_dirs + [ numpy.get_include() ],