[PATCH 2/6] move src/c/api to src/api/c

[william hubbs]

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

---
 configure.ac                      |    4 ++--
 src/Makefile.am                   |    4 ++--
 src/{c => api}/Makefile.am        |    3 +--
 src/{c/api => api/c}/Makefile.am  |    0
 src/{c/api => api/c}/libspeechd.c |    0
 src/{c/api => api/c}/libspeechd.h |    0
 src/clients/say/Makefile.am       |    4 ++--
 src/tests/Makefile.am             |    4 ++--
 8 files changed, 9 insertions(+), 10 deletions(-)
 rename src/{c => api}/Makefile.am (81%)
 rename src/{c/api => api/c}/Makefile.am (100%)
 rename src/{c/api => api/c}/libspeechd.c (100%)
 rename src/{c/api => api/c}/libspeechd.h (100%)

diff --git a/configure.ac b/configure.ac
index dab09c5..7902cf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -422,10 +422,10 @@ AC_CONFIG_FILES([Makefile
        include/Makefile
        po/Makefile.in
        src/Makefile
+       src/api/Makefile
+       src/api/c/Makefile
        src/audio/Makefile
        src/audio/static_plugins.c
-       src/c/Makefile
-       src/c/api/Makefile
        src/clients/Makefile
        src/clients/say/Makefile
        src/clients/spdsend/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index bd04add..ea7168d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,11 +10,11 @@ EXTRA_DIST = cl/ChangeLog cl/README cl/configuration.lisp 
cl/elisp.lisp \
              guile/ChangeLog guile/Makefile guile/README guile/gssip.scm.in \
              guile/gssip.c guile/gssip.h
 
-SUBDIRS=common server audio c modules clients tests
+SUBDIRS=common server audio modules api clients tests
 
 if HAVE_PYTHON
 SUBDIRS += python
 endif
 
-DIST_SUBDIRS=common server audio c modules clients tests python
+DIST_SUBDIRS=common server audio modules api clients tests python
 
diff --git a/src/c/Makefile.am b/src/api/Makefile.am
similarity index 81%
rename from src/c/Makefile.am
rename to src/api/Makefile.am
index 7372a27..9bee85e 100644
--- a/src/c/Makefile.am
+++ b/src/api/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS= api
-
+SUBDIRS= c
 
diff --git a/src/c/api/Makefile.am b/src/api/c/Makefile.am
similarity index 100%
rename from src/c/api/Makefile.am
rename to src/api/c/Makefile.am
diff --git a/src/c/api/libspeechd.c b/src/api/c/libspeechd.c
similarity index 100%
rename from src/c/api/libspeechd.c
rename to src/api/c/libspeechd.c
diff --git a/src/c/api/libspeechd.h b/src/api/c/libspeechd.h
similarity index 100%
rename from src/c/api/libspeechd.h
rename to src/api/c/libspeechd.h
diff --git a/src/clients/say/Makefile.am b/src/clients/say/Makefile.am
index efb4bca..1308b1e 100644
--- a/src/clients/say/Makefile.am
+++ b/src/clients/say/Makefile.am
@@ -1,9 +1,9 @@
 
 localedir = $(datadir)/locale
 inc_local = "-I$(top_srcdir)/include/"
-c_api = $(top_builddir)/src/c/api
+c_api = $(top_builddir)/src/api/c
 
-AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" $(inc_local) @glib_include@ 
-I$(top_srcdir)/src/c/api
+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" $(inc_local) @glib_include@ 
-I$(top_srcdir)/src/api/c
 
 bin_PROGRAMS = spd-say
 spd_say_SOURCES = say.c options.c options.h
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 314f423..c6d0845 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,9 +1,9 @@
 
 localedir = $(datadir)/locale
 inc_local = "-I$(top_srcdir)/include/"
-c_api = $(top_builddir)/src/c/api
+c_api = $(top_builddir)/src/api/c
 
-AM_CFLAGS = -I$(top_srcdir)/src/c/api -DLOCALEDIR=\"$(localedir)\" 
$(inc_local) @glib_include@ -I../audio/
+AM_CFLAGS = -I$(top_srcdir)/src/api/c -DLOCALEDIR=\"$(localedir)\" 
$(inc_local) @glib_include@ -I../audio/
 
 bin_PROGRAMS = long_message clibrary clibrary2 run_test connection_recovery
 
-- 
1.7.2.2