[gnome-control-center] Only link the panels that require it to gnome-desktop

[Bastien Nocera <hadess src gnome org>]

commit 6e7b3774c0c771792fd9c5d8e5db1af0602d4eec
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Sep 20 17:56:23 2010 +0100

    Only link the panels that require it to gnome-desktop
    
    Only the display and background panels use gnome-desktop,
    the shell shouldn't need to require it.

 configure.ac                  |   13 ++++++-------
 panels/background/Makefile.am |    5 +++--
 panels/display/Makefile.am    |    3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4839fdb..6f5d1aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,13 +114,12 @@ dnl ==============================================
 dnl Check that we meet the  dependencies
 dnl ==============================================
 
-COMMON_MODULES="gtk+-3.0 >= 2.90.0 dnl
- glib-2.0 >= 2.25.11 dnl
- gthread-2.0 dnl
- gio-2.0 dnl
- gconf-2.0 dnl
- libxml-2.0 dnl
- gnome-desktop-3.0 >= 2.29.4"
+COMMON_MODULES="gtk+-3.0 >= 2.90.0
+ glib-2.0 >= 2.25.11
+ gthread-2.0
+ gio-2.0
+ gconf-2.0
+ libxml-2.0"
 PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
 PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu gio-unix-2.0)
 PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
index e1b145b..77e0c50 100644
--- a/panels/background/Makefile.am
+++ b/panels/background/Makefile.am
@@ -8,9 +8,10 @@ dist_ui_DATA = \
 	display-overlay.png
 
 
-INCLUDES = 						\
+INCLUDES =						\
 	$(PANEL_CFLAGS)					\
 	$(GNOMECC_CAPPLETS_CFLAGS)			\
+	$(GNOME_DESKTOP_CFLAGS)				\
 	$(DBUS_CFLAGS)					\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
@@ -37,7 +38,7 @@ libbackground_la_SOURCES =		\
 	gnome-wp-info.h  gnome-wp-item.h  gnome-wp-xml.h
 
 
-libbackground_la_LIBADD = $(PANEL_LIBS) $(DBUS_LIBS)
+libbackground_la_LIBADD = $(PANEL_LIBS) $(DBUS_LIBS) $(GNOME_DESKTOP_LIBS)
 libbackground_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 if WITH_LIBSOCIALWEB
diff --git a/panels/display/Makefile.am b/panels/display/Makefile.am
index a4665d5..4c26a5c 100644
--- a/panels/display/Makefile.am
+++ b/panels/display/Makefile.am
@@ -26,7 +26,7 @@ libdisplay_la_SOURCES =		\
 	$(MARSHALFILES)
 
 libdisplay_la_LIBADD = $(DBUS_LIBS) $(PANEL_LIBS)
-libdisplay_la_LDFLAGS = $(PANEL_LDFLAGS) $(DISPLAY_CAPPLET_LIBS)
+libdisplay_la_LDFLAGS = $(PANEL_LDFLAGS) $(DISPLAY_CAPPLET_LIBS) $(GNOME_DESKTOP_LIBS)
 
 sbin_PROGRAMS = gnome-display-properties-install-systemwide
 
@@ -64,6 +64,7 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 INCLUDES   = $(DISPLAY_CAPPLET_CFLAGS) \
 	     $(DBUS_CFLAGS) \
              $(GNOMECC_CAPPLETS_CFLAGS) \
+             $(GNOME_DESKTOP_CFLAGS) \
 	     -DSBINDIR="\"$(sbindir)\"" \
 	     -DUIDIR="\"$(uidir)\"" \
 	     -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \