[PATCH 1/1] fix make distcheck

[Andrei Kholodnyi]

speech-dispatcher-cs.texi has been moved to EXTRA_DIST
since there are still problems building it with ISO-8859-2
encoding
---
 Makefile.am                   |    3 ++-
 config/clients/Makefile.am    |    4 ++--
 config/modules/Makefile.am    |   12 ++++++++++--
 configure.in                  |    4 ++--
 doc/Makefile.am               |    5 ++---
 src/Makefile.am               |    7 +++++--
 src/c/clients/say/Makefile.am |    6 +++---
 src/modules/Makefile.am       |    2 +-
 src/server/config.c           |    2 +-
 src/tests/Makefile.am         |   18 ++++++++++--------
 10 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5353ce9..9956505 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@
 
 SUBDIRS= src config doc
 
-EXTRA_DIST= ChangeLog NEWS TODO AUTHORS COPYING INSTALL README intl/*.c 
intl/*.h build.sh version.sh
+EXTRA_DIST= ChangeLog NEWS TODO AUTHORS COPYING INSTALL README build.sh 
version.sh \
+            intl/fdsetconv.c intl/def.h intl/fdset.h intl/fdsetconv.h
 
 MAINTAINERCLEANFILES=configure
diff --git a/config/clients/Makefile.am b/config/clients/Makefile.am
index 50a7d99..dd07f8b 100644
--- a/config/clients/Makefile.am
+++ b/config/clients/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-dist_clientconf_DATA = *.conf
-dist_clientconforig_DATA = *.conf
+dist_clientconf_DATA = emacs.conf gnome-speech.conf
+dist_clientconforig_DATA = emacs.conf gnome-speech.conf
 
diff --git a/config/modules/Makefile.am b/config/modules/Makefile.am
index f05851b..50e853a 100644
--- a/config/modules/Makefile.am
+++ b/config/modules/Makefile.am
@@ -1,5 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
-dist_moduleconf_DATA = *.conf
-dist_moduleconforig_DATA = *.conf
+dist_moduleconf_DATA = cicero.conf espeak.conf festival.conf flite.conf \
+                       ibmtts.conf ivona.conf dtk-generic.conf \
+                       epos-generic.conf espeak-generic.conf \
+                       espeak-mbrola-generic.conf llia_phon-generic.conf \
+                       swift-generic.conf
 
+dist_moduleconforig_DATA = cicero.conf espeak.conf festival.conf flite.conf \
+                           ibmtts.conf ivona.conf dtk-generic.conf \
+                           epos-generic.conf espeak-generic.conf \
+                           espeak-mbrola-generic.conf llia_phon-generic.conf \
+                           swift-generic.conf
diff --git a/configure.in b/configure.in
index 1bd7cd9..5c654d3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(configure.in)
+AC_INIT([speech-dispatcher], [0.7], [speechd at lists.freebsoft.org])
 
 AC_LANG(C)
 
@@ -8,7 +8,7 @@ dnl progs
 AC_PROG_CC
 
 dnl info
-AM_INIT_AUTOMAKE("speech-dispatcher", "`cat version.sh|grep '^VERSION'|awk -F= 
'{print $2}'`")
+AM_INIT_AUTOMAKE([foreign])
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 23e344e..45cd753 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,3 @@
 
-info_TEXINFOS = ssip.texi speech-dispatcher.texi speech-dispatcher-cs.texi 
spd-say.texi
-EXTRA_DIST = figures/*.txt figures/*.png figures/*.pdf figures/*.dia 
figures/*.eps gpl.texi fdl.texi
-
+info_TEXINFOS = ssip.texi speech-dispatcher.texi spd-say.texi
+EXTRA_DIST = figures gpl.texi fdl.texi speech-dispatcher-cs.texi
diff --git a/src/Makefile.am b/src/Makefile.am
index 761067d..fa6a695 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,11 @@
 # (either directly listing all files or indirectly
 # in SUBDIRS if they contain another Makefile)
 # otherwise they won't be included in distribution packages
-EXTRA_DIST = cl/ChangeLog cl/README cl/*.lisp cl/*.asd \
-guile/ChangeLog guile/Makefile guile/README guile/*.in guile/*.c guile/*.h
+
+EXTRA_DIST = cl/ChangeLog cl/README cl/configuration.lisp cl/elisp.lisp \
+             cl/package.lisp cl/ssip.lisp cl/sysdep.lisp cl/ssip.asd \
+             guile/ChangeLog guile/Makefile guile/README guile/gssip.scm.in \
+             guile/gssip.c guile/gssip.h
 
 SUBDIRS=server audio c modules tests
 
diff --git a/src/c/clients/say/Makefile.am b/src/c/clients/say/Makefile.am
index 69ef570..345decf 100644
--- a/src/c/clients/say/Makefile.am
+++ b/src/c/clients/say/Makefile.am
@@ -1,10 +1,10 @@
 
 localedir = $(datadir)/locale
 inc_local = "-I$(top_srcdir)/intl/"
-c_api = $(top_srcdir)/src/c/api
+c_api = $(top_builddir)/src/c/api
 
-AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I/usr/include/ $(inc_local) 
@glib_include@ -I$(c_api)
+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" $(inc_local) @glib_include@ 
-I$(top_srcdir)/src/c/api
 
 bin_PROGRAMS = spd-say
-spd_say_SOURCES = say.c options.c options.h $(c_api)/libspeechd.h
+spd_say_SOURCES = say.c options.c options.h
 spd_say_LDADD = $(c_api)/libspeechd.la -lpthread @EXTRA_SOCKET_LIBS@
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 4d68489..1794315 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -6,7 +6,7 @@ SNDFILE_LIBS = @SNDFILE_LIBS@
 
 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)\" -I/usr/include/ $(inc_local) @glib_include@ 
-L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ 
$(ibmtts_include) @SNDFILE_CFLAGS@ -D_GNU_SOURCE
+AM_CFLAGS = @ERROR_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" 
-DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ 
-L$(top_builddir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ 
$(ibmtts_include) @SNDFILE_CFLAGS@ -D_GNU_SOURCE
 
 modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero
 
diff --git a/src/server/config.c b/src/server/config.c
index 0d87173..95bd75d 100644
--- a/src/server/config.c
+++ b/src/server/config.c
@@ -26,7 +26,7 @@
 
 #include "speechd.h"
 #include "config.h"
-#include "intl/fdsetconv.h"
+#include "fdsetconv.h"
 
 static TFDSetClientSpecific *cl_spec_section;
 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index cf5f322..7fdf847 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,25 +1,27 @@
 
 localedir = $(datadir)/locale
 inc_local = "-I$(top_srcdir)/intl/"
-c_api = $(top_srcdir)/src/c/api
+c_api = $(top_builddir)/src/c/api
 
-AM_CFLAGS = -I$(c_api) -DLOCALEDIR=\"$(localedir)\" -I/usr/include/ 
$(inc_local) @glib_include@ -I../audio/
+AM_CFLAGS = -I$(top_srcdir)/src/c/api -DLOCALEDIR=\"$(localedir)\" 
$(inc_local) @glib_include@ -I../audio/
 
 bin_PROGRAMS = long_message clibrary clibrary2 run_test connection_recovery
 
-long_message_SOURCES = long_message.c $(c_api)/libspeechd.h
+long_message_SOURCES = long_message.c
 long_message_LDADD = $(c_api)/libspeechd.la -lpthread @EXTRA_SOCKET_LIBS@
 
-clibrary_SOURCES = clibrary.c $(c_api)/libspeechd.h
+clibrary_SOURCES = clibrary.c
 clibrary_LDADD = $(c_api)/libspeechd.la -lpthread @EXTRA_SOCKET_LIBS@
 
-clibrary2_SOURCES = clibrary2.c $(c_api)/libspeechd.h
+clibrary2_SOURCES = clibrary2.c
 clibrary2_LDADD = $(c_api)/libspeechd.la -lpthread @EXTRA_SOCKET_LIBS@
 
-connection_recovery_SOURCES = connection-recovery.c $(c_api)/libspeechd.h
+connection_recovery_SOURCES = connection-recovery.c
 connection_recovery_LDADD = $(c_api)/libspeechd.la -lpthread 
@EXTRA_SOCKET_LIBS@
 
-run_test_SOURCES = run_test.c $(c_api)/libspeechd.h
+run_test_SOURCES = run_test.c
 run_test_LDADD = $(c_api)/libspeechd.la -lpthread @EXTRA_SOCKET_LIBS@
 
-EXTRA_DIST= *.test *.wav
+EXTRA_DIST= basic.test general.test keys.test priority_progress.test \
+            pronunciation.test punctuation.test sound_icons.test spelling.test 
\
+            ssml.test stop_and_pause.test voices.test yo.wav
-- 
1.6.0.4