[PATCH 1/1] break up long lines in Makefiles

[William Hubbs]

Most of this just involved adding continuation characters and splitting
lines.  However, in the modules directory, I also factored out common
source files.
---
 src/audio/Makefile.am   |    6 +++-
 src/modules/Makefile.am |   50 +++++++++++++++++++++++++++++++----------------
 src/server/Makefile.am  |   10 +++++++-
 src/tests/Makefile.am   |    3 +-
 4 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
index 5a4032c..aaf55e6 100644
--- a/src/audio/Makefile.am
+++ b/src/audio/Makefile.am
@@ -6,9 +6,11 @@ include_HEADERS = spd_audio_plugin.h
 
 spdlib_LTLIBRARIES = libsdaudio.la
 libsdaudio_la_CPPFLAGS = $(GLIB_CFLAGS)
-libsdaudio_la_LDFLAGS = -version-info 
$(LIB_SDAUDIO_CURRENT):$(LIB_SDAUDIO_REVISION):$(LIB_SDAUDIO_AGE)
+libsdaudio_la_LDFLAGS = -version-info \
+       $(LIB_SDAUDIO_CURRENT):$(LIB_SDAUDIO_REVISION):$(LIB_SDAUDIO_AGE)
 libsdaudio_la_LIBADD = $(GLIB_LIBS) -lpthread $(SPD_AUDIO_LIBS)
-libsdaudio_la_SOURCES = spd_audio.c spd_audio.h spd_audio_plugin.h 
static_plugins.c
+libsdaudio_la_SOURCES = spd_audio.c spd_audio.h spd_audio_plugin.h \
+       static_plugins.c
 
 if nas_support
 libsdaudio_la_SOURCES += nas.c
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 2970f6e..5e3d0b3 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -2,53 +2,69 @@
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/audio
 lib_audio = -L$(top_builddir)/src/audio
+common_SOURCES = module_main.c module_utils.c module_utils.h
 
 AM_CFLAGS = $(ERROR_CFLAGS)
-AM_CPPFLAGS = -DDATADIR=\"$(snddatadir)\" $(DOTCONF_CFLAGS) $(GLIB_CFLAGS) 
$(GTHREAD_CFLAGS) $(ibmtts_include) $(SNDFILE_CFLAGS) -D_GNU_SOURCE
+AM_CPPFLAGS = -DDATADIR=\"$(snddatadir)\" -D_GNU_SOURCE \
+       $(DOTCONF_CFLAGS) $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) \
+       $(ibmtts_include) $(SNDFILE_CFLAGS)
 
 modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero
 
-sd_dummy_SOURCES = dummy.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
+sd_dummy_SOURCES = dummy.c $(common_SOURCES) module_utils_addvoice.c
 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)
+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
 
-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 \
+       $(common_SOURCES)
 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)
+sd_festival_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio \
+       -lpthread $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) 
$(EXTRA_SOCKET_LIBS)
 
-sd_generic_SOURCES = generic.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
+sd_generic_SOURCES = generic.c $(common_SOURCES) module_utils_addvoice.c
 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_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_SOURCES = cicero.c $(common_SOURCES)
 sd_cicero_LDFLAGS = $(RPATH) '$(spdlibdir)' $(lib_audio)
-sd_cicero_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
$(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
+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_SOURCES = flite.c $(common_SOURCES)
 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)
+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_SOURCES = ibmtts.c $(common_SOURCES) module_utils_addvoice.c
 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)
+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_SOURCES = espeak.c $(common_SOURCES)
 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)
+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
-sd_ivona_SOURCES = ivona.c ivona_client.c ivona_client.h module_main.c 
module_utils.c module_utils.h
+sd_ivona_SOURCES = ivona.c ivona_client.c ivona_client.h $(common_SOURCES)
 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)
+sd_ivona_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio \
+       -ldumbtts -lpthread $(SNDFILE_LIBS) $(DOTCONF_LIBS) $(GLIB_LIBS) \
+       $(GTHREAD_LIBS)
 endif
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index ea939c8..6c908a0 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -4,8 +4,14 @@ INCLUDES = -I$(top_srcdir)/include/
 lib_common = $(top_builddir)/src/common/libcommon.la
 
 bin_PROGRAMS = speech-dispatcher
-speech_dispatcher_SOURCES = speechd.c speechd.h server.c server.h history.c 
history.h module.c module.h config.c config.h parse.c parse.h set.c set.h msg.h 
alloc.c alloc.h compare.c compare.h speaking.c speaking.h options.c options.h 
output.c output.h sem_functions.c sem_functions.h index_marking.c 
index_marking.h
+speech_dispatcher_SOURCES = speechd.c speechd.h server.c server.h \
+       history.c history.h module.c module.h config.c config.h \
+       parse.c parse.h set.c set.h msg.h alloc.c alloc.h \
+       compare.c compare.h speaking.c speaking.h options.c options.h \
+       output.c output.h sem_functions.c sem_functions.h \
+       index_marking.c index_marking.h
 speech_dispatcher_CFLAGS = $(ERROR_CFLAGS)
 speech_dispatcher_CPPFLAGS = $(DOTCONF_CFLAGS) $(GLIB_CFLAGS) 
$(GMODULE_CFLAGS) $(GTHREAD_CFLAGS) -DSYS_CONF=\"$(spdconfdir)\" 
-DSND_DATA=\"$(snddatadir)\" -DMODULEBINDIR=\"$(modulebindir)\" 
-DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" -D_GNU_SOURCE
 speech_dispatcher_LDFLAGS = $(RDYNAMIC)
-speech_dispatcher_LDADD = $(lib_common) $(DOTCONF_LIBS) $(GLIB_LIBS) 
$(GMODULE_LIBS) $(GTHREAD_LIBS) -lpthread $(EXTRA_SOCKET_LIBS)
+speech_dispatcher_LDADD = $(lib_common) $(DOTCONF_LIBS) $(GLIB_LIBS) \
+       $(GMODULE_LIBS) $(GTHREAD_LIBS) -lpthread $(EXTRA_SOCKET_LIBS)
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 8402482..42390bd 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -15,7 +15,8 @@ clibrary2_SOURCES = clibrary2.c
 clibrary2_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
 
 connection_recovery_SOURCES = connection-recovery.c
-connection_recovery_LDADD = $(c_api)/libspeechd.la -lpthread 
$(EXTRA_SOCKET_LIBS)
+connection_recovery_LDADD = $(c_api)/libspeechd.la \
+       -lpthread $(EXTRA_SOCKET_LIBS)
 
 run_test_SOURCES = run_test.c
 run_test_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
-- 
1.7.2.2