[gnome-settings-daemon] xsettings: Fix linkage of xsettings test app

[Bastien Nocera <hadess src gnome org>]

commit 47a45ff788c0eb99f650b119180a2706010d8e3e
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Mar 10 14:04:13 2012 +0100

    xsettings: Fix linkage of xsettings test app

 plugins/xsettings/Makefile.am |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index 84f2bb5..e9ed929 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -14,8 +14,9 @@ test_gtk_modules_CFLAGS =		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(AM_CFLAGS)
 
-test_gtk_modules_LDADD =		\
-	$(FONTCONFIG_LIBS)		\
+test_gtk_modules_LDADD =					\
+	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
+	$(FONTCONFIG_LIBS)					\
 	$(SETTINGS_PLUGIN_LIBS)
 
 test_gtk_modules_CPPFLAGS =				\
@@ -61,10 +62,10 @@ libxsettings_la_SOURCES = 	\
 	fontconfig-monitor.c	\
 	$(NULL)
 
-libxsettings_la_CPPFLAGS = \
-	-I$(top_srcdir)/gnome-settings-daemon		\
-	-I$(top_srcdir)/data/				\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+libxsettings_la_CPPFLAGS =					\
+	-I$(top_srcdir)/gnome-settings-daemon			\
+	-I$(top_srcdir)/data/					\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
 	-DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon- GSD_API_VERSION@/gtk-modules/"\" \
 	$(AM_CPPFLAGS)
 
@@ -77,9 +78,10 @@ libxsettings_la_LDFLAGS = 	\
 	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
-libxsettings_la_LIBADD  = 	\
-	$(SETTINGS_PLUGIN_LIBS)	\
-	$(FONTCONFIG_LIBS)	\
+libxsettings_la_LIBADD  =					\
+	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
+	$(SETTINGS_PLUGIN_LIBS)					\
+	$(FONTCONFIG_LIBS)					\
 	$(NULL)
 
 plugin_in_files = 		\