[rygel/rygel-0-16] Fix build with non-leaky gupnp pkg-config files

[Jens Georg <jensgeorg src gnome org>]

commit fabf36ec769add268154a22c12ccd2382f8358b5
Author: Andreas Henriksson <andreas fatal se>
Date:   Sun Oct 7 02:04:42 2012 +0200

    Fix build with non-leaky gupnp pkg-config files
    
    The build system previously relied on the gupnp stack
    leaking linker flags. Rygel should link to everything it
    uses directly, not rely on anything else pulling in the
    needed linker flags.
    
    The gupnp stack is being fixed up to not leak linker flags
    which will cause build failures if rygel is not fixed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=685478

 src/rygel/Makefile.am |    1 +
 src/ui/Makefile.am    |    1 +
 tests/Makefile.am     |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 2f2a953..b057f18 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -23,6 +23,7 @@ rygel_VALAFLAGS = \
 
 rygel_LDADD = \
 	$(top_builddir)/src/librygel-core/librygel-core-1.0.la \
+	$(LIBGSSDP_LIBS) \
 	$(RYGEL_BASE_LIBS)
 
 rygel_LDFLAGS = -export-dynamic
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 644dde6..92efedb 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -20,6 +20,7 @@ rygel_preferences_VALAFLAGS = \
 
 rygel_preferences_LDADD = \
 	$(RYGEL_COMMON_LIBS) \
+	$(LIBGSSDP_LIBS) \
 	$(GTK_LIBS)
 rygel_preferences_LDFLAGS = -export-dynamic
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6f45dfb..fdcea8a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,6 +15,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(COVERAGE_CFLAGS)
 
 LDADD = $(LIBGUPNP_LIBS) \
+	$(LIBGSSDP_LIBS) \
 	$(LIBGUPNP_AV_LIBS) \
 	$(LIBGSTREAMER_LIBS) \
 	$(GSTREAMER_BASE_LIBS) \