GNOME.org
 

[totem] Bug 640942 — Missing linker flags

commit 202c56f9ae88936cd41f0b4c80c6b1a44b8855e6
Author: Christopher Taylor <christophth tiscali it>
Date:   Sun Jan 30 16:24:07 2011 +0000

    Bug 640942 â?? Missing linker flags
    
    Add libtotem.la to the LIBADD variable of all C plugins. Closes: bgo#640942

 src/plugins/Makefile.plugins                  |    3 +++
 src/plugins/bemused/Makefile.am               |    4 +++-
 src/plugins/brasero-disc-recorder/Makefile.am |    4 +++-
 src/plugins/chapters/Makefile.am              |    4 +++-
 src/plugins/galago/Makefile.am                |    4 +++-
 src/plugins/gromit/Makefile.am                |    1 +
 src/plugins/lirc/Makefile.am                  |    4 +++-
 src/plugins/media-player-keys/Makefile.am     |    4 +++-
 src/plugins/ontop/Makefile.am                 |    1 +
 src/plugins/properties/Makefile.am            |    4 +++-
 src/plugins/publish/Makefile.am               |    4 +++-
 src/plugins/sample-vala/Makefile.am           |    1 +
 src/plugins/save-file/Makefile.am             |    4 +++-
 src/plugins/screensaver/Makefile.am           |    1 +
 src/plugins/screenshot/Makefile.am            |    1 +
 src/plugins/sidebar-test/Makefile.am          |    1 +
 src/plugins/skipto/Makefile.am                |    1 +
 src/plugins/thumbnail/Makefile.am             |    1 +
 src/plugins/tracker/Makefile.am               |    1 +
 src/plugins/youtube/Makefile.am               |    3 ++-
 20 files changed, 41 insertions(+), 10 deletions(-)
---
diff --git a/src/plugins/Makefile.plugins b/src/plugins/Makefile.plugins
index c4b45f6..6b7ab07 100644
--- a/src/plugins/Makefile.plugins
+++ b/src/plugins/Makefile.plugins
@@ -23,3 +23,6 @@ plugin_ldflags = \
 	-export_dynamic \
 	-avoid-version \
 	-module
+
+plugin_libadd = \
+	$(top_builddir)/src/libtotem.la
diff --git a/src/plugins/bemused/Makefile.am b/src/plugins/bemused/Makefile.am
index d862b90..c8de3a1 100644
--- a/src/plugins/bemused/Makefile.am
+++ b/src/plugins/bemused/Makefile.am
@@ -7,7 +7,9 @@ plugin_in_files = bemused.plugin.in
 
 libbemused_la_SOURCES = totem-bemused.c
 libbemused_la_LDFLAGS = $(plugin_ldflags)
-libbemused_la_LIBADD = $(BEMUSED_LIBS)
+libbemused_la_LIBADD = \
+	$(plugin_libadd)	\
+	$(BEMUSED_LIBS)
 libbemused_la_CFLAGS = \
 	$(plugin_cflags)	\
 	$(BEMUSED_CFLAGS)
diff --git a/src/plugins/brasero-disc-recorder/Makefile.am b/src/plugins/brasero-disc-recorder/Makefile.am
index 8d65226..3eee8f6 100644
--- a/src/plugins/brasero-disc-recorder/Makefile.am
+++ b/src/plugins/brasero-disc-recorder/Makefile.am
@@ -7,7 +7,9 @@ plugin_in_files = brasero-disc-recorder.plugin.in
 
 libbrasero_disc_recorder_la_SOURCES = totem-disc-recorder.c
 libbrasero_disc_recorder_la_LDFLAGS = $(plugin_ldflags)
-libbrasero_disc_recorder_la_LIBADD = $(DISC_RECORDER_LIBS)
+libbrasero_disc_recorder_la_LIBADD = \
+	$(plugin_libadd)	\
+	$(DISC_RECORDER_LIBS)
 libbrasero_disc_recorder_la_CFLAGS = \
 	$(plugin_cflags)		\
 	$(DISC_RECORDER_CFLAGS)
diff --git a/src/plugins/chapters/Makefile.am b/src/plugins/chapters/Makefile.am
index 393f1df..608c6f8 100644
--- a/src/plugins/chapters/Makefile.am
+++ b/src/plugins/chapters/Makefile.am
@@ -18,7 +18,9 @@ libchapters_la_SOURCES = \
 	totem-edit-chapter.c	\
 	totem-edit-chapter.h
 libchapters_la_LDFLAGS = $(plugin_ldflags)
-libchapters_la_LIBADD = $(CHAPTERS_LIBS)
+libchapters_la_LIBADD = \
+	$(plugin_libadd)	\
+	$(CHAPTERS_LIBS)
 libchapters_la_CFLAGS = \
 	$(plugin_cflags)	\
 	$(CHAPTERS_CFLAGS)
diff --git a/src/plugins/galago/Makefile.am b/src/plugins/galago/Makefile.am
index 29540ae..4eec037 100644
--- a/src/plugins/galago/Makefile.am
+++ b/src/plugins/galago/Makefile.am
@@ -7,7 +7,9 @@ plugin_in_files = galago.plugin.in
 
 libtgp_la_SOURCES = totem-galago.c
 libtgp_la_LDFLAGS = $(plugin_ldflags)
-libtgp_la_LIBADD = $(LIBGALAGO_LIBS)
+libtgp_la_LIBADD = \
+	$(plugin_libadd)	\
+	$(LIBGALAGO_LIBS)
 libtgp_la_CFLAGS = \
 	$(plugin_cflags)	\
 	$(LIBGALAGO_CFLAGS)
diff --git a/src/plugins/gromit/Makefile.am b/src/plugins/gromit/Makefile.am
index 21ad2bf..8049f97 100644
--- a/src/plugins/gromit/Makefile.am
+++ b/src/plugins/gromit/Makefile.am
@@ -8,5 +8,6 @@ plugin_in_files = gromit.plugin.in
 libgromit_la_SOURCES = totem-gromit.c
 libgromit_la_LDFLAGS = $(plugin_ldflags)
 libgromit_la_CFLAGS = $(plugin_cflags)
+libgromit_la_LIBADD = $(plugin_libadd)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/lirc/Makefile.am b/src/plugins/lirc/Makefile.am
index 3d02427..284242f 100644
--- a/src/plugins/lirc/Makefile.am
+++ b/src/plugins/lirc/Makefile.am
@@ -11,7 +11,9 @@ EXTRA_DIST += $(config_DATA)
 
 liblirc_la_SOURCES = totem-lirc.c
 liblirc_la_LDFLAGS = $(plugin_ldflags)
-liblirc_la_LIBADD = $(LIRC_LIBS)
+liblirc_la_LIBADD = \
+	$(plugin_libadd)	\
+	$(LIRC_LIBS)
 liblirc_la_CFLAGS = \
 	$(plugin_cflags)	\
 	$(LIRC_CFLAGS)
diff --git a/src/plugins/media-player-keys/Makefile.am b/src/plugins/media-player-keys/Makefile.am
index be95d88..cfe8bdf 100644
--- a/src/plugins/media-player-keys/Makefile.am
+++ b/src/plugins/media-player-keys/Makefile.am
@@ -23,7 +23,9 @@ libmedia_player_keys_la_SOURCES = \
 	$(marshal_files)		\
 	totem-media-player-keys.c
 libmedia_player_keys_la_LDFLAGS = $(plugin_ldflags)
-libmedia_player_keys_la_LIBADD = $(MEDIA_PLAYER_KEYS_LIBS)
+libmedia_player_keys_la_LIBADD = \
+	$(plugin_libadd)		\
+	$(MEDIA_PLAYER_KEYS_LIBS)
 libmedia_player_keys_la_CFLAGS = \
 	$(plugin_cflags)		\
 	$(MEDIA_PLAYER_KEYS_CFLAGS)
diff --git a/src/plugins/ontop/Makefile.am b/src/plugins/ontop/Makefile.am
index 559bfcd..b4b2ffe 100644
--- a/src/plugins/ontop/Makefile.am
+++ b/src/plugins/ontop/Makefile.am
@@ -8,5 +8,6 @@ plugin_in_files = ontop.plugin.in
 libontop_la_SOURCES = totem-ontop.c
 libontop_la_LDFLAGS = $(plugin_ldflags)
 libontop_la_CFLAGS = $(plugin_cflags)
+libontop_la_LIBADD = $(plugin_libadd)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/properties/Makefile.am b/src/plugins/properties/Makefile.am
index 7c4be2d..484fd06 100644
--- a/src/plugins/properties/Makefile.am
+++ b/src/plugins/properties/Makefile.am
@@ -7,7 +7,9 @@ plugin_in_files = movie-properties.plugin.in
 
 libmovie_properties_la_SOURCES = totem-movie-properties.c
 libmovie_properties_la_LDFLAGS = $(plugin_ldflags)
-libmovie_properties_la_LIBADD = $(top_builddir)/src/properties/libbaconvideowidgetproperties.la
+libmovie_properties_la_LIBADD = \
+	$(plugin_libadd)	\
+	$(top_builddir)/src/properties/libbaconvideowidgetproperties.la
 libmovie_properties_la_CFLAGS = $(plugin_cflags)
 libmovie_properties_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/properties/ \
diff --git a/src/plugins/publish/Makefile.am b/src/plugins/publish/Makefile.am
index 0f64151..7dc945e 100644
--- a/src/plugins/publish/Makefile.am
+++ b/src/plugins/publish/Makefile.am
@@ -11,7 +11,9 @@ EXTRA_DIST += $(ui_DATA)
 
 libpublish_la_SOURCES = totem-publish.c
 libpublish_la_LDFLAGS = $(plugin_ldflags)
-libpublish_la_LIBADD = $(LIBEPC_LIBS)
+libpublish_la_LIBADD = \
+	$(plugin_libadd)	\
+	$(LIBEPC_LIBS)
 libpublish_la_CFLAGS = \
 	$(plugin_cflags)	\
 	$(LIBEPC_CFLAGS)
diff --git a/src/plugins/sample-vala/Makefile.am b/src/plugins/sample-vala/Makefile.am
index f20c588..b100930 100644
--- a/src/plugins/sample-vala/Makefile.am
+++ b/src/plugins/sample-vala/Makefile.am
@@ -14,6 +14,7 @@ VALAFLAGS = \
 libsample_vala_la_SOURCES = totem-sample-vala-plugin.vala
 libsample_vala_la_LDFLAGS = $(plugin_ldflags)
 libsample_vala_la_CFLAGS = $(plugin_cflags)
+libsample_vala_la_LIBADD = $(plugin_libadd)
 
 # Override to _not_ install the test plugins
 install-pluginLTLIBRARIES:
diff --git a/src/plugins/save-file/Makefile.am b/src/plugins/save-file/Makefile.am
index 39b6b64..a479f02 100644
--- a/src/plugins/save-file/Makefile.am
+++ b/src/plugins/save-file/Makefile.am
@@ -7,7 +7,9 @@ plugin_in_files = save-file.plugin.in
 
 libsave_file_la_SOURCES = totem-save-file.c
 libsave_file_la_LDFLAGS = $(plugin_ldflags)
-libsave_file_la_LIBADD = $(SAVE_FILE_LIBS)
+libsave_file_la_LIBADD = \
+	$(plugin_libadd)	\
+	$(SAVE_FILE_LIBS)
 libsave_file_la_CFLAGS = \
 	$(plugin_cflags)		\
 	$(SAVE_FILE_CFLAGS)
diff --git a/src/plugins/screensaver/Makefile.am b/src/plugins/screensaver/Makefile.am
index f6171a3..eb3bd4d 100644
--- a/src/plugins/screensaver/Makefile.am
+++ b/src/plugins/screensaver/Makefile.am
@@ -8,6 +8,7 @@ plugin_in_files = screensaver.plugin.in
 libscreensaver_la_SOURCES = totem-screensaver.c
 libscreensaver_la_LDFLAGS = $(plugin_ldflags)
 libscreensaver_la_LIBADD = \
+	$(plugin_libadd)			\
 	$(top_builddir)/lib/libtotemscrsaver.la	\
 	$(SCREENSAVER_LIBS)
 libscreensaver_la_CPPFLAGS = \
diff --git a/src/plugins/screenshot/Makefile.am b/src/plugins/screenshot/Makefile.am
index c15c348..bd5eedb 100644
--- a/src/plugins/screenshot/Makefile.am
+++ b/src/plugins/screenshot/Makefile.am
@@ -22,5 +22,6 @@ libscreenshot_la_SOURCES = \
 	totem-gallery-progress.h
 libscreenshot_la_LDFLAGS = $(plugin_ldflags)
 libscreenshot_la_CFLAGS = $(plugin_cflags)
+libscreenshot_la_LIBADD = $(plugin_libadd)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/sidebar-test/Makefile.am b/src/plugins/sidebar-test/Makefile.am
index 39e813b..93d2b4b 100644
--- a/src/plugins/sidebar-test/Makefile.am
+++ b/src/plugins/sidebar-test/Makefile.am
@@ -8,6 +8,7 @@ plugin_in_files = sidebar-test.plugin.in
 libsidebar_test_la_SOURCES = totem-sidebar-test.c
 libsidebar_test_la_LDFLAGS = $(plugin_ldflags)
 libsidebar_test_la_CFLAGS = $(plugin_cflags)
+libsidebar_test_la_LIBADD = $(plugin_libadd)
 
 # Override to _not_ install the test plugins
 install-pluginLTLIBRARIES:
diff --git a/src/plugins/skipto/Makefile.am b/src/plugins/skipto/Makefile.am
index 3ab11b3..309326c 100644
--- a/src/plugins/skipto/Makefile.am
+++ b/src/plugins/skipto/Makefile.am
@@ -17,5 +17,6 @@ libskipto_la_SOURCES = \
 	totem-skipto.h
 libskipto_la_LDFLAGS = $(plugin_ldflags)
 libskipto_la_CFLAGS = $(plugin_cflags)
+libskipto_la_LIBADD = $(plugin_libadd)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/thumbnail/Makefile.am b/src/plugins/thumbnail/Makefile.am
index 936003c..f44705a 100644
--- a/src/plugins/thumbnail/Makefile.am
+++ b/src/plugins/thumbnail/Makefile.am
@@ -8,5 +8,6 @@ plugin_in_files = thumbnail.plugin.in
 libthumbnail_la_SOURCES = totem-thumbnail.c
 libthumbnail_la_LDFLAGS = $(plugin_ldflags)
 libthumbnail_la_CFLAGS = $(plugin_cflags)
+libthumbnail_la_LIBADD = $(plugin_libadd)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index 5263b19..0ef3fc4 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -8,6 +8,7 @@ plugin_in_files = tracker.plugin.in
 libtracker_la_SOURCES = totem-tracker.c totem-tracker-widget.h totem-tracker-widget.c
 libtracker_la_LDFLAGS = $(plugin_ldflags)
 libtracker_la_LIBADD = \
+	$(plugin_libadd)	\
 	$(TRACKER_LIBS)	\
 	$(DBUS_LIBS)
 libtracker_la_CFLAGS = \
diff --git a/src/plugins/youtube/Makefile.am b/src/plugins/youtube/Makefile.am
index 98e73ad..05851e5 100644
--- a/src/plugins/youtube/Makefile.am
+++ b/src/plugins/youtube/Makefile.am
@@ -12,7 +12,8 @@ EXTRA_DIST += $(ui_DATA)
 libyoutube_la_SOURCES = totem-youtube.c
 libyoutube_la_LDFLAGS = $(plugin_ldflags)
 libyoutube_la_LIBADD = \
-	$(LIBGDATA_LIBS)	\
+	$(plugin_libadd)		\
+	$(LIBGDATA_LIBS)		\
 	$(LIBSOUP_LIBS)
 libyoutube_la_CFLAGS = \
 	$(plugin_cflags)	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]