[PATCH] remove references to libm and libpthread

[William Hubbs]

These libraries do not need to be mentioned in the Makefiles since
they are added to the libs variable by checking for them with
AC_SEARCH_LIBS in configure.ac.
---
 src/api/c/Makefile.am           |    2 +-
 src/clients/say/Makefile.am     |    2 +-
 src/clients/spdsend/Makefile.am |    2 +-
 src/modules/Makefile.am         |   14 +++++++-------
 src/server/Makefile.am          |    2 +-
 src/tests/Makefile.am           |   15 +++++++--------
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/api/c/Makefile.am b/src/api/c/Makefile.am
index bc4d4e8..b91fbdf 100644
--- a/src/api/c/Makefile.am
+++ b/src/api/c/Makefile.am
@@ -8,4 +8,4 @@ libspeechd_la_SOURCES = libspeechd.c
 libspeechd_la_CFLAGS = $(ERROR_CFLAGS)
 libspeechd_la_CPPFLAGS = $(inc_local) -D_GNU_SOURCE $(GLIB_CFLAGS) 
-DSPD_SPAWN_CMD=\""$(prefix)/bin/speech-dispatcher"\"
 libspeechd_la_LDFLAGS = -version-info 
$(LIB_SPD_CURRENT):$(LIB_SPD_REVISION):$(LIB_SPD_AGE)
-libspeechd_la_LIBADD = $(GLIB_LIBS) -lpthread
+libspeechd_la_LIBADD = $(GLIB_LIBS)
diff --git a/src/clients/say/Makefile.am b/src/clients/say/Makefile.am
index 3fbd8da..e41af0b 100644
--- a/src/clients/say/Makefile.am
+++ b/src/clients/say/Makefile.am
@@ -6,4 +6,4 @@ c_api = $(top_builddir)/src/api/c
 bin_PROGRAMS = spd-say
 spd_say_CPPFLAGS = $(inc_local) $(GLIB_CFLAGS)
 spd_say_SOURCES = say.c options.c options.h
-spd_say_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS) 
$(top_builddir)/src/common/libcommon.la
+spd_say_LDADD = $(c_api)/libspeechd.la $(EXTRA_SOCKET_LIBS) 
$(top_builddir)/src/common/libcommon.la
diff --git a/src/clients/spdsend/Makefile.am b/src/clients/spdsend/Makefile.am
index 4c1732b..cb830c9 100644
--- a/src/clients/spdsend/Makefile.am
+++ b/src/clients/spdsend/Makefile.am
@@ -2,5 +2,5 @@
 
 bin_PROGRAMS = spdsend
 spdsend_SOURCES = spdsend.h spdsend.c server.c client.c common.c 
-spdsend_LDADD = -lpthread $(EXTRA_SOCKET_LIBS)
+spdsend_LDADD = $(EXTRA_SOCKET_LIBS)
 
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index d18b63f..f746958 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -17,7 +17,7 @@ modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero
 sd_dummy_SOURCES = dummy.c $(audio_SOURCES) $(common_SOURCES) \
        module_utils_addvoice.c
 sd_dummy_LDADD = $(top_builddir)/src/common/libcommon.la \
-       $(audio_dlopen_modules) -lpthread \
+       $(audio_dlopen_modules) \
        $(SNDFILE_LIBS) $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
 dist_snddata_DATA = dummy-message.wav
 
@@ -25,25 +25,25 @@ sd_festival_SOURCES = festival.c festival_client.c 
festival_client.h \
        $(audio_SOURCES) $(common_SOURCES)
 sd_festival_LDADD = $(top_builddir)/src/common/libcommon.la \
        $(audio_dlopen_modules) \
-       -lpthread $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) 
$(EXTRA_SOCKET_LIBS)
+       $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) $(EXTRA_SOCKET_LIBS)
 
 sd_generic_SOURCES = generic.c $(audio_SOURCES) $(common_SOURCES) \
        module_utils_addvoice.c
 sd_generic_LDADD = $(top_builddir)/src/common/libcommon.la \
        $(audio_dlopen_modules) \
-       -lpthread $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
+       $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
 
 sd_cicero_SOURCES = cicero.c $(audio_SOURCES) $(common_SOURCES)
 sd_cicero_LDADD = $(top_builddir)/src/common/libcommon.la \
        $(audio_dlopen_modules) \
-       -lpthread $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
+       $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
 
 if flite_support
 modulebin_PROGRAMS += sd_flite
 sd_flite_SOURCES = flite.c $(audio_SOURCES) $(common_SOURCES)
 sd_flite_LDADD = $(top_builddir)/src/common/libcommon.la \
        $(audio_dlopen_modules) \
-       $(flite_kal) $(flite_basic) -lpthread $(DOTCONF_LIBS) $(GLIB_LIBS) \
+       $(flite_kal) $(flite_basic) $(DOTCONF_LIBS) $(GLIB_LIBS) \
        $(GTHREAD_LIBS)
 endif
 
@@ -53,7 +53,7 @@ sd_ibmtts_SOURCES = ibmtts.c $(audio_SOURCES) 
$(common_SOURCES) \
        module_utils_addvoice.c
 sd_ibmtts_LDADD = $(top_builddir)/src/common/libcommon.la \
        $(audio_dlopen_modules) \
-       -lm -lpthread -libmeci $(SNDFILE_LIBS) $(DOTCONF_LIBS) \
+       -libmeci $(SNDFILE_LIBS) $(DOTCONF_LIBS) \
        $(GLIB_LIBS) $(GTHREAD_LIBS)
 endif
 
@@ -71,7 +71,7 @@ modulebin_PROGRAMS += sd_ivona
 sd_ivona_SOURCES = ivona.c ivona_client.c ivona_client.h $(common_SOURCES)
 sd_ivona_LDADD = $(top_builddir)/src/common/libcommon.la \
        $(audio_dlopen_modules) \
-       -ldumbtts -lpthread $(SNDFILE_LIBS) $(DOTCONF_LIBS) $(GLIB_LIBS) \
+       -ldumbtts $(SNDFILE_LIBS) $(DOTCONF_LIBS) $(GLIB_LIBS) \
        $(GTHREAD_LIBS)
 endif
 
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 54dd64c..607cf8e 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -17,4 +17,4 @@ speech_dispatcher_CPPFLAGS = $(inc_local) $(DOTCONF_CFLAGS) 
$(GLIB_CFLAGS) \
        -D_GNU_SOURCE -DDEFAULT_AUDIO_METHOD=\"$(default_audio_method)\"
 speech_dispatcher_LDFLAGS = $(RDYNAMIC)
 speech_dispatcher_LDADD = $(lib_common) $(DOTCONF_LIBS) $(GLIB_LIBS) \
-       $(GMODULE_LIBS) $(GTHREAD_LIBS) -lpthread $(EXTRA_SOCKET_LIBS)
+       $(GMODULE_LIBS) $(GTHREAD_LIBS) $(EXTRA_SOCKET_LIBS)
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index deb63d8..bb43c7f 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -35,26 +35,25 @@ check_PROGRAMS = long_message clibrary clibrary2 run_test 
connection_recovery \
                spd_cancel_long_message spd_set_notifications_all
 
 long_message_SOURCES = long_message.c
-long_message_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
+long_message_LDADD = $(c_api)/libspeechd.la $(EXTRA_SOCKET_LIBS)
 
 clibrary_SOURCES = clibrary.c
-clibrary_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
+clibrary_LDADD = $(c_api)/libspeechd.la $(EXTRA_SOCKET_LIBS)
 
 clibrary2_SOURCES = clibrary2.c
-clibrary2_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
+clibrary2_LDADD = $(c_api)/libspeechd.la $(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 $(EXTRA_SOCKET_LIBS)
 
 spd_cancel_long_message_SOURCES = spd_cancel_long_message.c
-spd_cancel_long_message_LDADD = $(c_api)/libspeechd.la -lpthread 
$(EXTRA_SOCKET_LIBS)
+spd_cancel_long_message_LDADD = $(c_api)/libspeechd.la $(EXTRA_SOCKET_LIBS)
 
 spd_set_notifications_all_SOURCES = spd_set_notifications_all.c
-spd_set_notifications_all_LDADD = $(c_api)/libspeechd.la -lpthread 
$(EXTRA_SOCKET_LIBS)
+spd_set_notifications_all_LDADD = $(c_api)/libspeechd.la $(EXTRA_SOCKET_LIBS)
 
 run_test_SOURCES = run_test.c
-run_test_LDADD = $(c_api)/libspeechd.la -lpthread $(EXTRA_SOCKET_LIBS)
+run_test_LDADD = $(c_api)/libspeechd.la $(EXTRA_SOCKET_LIBS)
 
 EXTRA_DIST= basic.test general.test keys.test priority_progress.test \
             pronunciation.test punctuation.test sound_icons.test spelling.test 
\
-- 
1.7.2.2