Commit 6e7b3774 authored by Bastien Nocera's avatar Bastien Nocera

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.
parent 9c8da452
......@@ -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)
......
......@@ -11,6 +11,7 @@ dist_ui_DATA = \
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
......
......@@ -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\"" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment