diff options
| author | Bastien Nocera <hadess@hadess.net> | 2016-09-27 17:25:32 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2016-10-11 11:00:56 +0200 |
| commit | 54b74317e51ce02665afee7d7fe85e475839492a (patch) | |
| tree | a78ca181dbf5ea5f66612137ab7f621231809b4f /plugins/xsettings | |
| parent | f5ef6bd9d1166a9457304409f58b6f0d2ba15cd4 (diff) | |
| download | gnome-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 'plugins/xsettings')
| -rw-r--r-- | plugins/xsettings/Makefile.am | 43 | ||||
| -rw-r--r-- | plugins/xsettings/main.c | 2 |
2 files changed, 12 insertions, 33 deletions
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am index d2ac4251..74204290 100644 --- a/plugins/xsettings/Makefile.am +++ b/plugins/xsettings/Makefile.am @@ -9,23 +9,18 @@ test_gtk_modules_SOURCES = \ gsd-xsettings-gtk.h \ test-gtk-modules.c -test_gtk_modules_CFLAGS = \ - $(PLUGIN_CFLAGS) \ - $(SETTINGS_PLUGIN_CFLAGS) \ - $(AM_CFLAGS) +test_gtk_modules_CFLAGS = $(PLUGIN_CFLAGS) $(XSETTINGS_CFLAGS) test_gtk_modules_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ - $(XSETTINGS_LIBS) \ - $(SETTINGS_PLUGIN_LIBS) + $(XSETTINGS_LIBS) test_gtk_modules_CPPFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/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) + -DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" noinst_PROGRAMS += test-fontconfig-monitor @@ -33,38 +28,26 @@ test_fontconfig_monitor_SOURCES = \ fontconfig-monitor.c \ fontconfig-monitor.h -test_fontconfig_monitor_CFLAGS = \ - $(PLUGIN_CFLAGS) \ - $(SETTINGS_PLUGIN_CFLAGS) \ - $(AM_CFLAGS) +test_fontconfig_monitor_CFLAGS = $(PLUGIN_CFLAGS) $(XSETTINGS_CFLAGS) -test_fontconfig_monitor_LDADD = \ - $(XSETTINGS_LIBS) \ - $(SETTINGS_PLUGIN_LIBS) +test_fontconfig_monitor_LDADD = $(XSETTINGS_LIBS) test_fontconfig_monitor_CPPFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ -I$(top_srcdir)/data/ \ - -DFONTCONFIG_MONITOR_TEST \ - $(AM_CPPFLAGS) + -DFONTCONFIG_MONITOR_TEST noinst_PROGRAMS += test-wm-button-layout-translations test_wm_button_layout_translations_SOURCES = \ test-wm-button-layout-translations.c \ wm-button-layout-translation.c \ - wm-button-layout-translation.h \ - $(NULL) + wm-button-layout-translation.h -test_wm_button_layout_translations_CFLAGS = \ - $(XSETTINGS_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) +test_wm_button_layout_translations_CFLAGS = $(XSETTINGS_CFLAGS) -test_wm_button_layout_translations_LDADD = \ - $(XSETTINGS_LIBS) \ - $(NULL) +test_wm_button_layout_translations_LDADD = $(XSETTINGS_LIBS) libexec_PROGRAMS = gsd-xsettings @@ -87,10 +70,8 @@ gsd_xsettings_SOURCES = \ main.c gsd_xsettings_CFLAGS = \ - $(SETTINGS_PLUGIN_CFLAGS) \ $(PLUGIN_CFLAGS) \ - $(XSETTINGS_CFLAGS) \ - $(AM_CFLAGS) + $(XSETTINGS_CFLAGS) gsd_xsettings_CPPFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ @@ -98,12 +79,10 @@ gsd_xsettings_CPPFLAGS = \ -I$(top_srcdir)/plugins/common/ \ -I$(top_srcdir)/data/ \ -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ - -DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \ - $(AM_CPPFLAGS) + -DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" gsd_xsettings_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ - $(SETTINGS_PLUGIN_LIBS) \ $(XSETTINGS_LIBS) desktopdir = $(sysconfdir)/xdg/autostart diff --git a/plugins/xsettings/main.c b/plugins/xsettings/main.c index 57630984..67501ae1 100644 --- a/plugins/xsettings/main.c +++ b/plugins/xsettings/main.c @@ -4,4 +4,4 @@ #define MANAGER GnomeXSettingsManager #include "gsd-xsettings-manager.h" -#include "daemon-skeleton.h" +#include "daemon-skeleton-gtk.h" |