[PATCH 1/9] moved module_main.c from the dummy.c to Makefile.am

[Andrei Kholodnyi]

---
 src/modules/Makefile.am             |    2 +-
 src/modules/dummy.c                 |    5 -----
 src/modules/module_main.c           |    9 +++++++++
 src/modules/module_utils.c          |    1 +
 src/modules/module_utils.h          |    2 +-
 src/modules/module_utils_addvoice.c |    6 ++++++
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 4d68489..84067dd 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -54,6 +54,6 @@ sd_ivona_SOURCES = ivona.c module_utils.c module_utils.h
 sd_ivona_LDFLAGS = @RPATH@ '$(spdlibdir)'
 sd_ivona_LDADD = -lsdaudio -ldumbtts -lpthread -ldotconf @glib_libs@ 
@SNDFILE_LIBS@ @gthread_libs@
 
-sd_dummy_SOURCES = dummy.c module_utils.c module_utils.h
+sd_dummy_SOURCES = dummy.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
 sd_dummy_LDFLAGS = @RPATH@ '$(spdlibdir)'
 sd_dummy_LDADD = -lsdaudio -lpthread -ldotconf @glib_libs@ @SNDFILE_LIBS@ 
@gthread_libs@
diff --git a/src/modules/dummy.c b/src/modules/dummy.c
index 5cde939..ea75d42 100644
--- a/src/modules/dummy.c
+++ b/src/modules/dummy.c
@@ -30,7 +30,6 @@
 #include "fdset.h"
 
 #include "module_utils.h"
-#include "module_utils_addvoice.c"
 
 #define MODULE_NAME     "dummy"
 #define MODULE_VERSION  "0.1"
@@ -287,7 +286,3 @@ _dummy_child()
   DBG("Done, exiting from child.");
   exit(0);
 }
-
-
-
-#include "module_main.c"
diff --git a/src/modules/module_main.c b/src/modules/module_main.c
index 522e664..974130d 100644
--- a/src/modules/module_main.c
+++ b/src/modules/module_main.c
@@ -21,6 +21,15 @@
  * $Id: module_main.c,v 1.17 2008-10-15 17:05:37 hanke Exp $
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <pthread.h>
+#include <glib.h>
+#include <dotconf.h>
+
+#include "module_utils.h"
+
 #if !(defined(__GLIBC__) && defined(_GNU_SOURCE))
 /* Added by Willie Walker - getline is a gcc-ism */
 ssize_t getline (char **lineptr, size_t *n, FILE *f);
diff --git a/src/modules/module_utils.c b/src/modules/module_utils.c
index 99167e6..10dfc26 100644
--- a/src/modules/module_utils.c
+++ b/src/modules/module_utils.c
@@ -26,6 +26,7 @@
 
 #include "module_utils.h"
 
+static char* module_audio_pars[10];
 
 extern char* module_index_mark;
 
diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h
index e2b20e4..99a23d5 100644
--- a/src/modules/module_utils.h
+++ b/src/modules/module_utils.h
@@ -44,12 +44,12 @@
 #include <sys/ipc.h>
 #include <sys/sem.h>
 
+#include "fdset.h"
 #include "spd_audio.h"
 
 int log_level;
 
 AudioID *module_audio_id;
-char* module_audio_pars[10];
 
 SPDMsgSettings msg_settings;
 SPDMsgSettings msg_settings_old;
diff --git a/src/modules/module_utils_addvoice.c 
b/src/modules/module_utils_addvoice.c
index 681ce0c..cc97230 100644
--- a/src/modules/module_utils_addvoice.c
+++ b/src/modules/module_utils_addvoice.c
@@ -21,7 +21,13 @@
  * $Id: module_utils_addvoice.c,v 1.5 2007-07-29 23:43:33 hanke Exp $
  */
 
+#include <stdio.h>
+#include <string.h>
+
 #include <glib.h>
+#include <dotconf.h>
+
+#include "module_utils.h"
 
 GHashTable *module_voice_table = NULL;
 
-- 
1.6.0.4