data: move xsession files to subdir

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

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)

data/xsessions/Makefile.am

+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

po/POTFILES.in

 # 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