[gnome-flashback] data: stop translating *.session files and move into subdir

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

commit 586c4ac06fffba131b0e69a97ef6d2965229f2fb
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Sep 14 18:37:02 2015 +0300

    data: stop translating *.session files and move into subdir
    
    These files are used by gnome-session and it does not even read
    Name from *.session file.

 configure.ac                                       |    1 +
 data/Makefile.am                                   |   13 ++++---------
 data/sessions/Makefile.am                          |   13 +++++++++++++
 .../gnome-flashback-compiz.session}                |    0
 .../gnome-flashback-metacity.session}              |    0
 po/POTFILES.in                                     |    2 --
 6 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ecd6872..ca9bd43 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/sessions/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 f5a584a..b4bc637 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,9 @@
 NULL =
 
+SUBDIRS = \
+       sessions \
+       $(NULL)
+
 libexec_SCRIPTS = \
        gnome-flashback-compiz \
        gnome-flashback-metacity \
@@ -16,13 +20,6 @@ gnome-flashback-metacity: Makefile
 menudir   = $(sysconfdir)/xdg/menus
 menu_DATA = gnome-flashback-applications.menu
 
-sessiondir       = $(datadir)/gnome-session/sessions
-session_in_files = gnome-flashback-compiz.session.in gnome-flashback-metacity.session.in
-session_DATA     = $(session_in_files:.session.in=.session)
-
-%.session: %.session.in
-       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $ -t -d $(top_srcdir)/po && mv $ -t $@
-
 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)
@@ -60,7 +57,6 @@ EXTRA_DIST = \
        $(autostart_in_files) \
        $(desktop_in_files) \
        $(menu_DATA) \
-       $(session_in_files) \
        $(xsession_in_in_files) \
        $(gsettings_SCHEMAS) \
        $(directory_in_files) \
@@ -71,7 +67,6 @@ CLEANFILES = \
        $(desktop_DATA) \
        gnome-flashback-compiz \
        gnome-flashback-metacity \
-       $(session_DATA) \
        $(xsession_in_files) \
        $(xsession_DATA) \
        *.gschema.valid \
diff --git a/data/sessions/Makefile.am b/data/sessions/Makefile.am
new file mode 100644
index 0000000..848f5d5
--- /dev/null
+++ b/data/sessions/Makefile.am
@@ -0,0 +1,13 @@
+NULL =
+
+sessiondir = $(datadir)/gnome-session/sessions
+session_DATA = \
+       gnome-flashback-compiz.session \
+       gnome-flashback-metacity.session \
+       $(NULL)
+
+EXTRA_DIST = \
+       $(session_DATA) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/gnome-flashback-compiz.session.in b/data/sessions/gnome-flashback-compiz.session
similarity index 100%
rename from data/gnome-flashback-compiz.session.in
rename to data/sessions/gnome-flashback-compiz.session
diff --git a/data/gnome-flashback-metacity.session.in b/data/sessions/gnome-flashback-metacity.session
similarity index 100%
rename from data/gnome-flashback-metacity.session.in
rename to data/sessions/gnome-flashback-metacity.session
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a8c5900..3593f01 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,10 +2,8 @@
 # Please keep this file sorted alphabetically.
 data/gnome-flashback.desktop.in
 data/gnome-flashback-compiz.desktop.in.in
-data/gnome-flashback-compiz.session.in
 data/gnome-flashback-init.desktop.in
 data/gnome-flashback-metacity.desktop.in.in
-data/gnome-flashback-metacity.session.in
 data/gnome-flashback-nm-applet.desktop.in
 data/gnome-flashback-screensaver.desktop.in
 data/org.gnome.gnome-flashback.gschema.xml