summaryrefslogtreecommitdiff
path: root/gnome-settings-daemon
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2016-09-27 17:25:32 +0200
committerBastien Nocera <hadess@hadess.net>2016-10-11 11:00:56 +0200
commit54b74317e51ce02665afee7d7fe85e475839492a (patch)
treea78ca181dbf5ea5f66612137ab7f621231809b4f /gnome-settings-daemon
parentf5ef6bd9d1166a9457304409f58b6f0d2ba15cd4 (diff)
downloadgnome-settings-daemon-54b74317e51ce02665afee7d7fe85e475839492a.tar.gz
build: Add separate GTK+ skeleton
And simplify library requirements for each helper. This should allow us to trim the number of dependencies for each one of the helpers. This also moves the libnotify initialisation directly into the plugins that need it. https://bugzilla.gnome.org/show_bug.cgi?id=772370
Diffstat (limited to 'gnome-settings-daemon')
-rw-r--r--gnome-settings-daemon/Makefile.am9
1 files changed, 2 insertions, 7 deletions
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index d1125d22..076cb44e 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -5,11 +5,8 @@ AM_CPPFLAGS = \
-DDATADIR=\""$(datadir)"\" \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
- -DGNOME_SETTINGS_PLUGINDIR=\""$(plugindir)"\" \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
- $(SETTINGS_DAEMON_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
$(GNOME_DESKTOP_CFLAGS) \
$(WAYLAND_CFLAGS) \
$(NULL)
@@ -73,12 +70,10 @@ libgsd_la_CPPFLAGS = \
$(DISABLE_DEPRECATED_CFLAGS) \
$(NULL)
-libgsd_la_CFLAGS = \
- $(NULL)
+libgsd_la_CFLAGS = $(HELPER_CFLAGS)
libgsd_la_LIBADD = \
- $(SETTINGS_DAEMON_LIBS) \
- $(GIOUNIX_LIBS) \
+ $(HELPER_LIBS) \
$(WAYLAND_LIBS) \
$(NULL)