data: move directory files to subdir

configure.ac

@@ -108,6 +108,7 @@ Makefile
 data/Makefile
 data/applications/Makefile
 data/autostart/Makefile
+data/directories/Makefile
 data/sessions/Makefile
 data/xsessions/Makefile
 gnome-flashback/Makefile

data/Makefile.am

@@ -3,6 +3,7 @@ NULL =
 SUBDIRS = \
 	applications \
 	autostart \
+	directories \
 	sessions \
 	xsessions \
 	$(NULL)
@@ -23,31 +24,18 @@ gnome-flashback-metacity: Makefile
 menudir   = $(sysconfdir)/xdg/menus
 menu_DATA = gnome-flashback-applications.menu
 
-directorydir = $(datadir)/desktop-directories
-
-directory_in_files =					\
-	X-GNOME-Flashback-Settings.directory.desktop.in		\
-	X-GNOME-Flashback-Settings-System.directory.desktop.in
-
-directory_DATA = $(directory_in_files:.directory.desktop.in=.directory)
-
-%.directory: %.directory.desktop.in
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t -d $(top_srcdir)/po && mv $@-t $@
-
 gsettings_SCHEMAS = org.gnome.gnome-flashback.gschema.xml
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
 	$(menu_DATA) \
 	$(gsettings_SCHEMAS) \
-	$(directory_in_files) \
 	$(NULL)
 
 CLEANFILES = \
 	gnome-flashback-compiz \
 	gnome-flashback-metacity \
 	*.gschema.valid \
-	$(directory_DATA) \
 	$(NULL)
 
 -include $(top_srcdir)/git.mk

data/directories/Makefile.am

+NULL =
+
+directory_in_files = \
+	X-GNOME-Flashback-Settings.directory.desktop.in \
+	X-GNOME-Flashback-Settings-System.directory.desktop.in \
+	$(NULL)
+
+directorydir = $(datadir)/desktop-directories
+directory_DATA = $(directory_in_files:.directory.desktop.in=.directory)
+
+%.directory: %.directory.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t \
+		-d $(top_srcdir)/po && mv $@-t $@
+
+EXTRA_DIST = \
+	$(directory_in_files) \
+	$(NULL)
+
+CLEANFILES = \
+	$(directory_DATA) \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk

data/X-GNOME-Flashback-Settings.directory.desktop.in → data/directories/X-GNOME-Flashback-Settings.directory.desktop.in

 [Desktop Entry]
+Type=Directory
 Name=Preferences
 Comment=Personal preferences
 Icon=preferences-desktop
-Type=Directory

po/POTFILES.in

 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 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/applications/gnome-flashback.desktop.in
 data/applications/gnome-flashback-init.desktop.in
 data/autostart/gnome-flashback-nm-applet.desktop.in
 data/autostart/gnome-flashback-screensaver.desktop.in
+data/directories/X-GNOME-Flashback-Settings.directory.desktop.in
+data/directories/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