[rygel/rygel-0-16] Expand librygel-* to link all needed libraries

[Jens Georg <jensgeorg src gnome org>]

commit e5c24cc44a892921570f8227c2ef14979f435fe5
Author: Andreas Henriksson <andreas fatal se>
Date:   Sun Oct 7 02:30:09 2012 +0200

    Expand librygel-* to link all needed libraries
    
    When adding -Wl,-z,defs to make sure all used symbols
    are resolved, build will fail because some libraries
    which are needed where not linked. This currently works
    because the gupnp stack leaks the needed linker flags,
    but since future versions of the gupnp stack will be
    fixed not to do so, this is needed....
    
    https://bugzilla.gnome.org/show_bug.cgi?id=685478

 src/librygel-core/Makefile.am     |    3 ++-
 src/librygel-renderer/Makefile.am |    5 ++++-
 src/librygel-server/Makefile.am   |    3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am
index d72b98b..3881d16 100644
--- a/src/librygel-core/Makefile.am
+++ b/src/librygel-core/Makefile.am
@@ -29,7 +29,8 @@ librygel_core_1_0_la_LIBADD = \
 	$(GST_PBU_LIBS) \
 	$(RYGEL_BASE_LIBS) \
 	$(LIBGUPNP_DLNA_LIBS) \
-	$(GIO_LIBS) \
+	$(LIBGSSDP_LIBS) \
+	$(LIBGIO_LIBS) \
 	$(LIBSOUP_LIBS)
 
 RYGEL_CORE_VERSION=0:0:0
diff --git a/src/librygel-renderer/Makefile.am b/src/librygel-renderer/Makefile.am
index e0b83c0..89da141 100644
--- a/src/librygel-renderer/Makefile.am
+++ b/src/librygel-renderer/Makefile.am
@@ -16,7 +16,10 @@ librygel_renderer_1_0_la_VALAFLAGS = \
 	-H rygel-renderer.h --library=rygel-renderer-1.0 \
 	$(LIBRYGEL_RENDERER_VALAFLAGS_PKG) \
 	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_renderer_1_0_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_renderer_1_0_la_LIBADD = \
+	$(RYGEL_COMMON_LIBS) \
+	$(LIBGIO_LIBS) \
+	$(LIBSOUP_LIBS)
 librygel_renderer_1_0_la_LDFLAGS = -version-info $(LIBRYGEL_RENDERER_VERSION)
 
 vapidir = $(VAPIDIR)
diff --git a/src/librygel-server/Makefile.am b/src/librygel-server/Makefile.am
index 5024eb8..985ca28 100644
--- a/src/librygel-server/Makefile.am
+++ b/src/librygel-server/Makefile.am
@@ -20,6 +20,9 @@ librygel_server_1_0_la_VALAFLAGS = \
 	$(LIBRYGEL_SERVER_VALAFLAGS_PKG) \
 	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
 librygel_server_1_0_la_LIBADD = $(RYGEL_COMMON_LIBS) \
+	$(LIBGIO_LIBS) \
+	$(LIBSOUP_LIBS) \
+	$(LIBGSSDP_LIBS) \
 	$(LIBGUPNP_DLNA_LIBS) \
 	$(GST_PBU_LIBS)
 librygel_server_1_0_la_LDFLAGS = -version-info $(LIBRYGEL_SERVER_VERSION)