[PATCH 6/8] clean up the Makefile for the modules directory

[William Hubbs]

- replace all autoconf substitutions with make variables
- remove references to localedir since this is defined in configure.ac
  and not used yet in the modules
  - put sources, flags, etc, together for each module
  - make sure all modules can link with libsdaudio
---
 src/modules/Makefile.am |   70 ++++++++++++++++++++++-------------------------
 1 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 1979084..2d91317 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -1,59 +1,55 @@
-localedir = $(datadir)/locale
+## Process this file with automake to produce Makefile.in
+
 inc_local = "-I$(top_srcdir)/include/"
+inc_audio = -I$(top_srcdir)/src/audio
+lib_audio = -L$(top_builddir)/src/audio
 
-SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
-SNDFILE_LIBS = @SNDFILE_LIBS@
+AM_CFLAGS = $(ERROR_CFLAGS)
+AM_CPPFLAGS = -DDATADIR=\"$(snddatadir)\" $(inc_local) $(DOTCONF_CFLAGS) 
$(GLIB_CFLAGS) $(GTHREAD_CFLAGS) $(inc_audio)$(ibmtts_include) 
$(SNDFILE_CFLAGS) -D_GNU_SOURCE
 
-EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c 
festival_client.h ivona_client.c dummy.c dummy-message.wav
+modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero
 
-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
+sd_dummy_SOURCES = dummy.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
+sd_dummy_LDFLAGS = $(RPATH) '$(spdlibdir)' $(lib_audio)
+sd_dummy_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
$(SNDFILE_LIBS) $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
+dist_snddata_DATA = dummy-message.wav
 
-modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero
+sd_festival_SOURCES = festival.c festival_client.c festival_client.h 
module_main.c module_utils.c module_utils.h
+sd_festival_LDFLAGS = $(RPATH) '$(spdlibdir)' $(lib_audio)
+sd_festival_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio 
-lpthread $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(EXTRA_SOCKET_LIBS)
 
-snddata_DATA = dummy-message.wav
+sd_generic_SOURCES = generic.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
+sd_generic_LDFLAGS = $(RPATH) '$(spdlibdir)' $(lib_audio)
+sd_generic_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
$(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
+
+sd_cicero_SOURCES = cicero.c module_main.c module_utils.c module_utils.h
+sd_cicero_LDFLAGS = $(RPATH) '$(spdlibdir)' $(lib_audio)
+sd_cicero_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
$(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
 
 if flite_support
 modulebin_PROGRAMS += sd_flite
+sd_flite_SOURCES = flite.c module_main.c module_utils.c module_utils.h
+sd_flite_LDFLAGS = $(RPATH) '$(spdlibdir)' $(lib_audio)
+sd_flite_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio 
$(flite_kal) $(flite_basic) -lpthread $(DOTCONF_LIBS) $(GLIB_LIBS) 
$(GTHREAD_LIBS)
 endif
 
 if ibmtts_support
 modulebin_PROGRAMS += sd_ibmtts
+sd_ibmtts_SOURCES = ibmtts.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
+sd_ibmtts_LDFLAGS = $(RPATH) '$(spdlibdir)' $(lib_audio)
+sd_ibmtts_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lm 
-lpthread -libmeci $(SNDFILE_LIBS) $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
 endif
 
 if espeak_support
 modulebin_PROGRAMS += sd_espeak
+sd_espeak_SOURCES = espeak.c module_main.c module_utils.c module_utils.h
+sd_espeak_LDFLAGS = $(RPATH) '$(spdlibdir)' $(lib_audio)
+sd_espeak_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lespeak 
$(SNDFILE_LIBS) $(EXTRA_ESPEAK_LIBS) $(DOTCONF_LIBS) $(GLIB_LIBS) 
$(GTHREAD_LIBS)
 endif
 
 if ivona_support
 modulebin_PROGRAMS += sd_ivona
-endif
-
-sd_flite_SOURCES = flite.c module_main.c module_utils.c module_utils.h
-sd_flite_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_flite_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio 
$(flite_kal) $(flite_basic) -lpthread $(DOTCONF_LIBS) $(GLIB_LIBS) 
$(GTHREAD_LIBS)
-
-sd_generic_SOURCES = generic.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
-sd_generic_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
$(DOTCONF_LIBS) $(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_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_festival_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio 
-lpthread $(DOTCONF_LIBS) $(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_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_ibmtts_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lm 
-lpthread -libmeci @SNDFILE_LIBS@ $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
-
-sd_cicero_SOURCES = cicero.c module_main.c module_utils.c module_utils.h
-sd_cicero_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
$(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
-
-sd_espeak_SOURCES = espeak.c module_main.c module_utils.c module_utils.h
-sd_espeak_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_espeak_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lespeak 
@SNDFILE_LIBS@ @EXTRA_ESPEAK_LIBS@ $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
-
 sd_ivona_SOURCES = ivona.c ivona_client.c ivona_client.h module_main.c 
module_utils.c module_utils.h
-sd_ivona_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_ivona_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -ldumbtts 
-lpthread @SNDFILE_LIBS@ $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
-
-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 = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
@SNDFILE_LIBS@ $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
+sd_ivona_LDFLAGS = $(RPATH) '$(spdlibdir)' $(lib_audio)
+sd_ivona_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -ldumbtts 
-lpthread $(SNDFILE_LIBS) $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
+endif
-- 
1.7.2.2