build: Don't confuse automake

diff --git a/common.am b/common.am
index 3061cbc..cbbcffd 100644 (file)
--- a/common.am
+++ b/common.am
@@ -32,7 +32,7 @@ AM_CFLAGS = \
        -DPLUGIN_DIR='"$(plugindir)"' -DDESKTOP_DIR='"$(desktopdir)"'\
        -include config.h
 
-RYGEL_COMMON_LDADD = \
+RYGEL_COMMON_LIBS = \
        $(LIBGUPNP_LIBS) \
        $(LIBGUPNP_AV_LIBS) \
        $(LIBGSTREAMER_LIBS) \

diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am
index 9fe7f65..c6ce7c1 100644 (file)
--- a/src/plugins/external/Makefile.am
+++ b/src/plugins/external/Makefile.am
@@ -16,5 +16,5 @@ librygel_external_la_SOURCES = \
        rygel-external-icon-factory.vala
 
 librygel_external_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_external_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_external_la_LIBADD = $(RYGEL_COMMON_LIBS)
 librygel_external_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)

diff --git a/src/plugins/gst-launch/Makefile.am b/src/plugins/gst-launch/Makefile.am
index 0ff8ff5..39922cf 100644 (file)
--- a/src/plugins/gst-launch/Makefile.am
+++ b/src/plugins/gst-launch/Makefile.am
@@ -12,5 +12,5 @@ librygel_gst_launch_la_SOURCES = \
        rygel-gst-launch-video-item.vala
 
 librygel_gst_launch_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_gst_launch_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_gst_launch_la_LIBADD = $(RYGEL_COMMON_LIBS)
 librygel_gst_launch_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)

diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 451e035..2a3a153 100644 (file)
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -45,7 +45,7 @@ librygel_media_export_la_VALAFLAGS = \
        $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
 
 librygel_media_export_la_LIBADD = \
-       $(RYGEL_COMMON_LDADD) \
+       $(RYGEL_COMMON_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 5a42134..4dcb6f6 100644 (file)
--- 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_PLUGIN_VALAFLAGS)
-librygel_mediathek_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_mediathek_la_LIBADD = $(RYGEL_COMMON_LIBS)
 librygel_mediathek_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)

diff --git a/src/plugins/mpris/Makefile.am b/src/plugins/mpris/Makefile.am
index 7e94349..733ca48 100644 (file)
--- a/src/plugins/mpris/Makefile.am
+++ b/src/plugins/mpris/Makefile.am
@@ -11,5 +11,5 @@ librygel_mpris_la_SOURCES = \
        rygel-mpris-interfaces.vala
 
 librygel_mpris_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_mpris_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_mpris_la_LIBADD = $(RYGEL_COMMON_LIBS)
 librygel_mpris_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)

diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am
index fa9d972..b6f0baa 100644 (file)
--- a/src/plugins/playbin/Makefile.am
+++ b/src/plugins/playbin/Makefile.am
@@ -9,5 +9,5 @@ librygel_playbin_la_SOURCES = \
        rygel-playbin-plugin.vala
 
 librygel_playbin_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_playbin_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_playbin_la_LIBADD = $(RYGEL_COMMON_LIBS)
 librygel_playbin_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)

diff --git a/src/plugins/test/Makefile.am b/src/plugins/test/Makefile.am
index b0afa60..e482b66 100644 (file)
--- a/src/plugins/test/Makefile.am
+++ b/src/plugins/test/Makefile.am
@@ -11,5 +11,5 @@ librygel_test_la_SOURCES = \
        rygel-test-plugin.vala
 
 librygel_test_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_test_la_LIBADD = $(RYGEL_COMMON_LDADD)
+librygel_test_la_LIBADD = $(RYGEL_COMMON_LIBS)
 librygel_test_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)

diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index 7596c2c..21c34a2 100644 (file)
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -44,5 +44,5 @@ librygel_tracker_la_SOURCES = \
 librygel_tracker_la_VALAFLAGS = --pkg posix \
                                --pkg gupnp-dlna-1.0 \
                                $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_tracker_la_LIBADD = $(RYGEL_COMMON_LDADD) $(LIBGUPNP_DLNA_LIBS)
+librygel_tracker_la_LIBADD = $(RYGEL_COMMON_LIBS) $(LIBGUPNP_DLNA_LIBS)
 librygel_tracker_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)

diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index ee71486..06ef30f 100644 (file)
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -126,7 +126,7 @@ rygel_VALAFLAGS = \
 
 rygel_LDADD = \
        librygel-configuration.a \
-       $(RYGEL_COMMON_LDADD) \
+       $(RYGEL_COMMON_LIBS) \
        $(LIBGUPNP_DLNA_LIBS) \
        $(GST_PBU_LIBS) \
        $(GIO_LIBS) \

diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index a3ef2d7..ff6463a 100644 (file)
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -20,7 +20,7 @@ rygel_preferences_VALAFLAGS = \
 
 rygel_preferences_LDADD = \
        $(abs_top_builddir)/src/rygel/librygel-configuration.a \
-       $(RYGEL_COMMON_LDADD) \
+       $(RYGEL_COMMON_LIBS) \
        $(GTK_LIBS)
 rygel_preferences_LDFLAGS = -export-dynamic