]> git.0d.be Git - empathy.git/commitdiff
Explicitely use the libtelepathy-yell .la file for dependency tracking
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>
Wed, 23 Feb 2011 14:26:15 +0000 (14:26 +0000)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 9 Jun 2011 09:20:06 +0000 (10:20 +0100)
Conflicts:

libempathy/Makefile.am

libempathy/Makefile.am

index 332e8dd5bfd39a4e1018fa1171f2eda34b7c1ce2..186f08aa9981200eba90731bb2d5631cd4fe8bb4 100644 (file)
@@ -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)