[PATCH 9/9] moved fdsetconv.c from module_utils.c to Makefile.am

[Andrei Kholodnyi]

---
 intl/fdsetconv.c           |    1 +
 src/modules/Makefile.am    |   16 ++++++++--------
 src/modules/module_utils.c |    2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/intl/fdsetconv.c b/intl/fdsetconv.c
index e98d32c..344ee74 100644
--- a/intl/fdsetconv.c
+++ b/intl/fdsetconv.c
@@ -22,6 +22,7 @@
  * $Id: fdsetconv.c,v 1.5 2007-06-21 20:09:45 hanke Exp $
  */
 
+#include <string.h>
 #include "fdsetconv.h"
 
 char*
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index aa39c52..24dc9f0 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -28,32 +28,32 @@ if ivona_support
 modulebin_PROGRAMS += sd_ivona
 endif
 
-sd_flite_SOURCES = flite.c module_main.c module_utils.c module_utils.h
+sd_flite_SOURCES = flite.c module_main.c module_utils.c module_utils.h 
$(top_srcdir)/intl/fdsetconv.c
 sd_flite_LDFLAGS = @RPATH@ '$(spdlibdir)'
 sd_flite_LDADD = -lsdaudio $(flite_kal) $(flite_basic) -lpthread -ldotconf 
@glib_libs@ @gthread_libs@
 
-sd_generic_SOURCES = generic.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
+sd_generic_SOURCES = generic.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h $(top_srcdir)/intl/fdsetconv.c
 sd_generic_LDADD = -lsdaudio -lpthread -ldotconf @glib_libs@ @gthread_libs@
 
-sd_festival_SOURCES = festival.c festival_client.c festival_client.h 
module_main.c module_utils.c module_utils.h
+sd_festival_SOURCES = festival.c festival_client.c festival_client.h 
module_main.c module_utils.c module_utils.h $(top_srcdir)/intl/fdsetconv.c
 sd_festival_LDFLAGS = @RPATH@ '$(spdlibdir)'
 sd_festival_LDADD = -lsdaudio -lpthread -ldotconf @glib_libs@ @gthread_libs@ 
@EXTRA_SOCKET_LIBS@
 
-sd_ibmtts_SOURCES = ibmtts.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
+sd_ibmtts_SOURCES = ibmtts.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h $(top_srcdir)/intl/fdsetconv.c
 sd_ibmtts_LDFLAGS = @RPATH@ '$(spdlibdir)'
 sd_ibmtts_LDADD = -lsdaudio -lm -lpthread -ldotconf -libmeci @SNDFILE_LIBS@ 
@glib_libs@ @gthread_libs@
 
-sd_cicero_SOURCES = cicero.c module_main.c module_utils.c module_utils.h
+sd_cicero_SOURCES = cicero.c module_main.c module_utils.c module_utils.h 
$(top_srcdir)/intl/fdsetconv.c
 sd_cicero_LDADD = -lsdaudio -lpthread -ldotconf @glib_libs@ @gthread_libs@
 
-sd_espeak_SOURCES = espeak.c module_main.c module_utils.c module_utils.h
+sd_espeak_SOURCES = espeak.c module_main.c module_utils.c module_utils.h 
$(top_srcdir)/intl/fdsetconv.c
 sd_espeak_LDFLAGS = @RPATH@ '$(spdlibdir)'
 sd_espeak_LDADD = -lsdaudio -lespeak -ldotconf @glib_libs@ @SNDFILE_LIBS@ 
@gthread_libs@ @EXTRA_ESPEAK_LIBS@
 
-sd_ivona_SOURCES = ivona.c ivona_client.c module_main.c module_utils.c 
module_utils.h
+sd_ivona_SOURCES = ivona.c ivona_client.c module_main.c module_utils.c 
module_utils.h $(top_srcdir)/intl/fdsetconv.c
 sd_ivona_LDFLAGS = @RPATH@ '$(spdlibdir)'
 sd_ivona_LDADD = -lsdaudio -ldumbtts -lpthread -ldotconf @glib_libs@ 
@SNDFILE_LIBS@ @gthread_libs@
 
-sd_dummy_SOURCES = dummy.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
+sd_dummy_SOURCES = dummy.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h $(top_srcdir)/intl/fdsetconv.c
 sd_dummy_LDFLAGS = @RPATH@ '$(spdlibdir)'
 sd_dummy_LDADD = -lsdaudio -lpthread -ldotconf @glib_libs@ @SNDFILE_LIBS@ 
@gthread_libs@
diff --git a/src/modules/module_utils.c b/src/modules/module_utils.c
index 10dfc26..25b3ce5 100644
--- a/src/modules/module_utils.c
+++ b/src/modules/module_utils.c
@@ -21,8 +21,8 @@
  * $Id: module_utils.c,v 1.55 2008-07-10 15:37:18 hanke Exp $
  */
 
+#include <stdio.h>
 #include "fdsetconv.h"
-#include "fdsetconv.c"
 
 #include "module_utils.h"
 
-- 
1.6.0.4