[gnome-flashback] data: move directory files to subdir

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

commit 3c614669a6d2644f005c2e29b0cee1a8202bf358
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Sep 14 19:25:54 2015 +0300

    data: move directory files to subdir

 configure.ac                                       |    1 +
 data/Makefile.am                                   |   14 +-----------
 data/directories/Makefile.am                       |   23 ++++++++++++++++++++
 ...-Flashback-Settings-System.directory.desktop.in |    0
 ...X-GNOME-Flashback-Settings.directory.desktop.in |    2 +-
 po/POTFILES.in                                     |    4 +-
 6 files changed, 28 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 004326b..347f00c 100644
--- a/configure.ac
+++ b/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
diff --git a/data/Makefile.am b/data/Makefile.am
index df1c32e..909661b 100644
--- a/data/Makefile.am
+++ b/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
diff --git a/data/directories/Makefile.am b/data/directories/Makefile.am
new file mode 100644
index 0000000..f8d2870
--- /dev/null
+++ b/data/directories/Makefile.am
@@ -0,0 +1,23 @@
+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
diff --git a/data/X-GNOME-Flashback-Settings-System.directory.desktop.in 
b/data/directories/X-GNOME-Flashback-Settings-System.directory.desktop.in
similarity index 100%
rename from data/X-GNOME-Flashback-Settings-System.directory.desktop.in
rename to data/directories/X-GNOME-Flashback-Settings-System.directory.desktop.in
diff --git a/data/X-GNOME-Flashback-Settings.directory.desktop.in 
b/data/directories/X-GNOME-Flashback-Settings.directory.desktop.in
similarity index 100%
rename from data/X-GNOME-Flashback-Settings.directory.desktop.in
rename to data/directories/X-GNOME-Flashback-Settings.directory.desktop.in
index ed1a087..35e9b82 100644
--- a/data/X-GNOME-Flashback-Settings.directory.desktop.in
+++ b/data/directories/X-GNOME-Flashback-Settings.directory.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
+Type=Directory
 Name=Preferences
 Comment=Personal preferences
 Icon=preferences-desktop
-Type=Directory
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 64b8720..4ef1912 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,12 @@
 # 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