[empathy/next: 72/79] Fix underlinking



commit 15175991a4aa647cf38361fa1ad123b883d749b9
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Thu Mar 27 14:00:28 2014 +0000

    Fix underlinking
    
    Building with LDFLAGS=-Wl,-z,defs reveals that libempathy-gtk
    and libempathy rely on the host application to link to cheese and udev.
    This is because the telepathy-account-widgets convenience library
    does not pass its dependencies through, which appears to be deliberate
    (commit da8acc15 in tp-a-w).

 libempathy-gtk/Makefile.am |    1 +
 libempathy/Makefile.am     |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index b425b33..1213b8b 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -175,6 +175,7 @@ libempathy_gtk_la_LIBADD =                  \
        $(GCR_LIBS)                             \
        $(MEEGO_LIBS)                           \
        $(CHEESE_LIBS)                          \
+       $(UDEV_LIBS)                    \
        $(top_builddir)/libempathy/libempathy.la
 
 check_c_sources = \
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 15dc4d7..386fbaf 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -113,6 +113,7 @@ libempathy_la_LIBADD =              \
        $(NETWORK_MANAGER_LIBS) \
        $(CONNMAN_LIBS) \
        $(UDEV_LIBS) \
+       $(CHEESE_LIBS) \
        $(GOA_LIBS) \
        $(UOA_LIBS) \
        $(LIBM)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]