[gnome-flashback] data: move autostart files to subdir

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 561066637a5f48fa8aa5fb77edacd5b422fb572b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Sep 14 19:07:25 2015 +0300

    data: move autostart files to subdir

 configure.ac                                       |    1 +
 data/Makefile.am                                   |    7 +-----
 data/autostart/Makefile.am                         |   23 ++++++++++++++++++++
 .../gnome-flashback-nm-applet.desktop.in           |    0
 .../gnome-flashback-screensaver.desktop.in         |    0
 po/POTFILES.in                                     |    4 +-
 6 files changed, 27 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ca8f448..1c70767 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,7 @@ PKG_CHECK_EXISTS([xrandr >= 1.5.0], AC_DEFINE([HAVE_XRANDR15], [1], [Define if y
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
+data/autostart/Makefile
 data/sessions/Makefile
 data/xsessions/Makefile
 gnome-flashback/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 99a1a8f..35a8b6e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,7 @@
 NULL =
 
 SUBDIRS = \
+       autostart \
        sessions \
        xsessions \
        $(NULL)
@@ -21,10 +22,6 @@ gnome-flashback-metacity: Makefile
 menudir   = $(sysconfdir)/xdg/menus
 menu_DATA = gnome-flashback-applications.menu
 
-autostartdir       = $(sysconfdir)/xdg/autostart
-autostart_in_files = gnome-flashback-nm-applet.desktop.in gnome-flashback-screensaver.desktop.in
-autostart_DATA     = $(autostart_in_files:.desktop.in=.desktop)
-
 desktopdir       = $(datadir)/applications
 desktop_in_files = gnome-flashback.desktop.in gnome-flashback-init.desktop.in
 desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
@@ -47,7 +44,6 @@ gsettings_SCHEMAS = org.gnome.gnome-flashback.gschema.xml
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-       $(autostart_in_files) \
        $(desktop_in_files) \
        $(menu_DATA) \
        $(gsettings_SCHEMAS) \
@@ -55,7 +51,6 @@ EXTRA_DIST = \
        $(NULL)
 
 CLEANFILES = \
-       $(autostart_DATA) \
        $(desktop_DATA) \
        gnome-flashback-compiz \
        gnome-flashback-metacity \
diff --git a/data/autostart/Makefile.am b/data/autostart/Makefile.am
new file mode 100644
index 0000000..bbf804c
--- /dev/null
+++ b/data/autostart/Makefile.am
@@ -0,0 +1,23 @@
+NULL =
+
+autostart_in_files = \
+       gnome-flashback-nm-applet.desktop.in \
+       gnome-flashback-screensaver.desktop.in \
+       $(NULL)
+
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+
+%.desktop: %.desktop.in
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $ -t \
+               -d $(top_srcdir)/po && mv $ -t $@
+
+EXTRA_DIST = \
+       $(autostart_in_files) \
+       $(NULL)
+
+CLEANFILES = \
+       $(autostart_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/gnome-flashback-nm-applet.desktop.in b/data/autostart/gnome-flashback-nm-applet.desktop.in
similarity index 100%
rename from data/gnome-flashback-nm-applet.desktop.in
rename to data/autostart/gnome-flashback-nm-applet.desktop.in
diff --git a/data/gnome-flashback-screensaver.desktop.in 
b/data/autostart/gnome-flashback-screensaver.desktop.in
similarity index 100%
rename from data/gnome-flashback-screensaver.desktop.in
rename to data/autostart/gnome-flashback-screensaver.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bb273e5..73ae43b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,11 +2,11 @@
 # Please keep this file sorted alphabetically.
 data/gnome-flashback.desktop.in
 data/gnome-flashback-init.desktop.in
-data/gnome-flashback-nm-applet.desktop.in
-data/gnome-flashback-screensaver.desktop.in
 data/org.gnome.gnome-flashback.gschema.xml
 data/X-GNOME-Flashback-Settings.directory.desktop.in
 data/X-GNOME-Flashback-Settings-System.directory.desktop.in
+data/autostart/gnome-flashback-nm-applet.desktop.in
+data/autostart/gnome-flashback-screensaver.desktop.in
 data/xsessions/gnome-flashback-compiz.desktop.in.in
 data/xsessions/gnome-flashback-metacity.desktop.in.in
 gnome-flashback/gf-main.c