[rygel] Expand LIBADDs to everything needed

[Jens Georg <jensgeorg src gnome org>]

commit 025858e6481de3107f1f403cb89969828b7cad08
Author: Andreas Henriksson <andreas fatal se>
Date:   Tue Sep 25 00:15:39 2012 +0200

    Expand LIBADDs to everything needed
    
    Put every used library in the LIBADD to be able
    to build with a gupnp stack that doesn't leak linker flags.

 examples/Makefile.am                 |    1 +
 src/librygel-core/Makefile.am        |    1 +
 src/librygel-renderer/Makefile.am    |    2 +-
 src/librygel-server/Makefile.am      |   13 ++++++++-----
 src/plugins/external/Makefile.am     |    2 +-
 src/plugins/media-export/Makefile.am |    1 +
 src/plugins/mediathek/Makefile.am    |    2 +-
 src/plugins/mpris/Makefile.am        |    2 +-
 src/rygel/Makefile.am                |    2 ++
 src/ui/Makefile.am                   |    1 +
 tests/Makefile.am                    |    1 +
 11 files changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 7dfa1c5..6bf68a7 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -10,6 +10,7 @@ noinst_PROGRAMS = standalone-server
 standalone_server_SOURCES = standalone-server.c
 standalone_server_LDADD = \
 	$(top_builddir)/src/librygel-server/librygel-server-2.0.la \
+	$(LIBGIO_LIBS) \
 	$(RYGEL_COMMON_LIBS)
 
 if HAVE_GSTREAMER
diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am
index 814c7d2..a652a1d 100644
--- a/src/librygel-core/Makefile.am
+++ b/src/librygel-core/Makefile.am
@@ -24,6 +24,7 @@ librygel_core_2_0_la_VALAFLAGS = \
 
 librygel_core_2_0_la_LIBADD = \
 	$(RYGEL_BASE_LIBS) \
+	$(LIBGSSDP_LIBS) \
 	$(GIO_LIBS)
 
 RYGEL_CORE_VERSION=1:0:0
diff --git a/src/librygel-renderer/Makefile.am b/src/librygel-renderer/Makefile.am
index 488dd92..c35ae6a 100644
--- a/src/librygel-renderer/Makefile.am
+++ b/src/librygel-renderer/Makefile.am
@@ -18,7 +18,7 @@ librygel_renderer_2_0_la_VALAFLAGS = \
 	-H rygel-renderer.h --library=rygel-renderer-2.0 \
 	$(LIBRYGEL_RENDERER_VALAFLAGS_PKG) \
 	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_renderer_2_0_la_LIBADD = $(RYGEL_COMMON_LIBS) $(LIBGSTREAMER_LIBS)
+librygel_renderer_2_0_la_LIBADD = $(RYGEL_COMMON_LIBS) $(LIBGIO_LIBS) $(LIBSOUP_LIBS)
 librygel_renderer_2_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 3405c4b..7b6d614 100644
--- a/src/librygel-server/Makefile.am
+++ b/src/librygel-server/Makefile.am
@@ -8,8 +8,7 @@ lib_LTLIBRARIES = librygel-server-2.0.la
 
 LIBRYGEL_SERVER_VERSION=1:0:0
 
-AM_CFLAGS += -DG_LOG_DOMAIN=\"Rygel\" \
-	$(LIBGUPNP_DLNA_CFLAGS)
+AM_CFLAGS += -DG_LOG_DOMAIN=\"Rygel\"
 
 librygel_server_2_0_la_SOURCES = \
 	$(LIBRYGEL_SERVER_VAPI_SOURCE_FILES) \
@@ -19,9 +18,13 @@ librygel_server_2_0_la_VALAFLAGS = \
 	-H rygel-server.h --library=rygel-server-2.0 \
 	$(LIBRYGEL_SERVER_VALAFLAGS_PKG) \
 	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_server_2_0_la_LIBADD = $(RYGEL_COMMON_LIBS) \
-	$(LIBGUPNP_DLNA_LIBS) \
-	$(GST_PBU_LIBS)
+
+librygel_server_2_0_la_LIBADD = \
+	$(RYGEL_COMMON_LIBS) \
+	$(LIBGIO_LIBS) \
+	$(LIBSOUP_LIBS) \
+	$(LIBGSSDP_LIBS)
+
 librygel_server_2_0_la_LDFLAGS = -version-info $(LIBRYGEL_SERVER_VERSION)
 
 vapidir = $(VAPIDIR)
diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am
index 644e722..e9391b8 100644
--- a/src/plugins/external/Makefile.am
+++ b/src/plugins/external/Makefile.am
@@ -17,5 +17,5 @@ librygel_external_la_SOURCES = \
 	rygel-external-variant-util.vala
 
 librygel_external_la_VALAFLAGS = $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
-librygel_external_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS)
+librygel_external_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS) $(LIBGIO_LIBS)
 librygel_external_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 0fd3370..36d0b7f 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -48,6 +48,7 @@ librygel_media_export_la_VALAFLAGS = \
 
 librygel_media_export_la_LIBADD = \
 	$(RYGEL_COMMON_SERVER_LIBS) \
+	$(LIBGIO_LIBS) \
 	$(LIBGUPNP_DLNA_LIBS) \
 	$(GSTREAMER_TAG_LIBS) \
 	$(GSTREAMER_APP_LIBS) \
diff --git a/src/plugins/mediathek/Makefile.am b/src/plugins/mediathek/Makefile.am
index 50ee615..7603fe8 100644
--- a/src/plugins/mediathek/Makefile.am
+++ b/src/plugins/mediathek/Makefile.am
@@ -15,5 +15,5 @@ librygel_mediathek_la_SOURCES = \
 	rygel-mediathek-soup-utils.vala
 
 librygel_mediathek_la_VALAFLAGS = $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
-librygel_mediathek_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS)
+librygel_mediathek_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS) $(LIBGIO_LIBS) $(LIBSOUP_LIBS)
 librygel_mediathek_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/mpris/Makefile.am b/src/plugins/mpris/Makefile.am
index b108c38..40e182c 100644
--- a/src/plugins/mpris/Makefile.am
+++ b/src/plugins/mpris/Makefile.am
@@ -12,5 +12,5 @@ librygel_mpris_la_SOURCES = \
 	rygel-mpris-interfaces.vala
 
 librygel_mpris_la_VALAFLAGS = $(RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS)
-librygel_mpris_la_LIBADD = $(RYGEL_COMMON_RENDERER_LIBS)
+librygel_mpris_la_LIBADD = $(RYGEL_COMMON_RENDERER_LIBS) $(LIBGIO_LIBS)
 librygel_mpris_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 7e62312..26366da 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -28,6 +28,8 @@ rygel_VALAFLAGS = \
 rygel_LDADD = \
 	$(top_builddir)/src/librygel-core/librygel-core-2.0.la \
 	$(top_builddir)/src/librygel-server/librygel-server-2.0.la \
+	$(LIBGSSDP_LIBS) \
+	$(LIBGIO_LIBS) \
 	$(LIBGUPNP_AV_LIBS) \
 	$(RYGEL_BASE_LIBS)
 
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 06cc965..3704aa1 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -21,6 +21,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 a902af8..b002e47 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) \