[PATCH 1/2] make spd_audio_plugin.h a public header

[William Hubbs]

This header is being made a public header so that out of tree audio
plugins can be written.
---
 include/Makefile.am                               |    2 +-
 {src/modules/audio => include}/spd_audio_plugin.h |    0
 src/modules/audio/Makefile.am                     |   14 ++++++--------
 src/modules/audio/alsa.c                          |    2 +-
 src/modules/audio/libao.c                         |    2 +-
 src/modules/audio/nas.c                           |    2 +-
 src/modules/audio/oss.c                           |    2 +-
 src/modules/audio/pulse.c                         |    2 +-
 src/modules/audio/spd_audio.h                     |    2 +-
 9 files changed, 13 insertions(+), 15 deletions(-)
 rename {src/modules/audio => include}/spd_audio_plugin.h (100%)

diff --git a/include/Makefile.am b/include/Makefile.am
index e1317a4..8ef6cab 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,4 +2,4 @@
 
 noinst_HEADERS = fdsetconv.h spd_utils.h i18n.h
 
-spdinclude_HEADERS = speechd_types.h
+spdinclude_HEADERS = spd_audio_plugin.h speechd_types.h
diff --git a/src/modules/audio/spd_audio_plugin.h b/include/spd_audio_plugin.h
similarity index 100%
rename from src/modules/audio/spd_audio_plugin.h
rename to include/spd_audio_plugin.h
diff --git a/src/modules/audio/Makefile.am b/src/modules/audio/Makefile.am
index 093f462..4635ea4 100644
--- a/src/modules/audio/Makefile.am
+++ b/src/modules/audio/Makefile.am
@@ -2,10 +2,8 @@
 
 inc_local = -I$(top_srcdir)/include/
 
-spdinclude_HEADERS = spd_audio_plugin.h
-
 spdlib_LTLIBRARIES = libsdaudio.la
-libsdaudio_la_SOURCES = spd_audio.c spd_audio.h spd_audio_plugin.h
+libsdaudio_la_SOURCES = spd_audio.c spd_audio.h
 libsdaudio_la_CPPFLAGS = $(GLIB_CFLAGS) $(inc_local) \
        -DPLUGIN_DIR="\"$(audiodir)\""
 libsdaudio_la_LDFLAGS = -version-info \
@@ -16,7 +14,7 @@ audio_LTLIBRARIES =
 
 if alsa_support
 audio_LTLIBRARIES +=  spd_alsa.la
-spd_alsa_la_SOURCES = alsa.c spd_audio_plugin.h
+spd_alsa_la_SOURCES = alsa.c
 spd_alsa_la_CPPFLAGS = $(GLIB_CFLAGS) $(inc_local)  $(ALSA_CFLAGS)
 spd_alsa_la_LIBADD = $(ALSA_LIBS) $(GLIB_LIBS)
 spd_alsa_la_LDFLAGS = -module -avoid-version
@@ -24,7 +22,7 @@ endif
 
 if libao_support
 audio_LTLIBRARIES +=  spd_libao.la
-spd_libao_la_SOURCES = libao.c spd_audio_plugin.h
+spd_libao_la_SOURCES = libao.c
 spd_libao_la_CPPFLAGS = $(GLIB_CFLAGS) $(inc_local)  $(LIBAO_CFLAGS)
 spd_libao_la_LIBADD = $(LIBAO_LIBS) $(GLIB_LIBS)
 spd_libao_la_LDFLAGS = -module -avoid-version
@@ -32,7 +30,7 @@ endif
 
 if nas_support
 audio_LTLIBRARIES +=  spd_nas.la
-spd_nas_la_SOURCES = nas.c spd_audio_plugin.h
+spd_nas_la_SOURCES = nas.c
 spd_nas_la_CPPFLAGS = $(GLIB_CFLAGS) $(inc_local)
 spd_nas_la_LIBADD = $(NAS_LIBS) $(GLIB_LIBS)
 spd_nas_la_LDFLAGS = -module -avoid-version
@@ -40,7 +38,7 @@ endif
 
 if oss_support
 audio_LTLIBRARIES +=  spd_oss.la
-spd_oss_la_SOURCES = oss.c spd_audio_plugin.h
+spd_oss_la_SOURCES = oss.c
 spd_oss_la_CPPFLAGS = $(GLIB_CFLAGS) $(inc_local)
 spd_oss_la_LIBADD = $(GLIB_LIBS)
 spd_oss_la_LDFLAGS = -module -avoid-version
@@ -48,7 +46,7 @@ endif
 
 if pulse_support
 audio_LTLIBRARIES +=  spd_pulse.la
-spd_pulse_la_SOURCES = pulse.c spd_audio_plugin.h
+spd_pulse_la_SOURCES = pulse.c
 spd_pulse_la_CPPFLAGS = $(GLIB_CFLAGS) $(inc_local)  $(PULSE_CFLAGS)
 spd_pulse_la_LIBADD = $(PULSE_LIBS) $(GLIB_LIBS)
 spd_pulse_la_LDFLAGS = -module -avoid-version
diff --git a/src/modules/audio/alsa.c b/src/modules/audio/alsa.c
index e609018..bfe8edd 100644
--- a/src/modules/audio/alsa.c
+++ b/src/modules/audio/alsa.c
@@ -38,7 +38,7 @@
 #include <alsa/asoundlib.h>
 
 #define SPD_AUDIO_PLUGIN_ENTRY spd_alsa_LTX_spd_audio_plugin_get
-#include "spd_audio_plugin.h"
+#include <spd_audio_plugin.h>
 
 typedef struct {
     AudioID id;
diff --git a/src/modules/audio/libao.c b/src/modules/audio/libao.c
index 211eaf2..68a3890 100644
--- a/src/modules/audio/libao.c
+++ b/src/modules/audio/libao.c
@@ -32,7 +32,7 @@
 #include <ao/ao.h>
 
 #define SPD_AUDIO_PLUGIN_ENTRY spd_libao_LTX_spd_audio_plugin_get
-#include "spd_audio_plugin.h"
+#include <spd_audio_plugin.h>
 
 /* send a packet of XXX bytes to the sound device */
 #define AO_SEND_BYTES 256
diff --git a/src/modules/audio/nas.c b/src/modules/audio/nas.c
index 98dd7b9..6dfb7f3 100644
--- a/src/modules/audio/nas.c
+++ b/src/modules/audio/nas.c
@@ -34,7 +34,7 @@
 #include <pthread.h>
 
 #define SPD_AUDIO_PLUGIN_ENTRY spd_nas_LTX_spd_audio_plugin_get
-#include "spd_audio_plugin.h"
+#include <spd_audio_plugin.h>
 
 typedef struct {
     AudioID id;
diff --git a/src/modules/audio/oss.c b/src/modules/audio/oss.c
index bd94a1d..292b026 100644
--- a/src/modules/audio/oss.c
+++ b/src/modules/audio/oss.c
@@ -42,7 +42,7 @@
 #include <sys/soundcard.h>
 
 #define SPD_AUDIO_PLUGIN_ENTRY spd_oss_LTX_spd_audio_plugin_get
-#include "spd_audio_plugin.h"
+#include <spd_audio_plugin.h>
 
 typedef struct {
     AudioID id;
diff --git a/src/modules/audio/pulse.c b/src/modules/audio/pulse.c
index 2e20284..e879fb6 100644
--- a/src/modules/audio/pulse.c
+++ b/src/modules/audio/pulse.c
@@ -44,7 +44,7 @@
 #include <pulse/error.h>
 
 #define SPD_AUDIO_PLUGIN_ENTRY spd_pulse_LTX_spd_audio_plugin_get
-#include "spd_audio_plugin.h"
+#include <spd_audio_plugin.h>
 
 /* Switch this on to debug, see output log location in MSG() */
 //#define DEBUG_PULSE
diff --git a/src/modules/audio/spd_audio.h b/src/modules/audio/spd_audio.h
index 7aa5b77..6337328 100644
--- a/src/modules/audio/spd_audio.h
+++ b/src/modules/audio/spd_audio.h
@@ -25,7 +25,7 @@
 #ifndef __SPD_AUDIO_H
 #define __SPD_AUDIO_H
 
-#include "spd_audio_plugin.h"
+#include <spd_audio_plugin.h>
 
 #define SPD_AUDIO_LIB_PREFIX "spd_"
 
-- 
1.7.2.2