diff options
author | Jens Georg <mail@jensge.org> | 2012-04-27 23:57:40 +0200 |
---|---|---|
committer | Jens Georg <mail@jensge.org> | 2012-05-01 13:30:36 +0200 |
commit | 315a1f8351a42366ab2cd401d42153b007980b13 (patch) | |
tree | 4f5752b1197b8d29ea3715a28af03b44053f0ea2 | |
parent | d3a5c1cb76882ee8179b987666b59ffc4c57d805 (diff) | |
download | rygel-315a1f8351a42366ab2cd401d42153b007980b13.tar.gz |
build: Don't confuse automake
-rw-r--r-- | common.am | 2 | ||||
-rw-r--r-- | src/plugins/external/Makefile.am | 2 | ||||
-rw-r--r-- | src/plugins/gst-launch/Makefile.am | 2 | ||||
-rw-r--r-- | src/plugins/media-export/Makefile.am | 2 | ||||
-rw-r--r-- | src/plugins/mediathek/Makefile.am | 2 | ||||
-rw-r--r-- | src/plugins/mpris/Makefile.am | 2 | ||||
-rw-r--r-- | src/plugins/playbin/Makefile.am | 2 | ||||
-rw-r--r-- | src/plugins/test/Makefile.am | 2 | ||||
-rw-r--r-- | src/plugins/tracker/Makefile.am | 2 | ||||
-rw-r--r-- | src/rygel/Makefile.am | 2 | ||||
-rw-r--r-- | src/ui/Makefile.am | 2 |
11 files changed, 11 insertions, 11 deletions
@@ -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 9fe7f657..c6ce7c1c 100644 --- 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 0ff8ff59..39922cf8 100644 --- 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 451e0355..2a3a1538 100644 --- 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 5a421340..4dcb6f60 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_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 7e943498..733ca486 100644 --- 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 fa9d9728..b6f0baac 100644 --- 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 b0afa605..e482b661 100644 --- 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 7596c2c1..21c34a21 100644 --- 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 ee71486e..06ef30f9 100644 --- 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 a3ef2d71..ff6463a4 100644 --- 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 |