[Xfce4-commits] <tumbler:master> Link plugins against libtumbler-1. Should fix builds with --as-needed.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to c6f35999bd4be21ae431325180410fa481f83533 (commit)
       from 6a0db26c79637a053b85b1bc10f4b45dd52a3c6d (commit)

commit c6f35999bd4be21ae431325180410fa481f83533
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sun Aug 29 12:55:23 2010 +0200

    Link plugins against libtumbler-1. Should fix builds with --as-needed.

 plugins/ffmpeg-thumbnailer/Makefile.am  |    6 +++++-
 plugins/font-thumbnailer/Makefile.am    |    6 +++++-
 plugins/jpeg-thumbnailer/Makefile.am    |    6 +++++-
 plugins/pixbuf-thumbnailer/Makefile.am  |    4 ++++
 plugins/poppler-thumbnailer/Makefile.am |    4 ++++
 plugins/xdg-cache/Makefile.am           |    4 ++++
 6 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/plugins/ffmpeg-thumbnailer/Makefile.am b/plugins/ffmpeg-thumbnailer/Makefile.am
index 1aae717..de3e567 100644
--- a/plugins/ffmpeg-thumbnailer/Makefile.am
+++ b/plugins/ffmpeg-thumbnailer/Makefile.am
@@ -1,6 +1,6 @@
 # vi:set ts=8 sw=8 noet ai nocindent:
 # -
-# Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
+# Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
 # 
 # This program is free software; you can redistribute it and/or 
 # modify it under the terms of the GNU General Public License as
@@ -50,9 +50,13 @@ tumbler_ffmpeg_thumbnailer_la_LDFLAGS =					\
 	$(PLATFORM_LDFLAGS)
 
 tumbler_ffmpeg_thumbnailer_la_LIBADD =					\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la	\
 	$(GDK_PIXBUF_LIBS)						\
 	$(GIO_LIBS)							\
 	$(GLIB_LIBS)							\
 	$(FFMPEGTHUMBNAILER_LIBS)
 
+tumbler_ffmpeg_thumbnailer_la_DEPENDENCIES =				\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
+
 endif
diff --git a/plugins/font-thumbnailer/Makefile.am b/plugins/font-thumbnailer/Makefile.am
index a56c0ea..495b61b 100644
--- a/plugins/font-thumbnailer/Makefile.am
+++ b/plugins/font-thumbnailer/Makefile.am
@@ -1,6 +1,6 @@
 # vi:set ts=8 sw=8 noet ai nocindent:
 # -
-# Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
+# Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
 # 
 # This program is free software; you can redistribute it and/or 
 # modify it under the terms of the GNU General Public License as
@@ -50,9 +50,13 @@ tumbler_font_thumbnailer_la_LDFLAGS =					\
 	$(PLATFORM_LDFLAGS)
 
 tumbler_font_thumbnailer_la_LIBADD =					\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la	\
 	$(GDK_PIXBUF_LIBS)						\
 	$(GIO_LIBS)							\
 	$(GLIB_LIBS)							\
 	$(FREETYPE_LIBS)
 
+tumbler_font_thumbnailer_la_DEPENDENCIES =				\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
+
 endif
diff --git a/plugins/jpeg-thumbnailer/Makefile.am b/plugins/jpeg-thumbnailer/Makefile.am
index d4d88a5..a47ea08 100644
--- a/plugins/jpeg-thumbnailer/Makefile.am
+++ b/plugins/jpeg-thumbnailer/Makefile.am
@@ -1,6 +1,6 @@
 # vi:set ts=8 sw=8 noet ai nocindent:
 # -
-# Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
+# Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
 # 
 # This program is free software; you can redistribute it and/or 
 # modify it under the terms of the GNU General Public License as
@@ -50,9 +50,13 @@ tumbler_jpeg_thumbnailer_la_LDFLAGS =					\
 	$(PLATFORM_LDFLAGS)
 
 tumbler_jpeg_thumbnailer_la_LIBADD =					\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la	\
 	$(GDK_PIXBUF_LIBS)						\
 	$(GIO_LIBS)							\
 	$(GLIB_LIBS)							\
 	$(LIBJPEG_LIBS)
 
+tumbler_jpeg_thumbnailer_la_DEPENDENCIES =				\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
+
 endif
diff --git a/plugins/pixbuf-thumbnailer/Makefile.am b/plugins/pixbuf-thumbnailer/Makefile.am
index 57d08ab..691f3d1 100644
--- a/plugins/pixbuf-thumbnailer/Makefile.am
+++ b/plugins/pixbuf-thumbnailer/Makefile.am
@@ -49,8 +49,12 @@ tumbler_pixbuf_thumbnailer_la_LDFLAGS =					\
 	$(PLATFORM_LDFLAGS)
 
 tumbler_pixbuf_thumbnailer_la_LIBADD =					\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la	\
 	$(GDK_PIXBUF_LIBS)						\
 	$(GIO_LIBS)							\
 	$(GLIB_LIBS)
 
+tumbler_pixbuf_thumbnailer_la_DEPENDENCIES =				\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
+
 endif
diff --git a/plugins/poppler-thumbnailer/Makefile.am b/plugins/poppler-thumbnailer/Makefile.am
index eaa352e..cfdf1e2 100644
--- a/plugins/poppler-thumbnailer/Makefile.am
+++ b/plugins/poppler-thumbnailer/Makefile.am
@@ -50,9 +50,13 @@ tumbler_poppler_thumbnailer_la_LDFLAGS =				\
 	$(PLATFORM_LDFLAGS)
 
 tumbler_poppler_thumbnailer_la_LIBADD =					\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la	\
 	$(GDK_PIXBUF_LIBS)						\
 	$(GIO_LIBS)							\
 	$(GLIB_LIBS)							\
 	$(POPPLER_GLIB_LIBS)
 
+tumbler_poppler_thumbnailer_la_DEPENDENCIES =				\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
+
 endif
diff --git a/plugins/xdg-cache/Makefile.am b/plugins/xdg-cache/Makefile.am
index 0073196..9916bd3 100644
--- a/plugins/xdg-cache/Makefile.am
+++ b/plugins/xdg-cache/Makefile.am
@@ -50,11 +50,15 @@ tumbler_xdg_cache_la_LDFLAGS =						\
 	$(PLATFORM_LDFLAGS)
 
 tumbler_xdg_cache_la_LIBADD =						\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la	\
 	$(GDK_PIXBUF_LIBS)						\
 	$(GIO_LIBS)							\
 	$(GLIB_LIBS)							\
 	$(PNG_LIBS)
 
+tumbler_xdg_cache_la_DEPENDENCIES =					\
+	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
+
 # install symlink to 'tumbler-cache-plugin.so'
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(tumbler_plugindir)