[gnome-settings-daemon/wip/laney/systemd-user: 2/2] plugins: Drop the .desktop files.
- From: Iain Lane <iainl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/wip/laney/systemd-user: 2/2] plugins: Drop the .desktop files.
- Date: Wed, 17 Jan 2018 17:43:12 +0000 (UTC)
commit 5039a53447a177c62dca0d9f4e0f9158fcc61041
Author: Iain Lane <iain orangesquash org uk>
Date: Wed Jan 17 17:33:26 2018 +0000
plugins: Drop the .desktop files.
We're now using systemd to start the plugins.
plugins/a11y-keyboard/Makefile.am | 10 ----------
...rg.gnome.SettingsDaemon.A11yKeyboard.desktop.in | 9 ---------
plugins/a11y-settings/Makefile.am | 10 ----------
...rg.gnome.SettingsDaemon.A11ySettings.desktop.in | 9 ---------
plugins/clipboard/Makefile.am | 10 ----------
.../org.gnome.SettingsDaemon.Clipboard.desktop.in | 9 ---------
plugins/color/Makefile.am | 14 ++------------
.../org.gnome.SettingsDaemon.Color.desktop.in | 9 ---------
plugins/datetime/Makefile.am | 10 ----------
.../org.gnome.SettingsDaemon.Datetime.desktop.in | 9 ---------
plugins/dummy/Makefile.am | 13 ++-----------
.../org.gnome.SettingsDaemon.Dummy.desktop.in | 9 ---------
plugins/housekeeping/Makefile.am | 10 ----------
...rg.gnome.SettingsDaemon.Housekeeping.desktop.in | 9 ---------
plugins/keyboard/Makefile.am | 10 ----------
.../org.gnome.SettingsDaemon.Keyboard.desktop.in | 9 ---------
plugins/media-keys/Makefile.am | 10 ----------
.../org.gnome.SettingsDaemon.MediaKeys.desktop.in | 9 ---------
plugins/mouse/Makefile.am | 13 +++----------
.../org.gnome.SettingsDaemon.Mouse.desktop.in | 9 ---------
plugins/power/Makefile.am | 9 ---------
.../org.gnome.SettingsDaemon.Power.desktop.in | 9 ---------
plugins/print-notifications/Makefile.am | 10 ----------
...me.SettingsDaemon.PrintNotifications.desktop.in | 9 ---------
plugins/rfkill/Makefile.am | 13 +++----------
.../org.gnome.SettingsDaemon.Rfkill.desktop.in | 9 ---------
plugins/screensaver-proxy/Makefile.am | 13 +++----------
...nome.SettingsDaemon.ScreensaverProxy.desktop.in | 9 ---------
plugins/sharing/Makefile.am | 13 +++----------
.../org.gnome.SettingsDaemon.Sharing.desktop.in | 9 ---------
plugins/smartcard/Makefile.am | 10 ----------
.../org.gnome.SettingsDaemon.Smartcard.desktop.in | 9 ---------
plugins/sound/Makefile.am | 10 ----------
.../org.gnome.SettingsDaemon.Sound.desktop.in | 9 ---------
plugins/wacom/Makefile.am | 10 +---------
.../org.gnome.SettingsDaemon.Wacom.desktop.in | 9 ---------
plugins/xsettings/Makefile.am | 10 ----------
.../org.gnome.SettingsDaemon.XSettings.desktop.in | 9 ---------
38 files changed, 17 insertions(+), 362 deletions(-)
---
diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
index ac5649e..3ebe61f 100644
--- a/plugins/a11y-keyboard/Makefile.am
+++ b/plugins/a11y-keyboard/Makefile.am
@@ -22,13 +22,6 @@ gsd_a11y_keyboard_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(A11Y_KEYBOARD_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.A11yKeyboard.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.A11yKeyboard.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-a11y-keyboard.service.in
unit_DATA = gsd-a11y-keyboard.service
@@ -37,16 +30,13 @@ gsd-a11y-keyboard.service: $(unit_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
EXTRA_DIST = \
- $(desktop_in_files) \
$(unit_in_files) \
$(NULL)
CLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA) \
$(NULL)
DISTCLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA) \
$(NULL)
diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am
index d617420..e5bf7bf 100644
--- a/plugins/a11y-settings/Makefile.am
+++ b/plugins/a11y-settings/Makefile.am
@@ -20,13 +20,6 @@ gsd_a11y_settings_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(A11Y_SETTINGS_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.A11ySettings.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.A11ySettings.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-a11y-settings.service.in
unit_DATA = gsd-a11y-settings.service
@@ -35,13 +28,10 @@ gsd-a11y-settings.service: $(unit_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
EXTRA_DIST = \
- $(desktop_in_files) \
$(unit_in_files)
CLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA)
DISTCLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA)
diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am
index 8189428..8ade19a 100644
--- a/plugins/clipboard/Makefile.am
+++ b/plugins/clipboard/Makefile.am
@@ -29,13 +29,6 @@ gsd_clipboard_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(CLIPBOARD_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Clipboard.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Clipboard.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-clipboard.service.in
unit_DATA = gsd-clipboard.service
@@ -44,16 +37,13 @@ gsd-clipboard.service: $(unit_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
EXTRA_DIST = \
- $(desktop_in_files) \
$(unit_in_files) \
$(NULL)
CLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA) \
$(NULL)
DISTCLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA) \
$(NULL)
diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
index b128214..c9d9f47 100644
--- a/plugins/color/Makefile.am
+++ b/plugins/color/Makefile.am
@@ -78,13 +78,6 @@ gsd_color_LDADD = \
$(COLOR_LIBS) \
$(LIBM)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Color.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Color.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-color.service.in
unit_DATA = gsd-color.service
@@ -93,15 +86,12 @@ gsd-color.service: $(unit_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
EXTRA_DIST = \
- $(desktop_in_files) \
$(unit_in_files) \
test-data/Lenovo-T61-Internal.bin \
test-data/LG-L225W-External.bin
CLEANFILES += \
- $(unit_DATA) \
- $(desktop_DATA)
+ $(unit_DATA)
DISTCLEANFILES = \
- $(unit_DATA) \
- $(desktop_DATA)
+ $(unit_DATA)
diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
index 79879ae..666b514 100644
--- a/plugins/datetime/Makefile.am
+++ b/plugins/datetime/Makefile.am
@@ -43,13 +43,6 @@ gsd_datetime_LDADD = \
$(DATETIME_LIBS) \
$(LIBM)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Datetime.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Datetime.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-datetime.service.in
unit_DATA = gsd-datetime.service
@@ -59,13 +52,10 @@ gsd-datetime.service: $(unit_in_files) Makefile
EXTRA_DIST = \
timedated1-interface.xml \
- $(desktop_in_files) \
$(unit_in_files)
CLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA)
DISTCLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA)
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index 4e72a41..a0a7521 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -22,35 +22,26 @@ gsd_dummy_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(DUMMY_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
unitdir = $(systemduserunitdir)
-desktop_DATA =
unit_DATA =
if !SMARTCARD_SUPPORT
-desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop
unit_DATA += gsd-smartcard.service
endif
if !HAVE_WACOM
-desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop
unit_DATA += gsd-wacom.service
endif
if !BUILD_PRINT_NOTIFICATIONS
-desktop_DATA += org.gnome.SettingsDaemon.PrintNotifications.desktop
unit_DATA += gsd-print-notifications.service
endif
if !BUILD_RFKILL
-desktop_DATA += org.gnome.SettingsDaemon.Rfkill.desktop
unit_DATA += gsd-rfkill.service
endif
-%.desktop: org.gnome.SettingsDaemon.Dummy.desktop.in Makefile
- $(AM_V_GEN) PLUGINNAME=`echo $@ | sed 's,.desktop,,'` && sed -e "s|\@pluginname\@|$$PLUGINNAME|" -e
"s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
%.service: gsd-dummy.service.in Makefile
- $(AM_V_GEN) PLUGINNAME=`echo $@ | sed 's,.service,,'` && sed -e "s|\@pluginname\@|$$PLUGINNAME|" -e
"s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ $(AM_V_GEN) PLUGINNAME=`echo $@ | sed 's,.service,,'` && sed -e "s|\@pluginname\@|$$PLUGINNAME|" -e
"s|\@libexecdir\@|$(libexecdir)|" $< > $@
-EXTRA_DIST = org.gnome.SettingsDaemon.Dummy.desktop.in gsd-dummy.service.in
+EXTRA_DIST = gsd-dummy.service.in
CLEANFILES = $(NULL)
diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am
index 01beab8..fe8507c 100644
--- a/plugins/housekeeping/Makefile.am
+++ b/plugins/housekeeping/Makefile.am
@@ -53,13 +53,6 @@ gsd_housekeeping_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(HOUSEKEEPING_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Housekeeping.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Housekeeping.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-housekeeping.service.in
unit_DATA = gsd-housekeeping.service
@@ -68,12 +61,9 @@ gsd-housekeeping.service: $(unit_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
EXTRA_DIST = \
- $(desktop_in_files) \
$(unit_in_files)
CLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA)
DISTCLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA)
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index 0036e95..fb66f54 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -27,13 +27,6 @@ gsd_keyboard_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(KEYBOARD_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Keyboard.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Keyboard.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-keyboard.service.in
unit_DATA = gsd-keyboard.service
@@ -42,16 +35,13 @@ gsd-keyboard.service: $(unit_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
EXTRA_DIST = \
- $(desktop_in_files) \
$(unit_in_files) \
$(NULL)
CLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA) \
$(NULL)
DISTCLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA) \
$(NULL)
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 1b26e5a..9647e33 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -27,13 +27,6 @@ shell-key-grabber.h: Makefile.am org.gnome.ShellKeyGrabber.xml
--c-namespace Shell \
$(srcdir)/org.gnome.ShellKeyGrabber.xml
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.MediaKeys.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.MediaKeys.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-media-keys.service.in
unit_DATA = gsd-media-keys.service
@@ -87,14 +80,11 @@ EXTRA_DIST = \
README.media-keys-API \
org.gnome.ShellKeyGrabber.xml \
$(plugin_in_files) \
- $(desktop_in_files) \
$(unit_in_files)
CLEANFILES = \
$(BUILT_SOURCES) \
- $(desktop_DATA) \
$(unit_DATA)
DISTCLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA)
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index 5f7fc34..d6f8427 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -1,12 +1,5 @@
plugin_name = mouse
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Mouse.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Mouse.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-mouse.service.in
unit_DATA = gsd-mouse.service
@@ -52,6 +45,6 @@ gsd_mouse_LDADD = \
$(MOUSE_LIBS) \
$(LIBM)
-EXTRA_DIST = $(desktop_in_files) $(unit_in_files)
-CLEANFILES = $(desktop_DATA) $(unit_DATA)
-DISTCLEANFILES = $(desktop_DATA) $(unit_DATA)
+EXTRA_DIST = $(unit_in_files)
+CLEANFILES = $(unit_DATA)
+DISTCLEANFILES = $(unit_DATA)
diff --git a/plugins/power/Makefile.am b/plugins/power/Makefile.am
index daff826..44327a4 100644
--- a/plugins/power/Makefile.am
+++ b/plugins/power/Makefile.am
@@ -2,13 +2,6 @@ BUILT_SOURCES =
plugin_name = power
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Power.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Power.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-power.service.in
unit_DATA = gsd-power.service
@@ -66,7 +59,6 @@ gsd_power_LDADD = \
$(LIBM)
EXTRA_DIST = \
- $(desktop_in_files) \
$(unit_in_files) \
$(gsd_backlight_helper_SOURCES) \
$(NULL)
@@ -132,7 +124,6 @@ clean-local:
rm -f *~
CLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA) \
org.gnome.settings-daemon.plugins.power.policy \
org.gnome.settings-daemon.plugins.power.policy.in \
diff --git a/plugins/print-notifications/Makefile.am b/plugins/print-notifications/Makefile.am
index 20cb81b..ba18adf 100644
--- a/plugins/print-notifications/Makefile.am
+++ b/plugins/print-notifications/Makefile.am
@@ -1,12 +1,5 @@
plugin_name = print-notifications
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.PrintNotifications.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.PrintNotifications.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-print-notifications.service.in
unit_DATA = gsd-print-notifications.service
@@ -55,13 +48,10 @@ gsd_print_notifications_LDADD = \
$(PRINT_NOTIFICATIONS_LIBS)
EXTRA_DIST = \
- $(desktop_in_files) \
$(unit_in_files)
CLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA)
DISTCLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA)
diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
index 91795de..df30f36 100644
--- a/plugins/rfkill/Makefile.am
+++ b/plugins/rfkill/Makefile.am
@@ -23,13 +23,6 @@ gsd_rfkill_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(RFKILL_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Rfkill.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
udevrulesdir = $(prefix)/lib/udev/rules.d
udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
@@ -40,6 +33,6 @@ unit_DATA = gsd-rfkill.service
gsd-rfkill.service: $(unit_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files) $(unit_in_files)
-CLEANFILES = $(desktop_DATA) $(unit_DATA)
-DISTCLEANFILES = $(desktop_DATA) $(unit_DATA)
+EXTRA_DIST = $(udevrules_DATA) $(unit_in_files)
+CLEANFILES = $(unit_DATA)
+DISTCLEANFILES = $(unit_DATA)
diff --git a/plugins/screensaver-proxy/Makefile.am b/plugins/screensaver-proxy/Makefile.am
index d07a482..2ccedf7 100644
--- a/plugins/screensaver-proxy/Makefile.am
+++ b/plugins/screensaver-proxy/Makefile.am
@@ -25,13 +25,6 @@ gsd_screensaver_proxy_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(SCREENSAVER_PROXY_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.ScreensaverProxy.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-screensaver-proxy.service.in
unit_DATA = gsd-screensaver-proxy.service
@@ -39,8 +32,8 @@ unit_DATA = gsd-screensaver-proxy.service
gsd-screensaver-proxy.service: $(unit_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-EXTRA_DIST = $(desktop_in_files) $(unit_in_files)
+EXTRA_DIST = $(unit_in_files)
-CLEANFILES = $(desktop_DATA) $(unit_DATA)
+CLEANFILES = $(unit_DATA)
-DISTCLEANFILES = $(desktop_DATA) $(unit_DATA)
+DISTCLEANFILES = $(unit_DATA)
diff --git a/plugins/sharing/Makefile.am b/plugins/sharing/Makefile.am
index 39cd433..a02a30c 100644
--- a/plugins/sharing/Makefile.am
+++ b/plugins/sharing/Makefile.am
@@ -21,13 +21,6 @@ gsd_sharing_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(SHARING_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Sharing.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Sharing.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-sharing.service.in
unit_DATA = gsd-sharing.service
@@ -35,6 +28,6 @@ unit_DATA = gsd-sharing.service
gsd-sharing.service: $(unit_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-EXTRA_DIST = $(desktop_in_files) $(unit_in_files)
-CLEANFILES = $(desktop_DATA) $(unit_DATA)
-DISTCLEANFILES = $(desktop_DATA) $(unit_DATA)
+EXTRA_DIST = $(unit_in_files)
+CLEANFILES = $(unit_DATA)
+DISTCLEANFILES = $(unit_DATA)
diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am
index 206c3d5..0b4303c 100644
--- a/plugins/smartcard/Makefile.am
+++ b/plugins/smartcard/Makefile.am
@@ -55,13 +55,6 @@ gsd_smartcard_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(SMARTCARD_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Smartcard.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Smartcard.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-smartcard.service.in
unit_DATA = gsd-smartcard.service
@@ -73,15 +66,12 @@ EXTRA_DIST = \
gsd-smartcard-enum-types.c.in \
gsd-smartcard-enum-types.h.in \
org.gnome.SettingsDaemon.Smartcard.xml \
- $(desktop_in_files) \
$(unit_in_files)
CLEANFILES = \
$(BUILT_SOURCES) \
- $(desktop_DATA) \
$(unit_DATA)
DISTCLEANFILES = \
$(BUILT_SOURCES) \
- $(desktop_DATA) \
$(unit_DATA)
diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am
index 371b318..197e2ef 100644
--- a/plugins/sound/Makefile.am
+++ b/plugins/sound/Makefile.am
@@ -20,13 +20,6 @@ gsd_sound_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(SOUND_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Sound.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Sound.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-sound.service.in
unit_DATA = gsd-sound.service
@@ -35,13 +28,10 @@ gsd-sound.service: $(unit_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
EXTRA_DIST = \
- $(desktop_in_files) \
$(unit_in_Files)
CLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA)
DISTCLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA)
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am
index 687f99a..29ffaa9 100644
--- a/plugins/wacom/Makefile.am
+++ b/plugins/wacom/Makefile.am
@@ -59,13 +59,6 @@ gsd_wacom_LDADD = \
$(WACOM_LIBS) \
$(LIBM)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.Wacom.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.Wacom.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-wacom.service.in
unit_DATA = gsd-wacom.service
@@ -73,9 +66,8 @@ unit_DATA = gsd-wacom.service
gsd-wacom.service: $(unit_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-EXTRA_DIST += $(desktop_in_files) $(unit_in_files)
+EXTRA_DIST += $(unit_in_files)
CLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA) \
org.gnome.settings-daemon.plugins.wacom.policy \
org.gnome.settings-daemon.plugins.wacom.policy.in
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index 54b0c91..a9e81bc 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -86,13 +86,6 @@ gsd_xsettings_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(XSETTINGS_LIBS)
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = org.gnome.SettingsDaemon.XSettings.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-org.gnome.SettingsDaemon.XSettings.desktop: $(desktop_in_files) Makefile
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
unitdir = $(systemduserunitdir)
unit_in_files = gsd-xsettings.service.in
unit_DATA = gsd-xsettings.service
@@ -102,16 +95,13 @@ gsd-xsettings.service: $(unit_in_files) Makefile
EXTRA_DIST = \
README.xsettings \
- $(desktop_in_files) \
$(unit_in_Files) \
$(NULL)
CLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA) \
$(NULL)
DISTCLEANFILES = \
- $(desktop_DATA) \
$(unit_DATA) \
$(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
