[PATCH 2/2] move src/audio to src/modules/audio

[William Hubbs]

The audio subsystem is only used in the modules, so the source for it is
being moved into the modules directory to reflect this.
---
 configure.ac                                |    4 ++--
 src/Makefile.am                             |    2 +-
 src/modules/Makefile.am                     |    4 +++-
 src/{ => modules}/audio/Makefile.am         |    0
 src/{ => modules}/audio/alsa.c              |    0
 src/{ => modules}/audio/libao.c             |    0
 src/{ => modules}/audio/nas.c               |    0
 src/{ => modules}/audio/oss.c               |    0
 src/{ => modules}/audio/pulse.c             |    0
 src/{ => modules}/audio/spd_audio.c         |    0
 src/{ => modules}/audio/spd_audio.h         |    0
 src/{ => modules}/audio/spd_audio_plugin.h  |    0
 src/{ => modules}/audio/static_plugins.c.in |    0
 13 files changed, 6 insertions(+), 4 deletions(-)
 rename src/{ => modules}/audio/Makefile.am (100%)
 rename src/{ => modules}/audio/alsa.c (100%)
 rename src/{ => modules}/audio/libao.c (100%)
 rename src/{ => modules}/audio/nas.c (100%)
 rename src/{ => modules}/audio/oss.c (100%)
 rename src/{ => modules}/audio/pulse.c (100%)
 rename src/{ => modules}/audio/spd_audio.c (100%)
 rename src/{ => modules}/audio/spd_audio.h (100%)
 rename src/{ => modules}/audio/spd_audio_plugin.h (100%)
 rename src/{ => modules}/audio/static_plugins.c.in (100%)

diff --git a/configure.ac b/configure.ac
index 61b00c4..2441474 100644
--- a/configure.ac
+++ b/configure.ac
@@ -431,13 +431,13 @@ AC_CONFIG_FILES([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
        src/clients/say/Makefile
        src/clients/spdsend/Makefile
        src/common/Makefile
        src/modules/Makefile
+       src/modules/audio/Makefile
+       src/modules/audio/static_plugins.c
        src/server/Makefile
        src/tests/Makefile])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 81d0690..f2da76d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS=common server audio modules api clients tests
+SUBDIRS=common server modules api clients tests
 
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 1979084..06e33bd 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -4,9 +4,11 @@ inc_local = "-I$(top_srcdir)/include/"
 SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 SNDFILE_LIBS = @SNDFILE_LIBS@
 
+SUBDIRS = audio
+
 EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c 
festival_client.h ivona_client.c dummy.c dummy-message.wav
 
-AM_CFLAGS = @ERROR_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" 
-DDATADIR=\"$(snddatadir)\" $(inc_local) $(DOTCONF_CFLAGS) $(GLIB_CFLAGS) 
$(GTHREAD_CFLAGS) -L$(top_builddir)/src/audio -I$(top_srcdir)/src/audio 
$(ibmtts_include) @SNDFILE_CFLAGS@ -D_GNU_SOURCE
+AM_CFLAGS = @ERROR_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" 
-DDATADIR=\"$(snddatadir)\" $(inc_local) $(DOTCONF_CFLAGS) $(GLIB_CFLAGS) 
$(GTHREAD_CFLAGS) -L$(top_builddir)/src/modules/audio 
-I$(top_srcdir)/src/modules/audio $(ibmtts_include) @SNDFILE_CFLAGS@ 
-D_GNU_SOURCE
 
 modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero
 
diff --git a/src/audio/Makefile.am b/src/modules/audio/Makefile.am
similarity index 100%
rename from src/audio/Makefile.am
rename to src/modules/audio/Makefile.am
diff --git a/src/audio/alsa.c b/src/modules/audio/alsa.c
similarity index 100%
rename from src/audio/alsa.c
rename to src/modules/audio/alsa.c
diff --git a/src/audio/libao.c b/src/modules/audio/libao.c
similarity index 100%
rename from src/audio/libao.c
rename to src/modules/audio/libao.c
diff --git a/src/audio/nas.c b/src/modules/audio/nas.c
similarity index 100%
rename from src/audio/nas.c
rename to src/modules/audio/nas.c
diff --git a/src/audio/oss.c b/src/modules/audio/oss.c
similarity index 100%
rename from src/audio/oss.c
rename to src/modules/audio/oss.c
diff --git a/src/audio/pulse.c b/src/modules/audio/pulse.c
similarity index 100%
rename from src/audio/pulse.c
rename to src/modules/audio/pulse.c
diff --git a/src/audio/spd_audio.c b/src/modules/audio/spd_audio.c
similarity index 100%
rename from src/audio/spd_audio.c
rename to src/modules/audio/spd_audio.c
diff --git a/src/audio/spd_audio.h b/src/modules/audio/spd_audio.h
similarity index 100%
rename from src/audio/spd_audio.h
rename to src/modules/audio/spd_audio.h
diff --git a/src/audio/spd_audio_plugin.h b/src/modules/audio/spd_audio_plugin.h
similarity index 100%
rename from src/audio/spd_audio_plugin.h
rename to src/modules/audio/spd_audio_plugin.h
diff --git a/src/audio/static_plugins.c.in 
b/src/modules/audio/static_plugins.c.in
similarity index 100%
rename from src/audio/static_plugins.c.in
rename to src/modules/audio/static_plugins.c.in
-- 
1.7.2.2