[gnome-session] data: put wayland session in its own directory

[Ray Strode <halfline src gnome org>]

commit c3434d502b247aba002cd1751b1df725121e77ff
Author: Ray Strode <rstrode redhat com>
Date:   Mon Sep 23 12:20:14 2013 -0400

    data: put wayland session in its own directory
    
    Right now, display managers look for sessions in /usr/share/xsessions.
    
    We stuff gnome-shell-wayland.desktop there and then that entry shows up
    in the display manager session list.  It won't work, since the display
    manager doesn't support launching wayland, though.
    
    This commit moves it to /usr/share/wayland-sessions so that display
    managers can 'opt in' to showing wayland sessions, once they support
    them.
    
    This breaks hardcode freeze.
    
    Approved-By: Matthias Clasen <mclasen redhat com>
    Approved-By: Javier Jardón <jjardon gnome org>

 data/Makefile.am |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 8fe963d..524cc6e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,7 +12,7 @@ hwcompatdir = $(pkgdatadir)
 hwcompat_DATA = hardware-compatibility
 
 xsessiondir = $(datadir)/xsessions
-xsession_in_files = gnome.desktop.in gnome-wayland.desktop.in
+xsession_in_files = gnome.desktop.in
 
 if BUILD_SESSION_SELECTOR
 xsession_in_files += gnome-custom-session.desktop.in
@@ -20,6 +20,10 @@ endif
 
 xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
 
+wayland_sessiondir = $(datadir)/wayland-sessions
+wayland_session_in_files = gnome-wayland.desktop.in
+wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop)
+
 desktopdir = $(datadir)/applications
 desktop_in_files = gnome-session-properties.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -48,6 +52,7 @@ dist_migration_DATA = gnome-session.convert
 EXTRA_DIST =                                   \
        $(xsession_in_files)                    \
        $(session_in_in_files)                  \
+       $(wayland_session_in_files)             \
        $(gsettings_SCHEMAS:.xml=.xml.in)       \
        session-selector.ui                     \
        gnome-custom-session.desktop.in         \
@@ -57,11 +62,13 @@ EXTRA_DIST =                                        \
 CLEANFILES =                                   \
        $(gsettings_SCHEMAS)                    \
        $(xsession_DATA)                        \
+       $(wayland_session_DATA)                 \
        $(desktop_DATA)                         \
        $(session_DATA)
 
 DISTCLEANFILES =                               \
        $(gsettings_SCHEMAS)                    \
-       $(desktop_in_files)
+       $(desktop_in_files)                     \
+       $(wayland_session_in_files)
 
 -include $(top_srcdir)/git.mk