[Xfce4-commits] <thunar:master> Fix build with -W1, --as-needed by linking against missing libraries.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 6cb1271328235d533d594c0b94bde075f74865a3 (commit)
       from b67dacfd2a57bbfc7c29d403f77df3a44f536a46 (commit)

commit 6cb1271328235d533d594c0b94bde075f74865a3
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Mon Sep 6 00:02:39 2010 +0200

    Fix build with -W1,--as-needed by linking against missing libraries.

 plugins/thunar-apr/Makefile.am       |   12 +++++++++++-
 plugins/thunar-sbr/Makefile.am       |   11 +++++++++--
 plugins/thunar-uca/Makefile.am       |   14 +++++++++-----
 plugins/thunar-wallpaper/Makefile.am |   19 ++++++++++++++-----
 4 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/plugins/thunar-apr/Makefile.am b/plugins/thunar-apr/Makefile.am
index 9ec59f9..2ed32de 100644
--- a/plugins/thunar-apr/Makefile.am
+++ b/plugins/thunar-apr/Makefile.am
@@ -29,6 +29,8 @@ thunar_apr_la_SOURCES =							\
 thunar_apr_la_CFLAGS =							\
 	$(EXIF_CFLAGS)							\
 	$(EXO_CFLAGS)							\
+	$(GLIB_CFLAGS)							\
+	$(GTK_CFLAGS)							\
 	$(PLATFORM_CFLAGS)
 
 thunar_apr_la_LDFLAGS =							\
@@ -39,7 +41,15 @@ thunar_apr_la_LDFLAGS =							\
 	$(PLATFORM_LDFLAGS)
 
 thunar_apr_la_LIBADD =							\
-	$(EXIF_LIBS)
+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la	\
+	$(EXIF_LIBS)							\
+	$(EXO_LIBS)							\
+	$(GLIB_LIBS)							\
+	$(GTK_LIBS)
+
+thunar_apr_la_DEPENDENCIES =						\
+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
+	
 
 EXTRA_DIST =								\
 	README
diff --git a/plugins/thunar-sbr/Makefile.am b/plugins/thunar-sbr/Makefile.am
index 6231444..7d87564 100644
--- a/plugins/thunar-sbr/Makefile.am
+++ b/plugins/thunar-sbr/Makefile.am
@@ -34,6 +34,7 @@ thunar_sbr_la_SOURCES =							\
 thunar_sbr_la_CFLAGS =							\
 	$(EXIF_CFLAGS)							\
 	$(EXO_CFLAGS)							\
+	$(GLIB_CFLAGS)							\
 	$(PCRE_CFLAGS)							\
 	$(PLATFORM_CFLAGS)
 
@@ -45,8 +46,14 @@ thunar_sbr_la_LDFLAGS =							\
 	$(PLATFORM_LDFLAGS)
 
 thunar_sbr_la_LIBADD =							\
-	$(PCRE_LIBS)							\
-	$(EXIF_LIBS)
+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la	\
+	$(EXIF_LIBS)							\
+	$(EXO_LIBS)							\
+	$(GLIB_LIBS)							\
+	$(PCRE_LIBS)
+
+thunar_sbr_la_DEPENDENCIES =						\
+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
 
 EXTRA_DIST =								\
 	README
diff --git a/plugins/thunar-uca/Makefile.am b/plugins/thunar-uca/Makefile.am
index 2e37016..8c66d76 100644
--- a/plugins/thunar-uca/Makefile.am
+++ b/plugins/thunar-uca/Makefile.am
@@ -36,11 +36,6 @@ thunar_uca_la_CFLAGS =							\
 	$(LIBXFCE4UI_CFLAGS)						\
 	$(PLATFORM_CFLAGS)
 
-thunar_uca_la_LIBADD =							\
-	$(EXO_LIBS)							\
-	$(LIBXFCE4UTIL_LIBS)						\
-	$(LIBXFCE4UI_LIBS)
-
 thunar_uca_la_LDFLAGS =							\
 	-avoid-version							\
 	-export-dynamic							\
@@ -48,6 +43,15 @@ thunar_uca_la_LDFLAGS =							\
 	-module								\
 	$(PLATFORM_LDFLAGS)
 
+thunar_uca_la_LIBADD =							\
+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la	\
+	$(EXO_LIBS)							\
+	$(LIBXFCE4UTIL_LIBS)						\
+	$(LIBXFCE4UI_LIBS)
+
+thunar_uca_la_DEPENDENCIES =						\
+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
+
 defaultsdir = $(sysconfdir)/xdg/Thunar
 defaults_in_files = uca.xml.in
 defaults_DATA = $(defaults_in_files:.xml.in=.xml)
diff --git a/plugins/thunar-wallpaper/Makefile.am b/plugins/thunar-wallpaper/Makefile.am
index 5846794..d476325 100644
--- a/plugins/thunar-wallpaper/Makefile.am
+++ b/plugins/thunar-wallpaper/Makefile.am
@@ -16,16 +16,25 @@ thunar_wallpaper_plugin_la_SOURCES =					\
 	thunar-wallpaper-plugin.c
 
 thunar_wallpaper_plugin_la_CFLAGS =					\
-	$(PLATFORM_CFLAGS)						\
-	$(THUNARX_CFLAGS)						\
-	$(EXO_CFLAGS)
+	$(EXO_CFLAGS)							\
+	$(GLIB_CFLAGS)							\
+	$(GTK_CFLAGS)							\
+	$(PLATFORM_CFLAGS)
 
 thunar_wallpaper_plugin_la_LDFLAGS =					\
 	-avoid-version							\
 	-export-dynamic							\
 	-export-symbols-regex "^thunar_extension_(shutdown|initialize|list_types)" \
 	-module								\
-	$(PLATFORM_LDFLAGS)						\
-	$(THUNARX_LDFLAGS)
+	$(PLATFORM_LDFLAGS)
+
+thunar_wallpaper_plugin_la_LIBADD =					\
+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la	\
+	$(EXO_LIBS)							\
+	$(GLIB_LIBS)							\
+	$(GTK_LIBS)
+	
+thunar_wallpaper_plugin_la_DEPENDENCIES =				\
+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: