[telepathy-gabble/master] libloudmouth.la was linked against libwocky.la but did not depend on it.
Vivek Dasmohapatra
vivek at collabora.co.uk
Fri Oct 23 09:23:36 PDT 2009
This broken dependency meant symbols from stale copies of libwocky.a could end up linked into the telepathy-gabble and telepathy-gabble-debug binaries, which could be very misleading during the patch/build/test cycle.
---
lib/loudmouth/Makefile.am | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/lib/loudmouth/Makefile.am b/lib/loudmouth/Makefile.am
index d785380..9df01ee 100644
--- a/lib/loudmouth/Makefile.am
+++ b/lib/loudmouth/Makefile.am
@@ -20,6 +20,15 @@ OUR_SOURCES = \
lm-connection.h
libloudmouth_la_SOURCES = $(OUR_SOURCES) $(BUILT_SOURCES)
+libloudmouth_la_LIBADD = @WOCKY_LIBS@
+# filter out any -flags as we only need to include .a and .la files here:
+# this is necessary because:
+# @@ substitutions are filtered out by automake when constructing *_DEPENDENCIES
+# *_LIBADD contains the link flags, dynamic libs and static libs we want
+# *_DEPENDENCIES _MUST NOT_ contain the link flags and dynamic libs
+# *_DEPENDENCIES _SHOULD_ contain static libs so we rebuild when they change
+libloudmouth_la_DEPENDENCIES = \
+ $(filter-out -%, $(libloudmouth_la_LIBADD))
# Coding style checks
check_c_sources = \
--
1.5.6.5
More information about the telepathy-commits
mailing list