aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-02-23 22:26:15 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 17:20:06 +0800
commit808cacc3f55f380743c459648ee8ebe3d4835e36 (patch)
tree36890ec5166f9fb360f0ef0300e72f802c4de7dd /libempathy
parent550aad6f3bbc7840adacd721a573b7f0d976485f (diff)
downloadgsoc2013-empathy-808cacc3f55f380743c459648ee8ebe3d4835e36.tar
gsoc2013-empathy-808cacc3f55f380743c459648ee8ebe3d4835e36.tar.gz
gsoc2013-empathy-808cacc3f55f380743c459648ee8ebe3d4835e36.tar.bz2
gsoc2013-empathy-808cacc3f55f380743c459648ee8ebe3d4835e36.tar.lz
gsoc2013-empathy-808cacc3f55f380743c459648ee8ebe3d4835e36.tar.xz
gsoc2013-empathy-808cacc3f55f380743c459648ee8ebe3d4835e36.tar.zst
gsoc2013-empathy-808cacc3f55f380743c459648ee8ebe3d4835e36.zip
Explicitely use the libtelepathy-yell .la file for dependency tracking
Conflicts: libempathy/Makefile.am
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 332e8dd5b..186f08aa9 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -110,9 +110,9 @@ nodist_libempathy_la_SOURCES =\
libempathy_la_LIBADD = \
$(top_builddir)/extensions/libemp-extensions.la \
+ $(top_builddir)/telepathy-yell/telepathy-yell/libtelepathy-yell.la \
$(GCR_LIBS) \
$(EMPATHY_LIBS) \
- $(YELL_LIBS) \
$(GEOCLUE_LIBS) \
$(NETWORK_MANAGER_LIBS) \
$(CONNMAN_LIBS)