data: move autostart files to subdir

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

data/Makefile.am

 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 \

data/autostart/Makefile.am

+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

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