[PATCH 5/6] move src/python to src/api/python

[william hubbs]

From: William Hubbs <address@hidden>
To: address@hidden

---
 configure.ac                                       |    6 +++---
 src/Makefile.am                                    |    6 +-----
 src/api/Makefile.am                                |    4 ++++
 src/{ => api}/python/ChangeLog                     |    0
 src/{ => api}/python/Makefile.am                   |    0
 src/{ => api}/python/README                        |    0
 src/{ => api}/python/speechd/Makefile.am           |    0
 src/{ => api}/python/speechd/__init__.py           |    0
 src/{ => api}/python/speechd/_test.py              |    0
 src/{ => api}/python/speechd/client.py             |    0
 src/{ => api}/python/speechd/paths.py.in           |    0
 src/{ => api}/python/speechd_config/Makefile.am    |    0
 src/{ => api}/python/speechd_config/__init__.py    |    0
 src/{ => api}/python/speechd_config/config.py      |    0
 src/{ => api}/python/speechd_config/paths.py.in    |    0
 src/{ => api}/python/speechd_config/spd-conf       |    0
 .../python/speechd_config/speechd.desktop          |    0
 src/{ => api}/python/speechd_config/test.wav       |  Bin 17410 -> 17410 bytes
 18 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{ => api}/python/ChangeLog (100%)
 rename src/{ => api}/python/Makefile.am (100%)
 rename src/{ => api}/python/README (100%)
 rename src/{ => api}/python/speechd/Makefile.am (100%)
 rename src/{ => api}/python/speechd/__init__.py (100%)
 rename src/{ => api}/python/speechd/_test.py (100%)
 rename src/{ => api}/python/speechd/client.py (100%)
 rename src/{ => api}/python/speechd/paths.py.in (100%)
 rename src/{ => api}/python/speechd_config/Makefile.am (100%)
 rename src/{ => api}/python/speechd_config/__init__.py (100%)
 rename src/{ => api}/python/speechd_config/config.py (100%)
 rename src/{ => api}/python/speechd_config/paths.py.in (100%)
 rename src/{ => api}/python/speechd_config/spd-conf (100%)
 rename src/{ => api}/python/speechd_config/speechd.desktop (100%)
 rename src/{ => api}/python/speechd_config/test.wav (100%)

diff --git a/configure.ac b/configure.ac
index 7902cf6..89448f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -424,6 +424,9 @@ AC_CONFIG_FILES([Makefile
        src/Makefile
        src/api/Makefile
        src/api/c/Makefile
+       src/api/python/Makefile
+       src/api/python/speechd/Makefile
+       src/api/python/speechd_config/Makefile
        src/audio/Makefile
        src/audio/static_plugins.c
        src/clients/Makefile
@@ -431,9 +434,6 @@ AC_CONFIG_FILES([Makefile
        src/clients/spdsend/Makefile
        src/common/Makefile
        src/modules/Makefile
-       src/python/Makefile
-       src/python/speechd/Makefile
-       src/python/speechd_config/Makefile
        src/server/Makefile
        src/tests/Makefile])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index edefd62..47d134e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,5 @@
 
 SUBDIRS=common server audio modules api clients tests
 
-if HAVE_PYTHON
-SUBDIRS += python
-endif
-
-DIST_SUBDIRS=common server audio modules api clients tests python
+DIST_SUBDIRS=common server audio modules api clients tests
 
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 2a90e9e..9f3ddfe 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -2,5 +2,9 @@
 
 SUBDIRS= c
 
+if HAVE_PYTHON
+SUBDIRS += python
+endif
+
 EXTRA_DIST = cl guile
 
diff --git a/src/python/ChangeLog b/src/api/python/ChangeLog
similarity index 100%
rename from src/python/ChangeLog
rename to src/api/python/ChangeLog
diff --git a/src/python/Makefile.am b/src/api/python/Makefile.am
similarity index 100%
rename from src/python/Makefile.am
rename to src/api/python/Makefile.am
diff --git a/src/python/README b/src/api/python/README
similarity index 100%
rename from src/python/README
rename to src/api/python/README
diff --git a/src/python/speechd/Makefile.am b/src/api/python/speechd/Makefile.am
similarity index 100%
rename from src/python/speechd/Makefile.am
rename to src/api/python/speechd/Makefile.am
diff --git a/src/python/speechd/__init__.py b/src/api/python/speechd/__init__.py
similarity index 100%
rename from src/python/speechd/__init__.py
rename to src/api/python/speechd/__init__.py
diff --git a/src/python/speechd/_test.py b/src/api/python/speechd/_test.py
similarity index 100%
rename from src/python/speechd/_test.py
rename to src/api/python/speechd/_test.py
diff --git a/src/python/speechd/client.py b/src/api/python/speechd/client.py
similarity index 100%
rename from src/python/speechd/client.py
rename to src/api/python/speechd/client.py
diff --git a/src/python/speechd/paths.py.in b/src/api/python/speechd/paths.py.in
similarity index 100%
rename from src/python/speechd/paths.py.in
rename to src/api/python/speechd/paths.py.in
diff --git a/src/python/speechd_config/Makefile.am 
b/src/api/python/speechd_config/Makefile.am
similarity index 100%
rename from src/python/speechd_config/Makefile.am
rename to src/api/python/speechd_config/Makefile.am
diff --git a/src/python/speechd_config/__init__.py 
b/src/api/python/speechd_config/__init__.py
similarity index 100%
rename from src/python/speechd_config/__init__.py
rename to src/api/python/speechd_config/__init__.py
diff --git a/src/python/speechd_config/config.py 
b/src/api/python/speechd_config/config.py
similarity index 100%
rename from src/python/speechd_config/config.py
rename to src/api/python/speechd_config/config.py
diff --git a/src/python/speechd_config/paths.py.in 
b/src/api/python/speechd_config/paths.py.in
similarity index 100%
rename from src/python/speechd_config/paths.py.in
rename to src/api/python/speechd_config/paths.py.in
diff --git a/src/python/speechd_config/spd-conf 
b/src/api/python/speechd_config/spd-conf
similarity index 100%
rename from src/python/speechd_config/spd-conf
rename to src/api/python/speechd_config/spd-conf
diff --git a/src/python/speechd_config/speechd.desktop 
b/src/api/python/speechd_config/speechd.desktop
similarity index 100%
rename from src/python/speechd_config/speechd.desktop
rename to src/api/python/speechd_config/speechd.desktop
diff --git a/src/python/speechd_config/test.wav 
b/src/api/python/speechd_config/test.wav
similarity index 100%
rename from src/python/speechd_config/test.wav
rename to src/api/python/speechd_config/test.wav
-- 
1.7.2.2