[PATCH] don't declare libraries in LDFLAGS

[Andrei Kholodnyi]

From: William Hubbs <address@hidden>
To: address@hidden

Libraries, by convention, should not be declared in LDFLAGS.  If you are
building a program, they should be in LDADD.  If you are building a
library, they should be in LIBADD if they are third party libraries or
LDADD if they are convenience libraries.
---
 src/api/c/Makefile.am |    4 ++--
 src/audio/Makefile.am |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api/c/Makefile.am b/src/api/c/Makefile.am
index cfaef39..e8606f7 100644
--- a/src/api/c/Makefile.am
+++ b/src/api/c/Makefile.am
@@ -7,6 +7,6 @@ AM_CFLAGS = @ERROR_CFLAGS@ -D_GNU_SOURCE -I/usr/include/ 
$(inc_local) $(GLIB_CFL
 
 lib_LTLIBRARIES = libspeechd.la
 libspeechd_la_SOURCES = libspeechd.c libspeechd.h
-libspeechd_la_LDFLAGS = -version-info 
@LIB_SPD_CURRENT@:@LIB_SPD_REVISION@:@LIB_SPD_AGE@ -lpthread
-libspeechd_la_LIBADD = $(GLIB_LIBS)
+libspeechd_la_LDFLAGS = -version-info 
@LIB_SPD_CURRENT@:@LIB_SPD_REVISION@:@LIB_SPD_AGE@
+libspeechd_la_LIBADD = $(GLIB_LIBS) -lpthread
 
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
index d2784ef..03daa37 100644
--- a/src/audio/Makefile.am
+++ b/src/audio/Makefile.am
@@ -32,5 +32,5 @@ endif
 EXTRA_DIST = alsa.c libao.c oss.c nas.c pulse.c static_plugins.c.in
 
 AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" $(inc_local)
-libsdaudio_la_LDFLAGS = -version-info 
@LIB_SDAUDIO_CURRENT@:@LIB_SDAUDIO_REVISION@:@LIB_SDAUDIO_AGE@ -lpthread 
$(SPD_AUDIO_LIBS)
-libsdaudio_la_LIBADD = $(GLIB_LIBS)
+libsdaudio_la_LDFLAGS = -version-info 
@LIB_SDAUDIO_CURRENT@:@LIB_SDAUDIO_REVISION@:@LIB_SDAUDIO_AGE@
+libsdaudio_la_LIBADD = $(GLIB_LIBS) -lpthread $(SPD_AUDIO_LIBS)
-- 
1.6.0.4