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

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

commit b7f9b15fd32c85ef23369ec9784bab063484b41a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Sep 14 18:50:43 2015 +0300

    data: move xsession files to subdir

 configure.ac                                       |    1 +
 data/Makefile.am                                   |   12 +--------
 data/xsessions/Makefile.am                         |   28 ++++++++++++++++++++
 .../gnome-flashback-compiz.desktop.in.in           |    0
 .../gnome-flashback-metacity.desktop.in.in         |    0
 po/POTFILES.in                                     |    4 +-
 6 files changed, 32 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ca9bd43..ca8f448 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,7 @@ AC_CONFIG_FILES([
 Makefile
 data/Makefile
 data/sessions/Makefile
+data/xsessions/Makefile
 gnome-flashback/Makefile
 gnome-flashback/libautomount-manager/Makefile
 gnome-flashback/libbluetooth-applet/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index b4bc637..99a1a8f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,6 +2,7 @@ NULL =
 
 SUBDIRS = \
        sessions \
+       xsessions \
        $(NULL)
 
 libexec_SCRIPTS = \
@@ -28,14 +29,6 @@ desktopdir       = $(datadir)/applications
 desktop_in_files = gnome-flashback.desktop.in gnome-flashback-init.desktop.in
 desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 
-xsessiondir          = $(datadir)/xsessions
-xsession_in_in_files = gnome-flashback-compiz.desktop.in.in gnome-flashback-metacity.desktop.in.in
-xsession_in_files    = gnome-flashback-compiz.desktop.in gnome-flashback-metacity.desktop.in
-xsession_DATA        = $(xsession_in_files:.desktop.in=.desktop)
-
-%.desktop.in: %.desktop.in.in
-       $(AM_V_GEN) sed -e 's,[ ]libexecdir[@],$(libexecdir),g' < $< > $@
-
 %.desktop: %.desktop.in
        $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $ -t -d $(top_srcdir)/po && mv $ -t $@
 
@@ -57,7 +50,6 @@ EXTRA_DIST = \
        $(autostart_in_files) \
        $(desktop_in_files) \
        $(menu_DATA) \
-       $(xsession_in_in_files) \
        $(gsettings_SCHEMAS) \
        $(directory_in_files) \
        $(NULL)
@@ -67,8 +59,6 @@ CLEANFILES = \
        $(desktop_DATA) \
        gnome-flashback-compiz \
        gnome-flashback-metacity \
-       $(xsession_in_files) \
-       $(xsession_DATA) \
        *.gschema.valid \
        $(directory_DATA) \
        $(NULL)
diff --git a/data/xsessions/Makefile.am b/data/xsessions/Makefile.am
new file mode 100644
index 0000000..5e36dbd
--- /dev/null
+++ b/data/xsessions/Makefile.am
@@ -0,0 +1,28 @@
+NULL =
+
+xsession_in_in_files = \
+       gnome-flashback-compiz.desktop.in.in \
+       gnome-flashback-metacity.desktop.in.in \
+       $(NULL)
+
+xsessiondir = $(datadir)/xsessions
+xsession_in_files = $(xsession_in_in_files:.desktop.in.in=.desktop.in)
+xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
+
+%.desktop.in: %.desktop.in.in
+       $(AM_V_GEN) sed -e 's,[ ]libexecdir[@],$(libexecdir),g' < $< > $@
+
+%.desktop: %.desktop.in
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $ -t \
+               -d $(top_srcdir)/po && mv $ -t $@
+
+EXTRA_DIST = \
+       $(xsession_in_in_files) \
+       $(NULL)
+
+CLEANFILES = \
+       $(xsession_in_files) \
+       $(xsession_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/gnome-flashback-compiz.desktop.in.in b/data/xsessions/gnome-flashback-compiz.desktop.in.in
similarity index 100%
rename from data/gnome-flashback-compiz.desktop.in.in
rename to data/xsessions/gnome-flashback-compiz.desktop.in.in
diff --git a/data/gnome-flashback-metacity.desktop.in.in 
b/data/xsessions/gnome-flashback-metacity.desktop.in.in
similarity index 100%
rename from data/gnome-flashback-metacity.desktop.in.in
rename to data/xsessions/gnome-flashback-metacity.desktop.in.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3593f01..bb273e5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,14 +1,14 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 data/gnome-flashback.desktop.in
-data/gnome-flashback-compiz.desktop.in.in
 data/gnome-flashback-init.desktop.in
-data/gnome-flashback-metacity.desktop.in.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/xsessions/gnome-flashback-compiz.desktop.in.in
+data/xsessions/gnome-flashback-metacity.desktop.in.in
 gnome-flashback/gf-main.c
 gnome-flashback/libautomount-manager/gsd-automount-manager.c
 gnome-flashback/libautomount-manager/gsd-autorun.c