[gnome-flashback] move gschema file from data to gnome-flashback

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

commit 8c1db3f9e21d6c1feb8b1789ebc432c0bae90e93
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Aug 28 20:12:08 2014 +0300

    move gschema file from data to gnome-flashback

 data/Makefile.am                                   |   19 ++-----------------
 gnome-flashback/Makefile.am                        |   17 ++++++++++++++++-
 .../org.gnome.gnome-flashback.gschema.xml.in.in    |    0
 po/POTFILES.in                                     |    2 +-
 po/POTFILES.skip                                   |    2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index edd0a6f..a51fb8b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,27 +10,12 @@ xsession_DATA     = $(xsession_in_files:.desktop.in=.desktop)
 
 %.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d 
-u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
- INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in_in = org.gnome.gnome-flashback.gschema.xml.in.in
-gsettings_schemas_in    = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS       = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-       $(AM_V_GEN) $(SED) -e 's^\ GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
- GSETTINGS_RULES@
-
 EXTRA_DIST = \
        $(session_in_files) \
-       $(xsession_in_files) \
-       $(gsettings_schemas_in_in)
+       $(xsession_in_files)
 
 CLEANFILES = \
        $(session_DATA) \
-       $(xsession_DATA) \
-       $(gsettings_schemas_in) \
-       $(gsettings_SCHEMAS) \
-       *.gschema.valid
+       $(xsession_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/gnome-flashback/Makefile.am b/gnome-flashback/Makefile.am
index 29f941e..e29890d 100644
--- a/gnome-flashback/Makefile.am
+++ b/gnome-flashback/Makefile.am
@@ -80,8 +80,20 @@ BUILT_SOURCES = \
        flashback-resources.c \
        flashback-resources.h
 
+ INTLTOOL_XML_NOMERGE_RULE@
+
+gsettings_schemas_in_in = org.gnome.gnome-flashback.gschema.xml.in.in
+gsettings_schemas_in    = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
+gsettings_SCHEMAS       = $(gsettings_schemas_in:.xml.in=.xml)
+
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+       $(AM_V_GEN) $(SED) -e 's^\ GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
+
+ GSETTINGS_RULES@
+
 EXTRA_DIST = \
        $(desktop_in_files) \
+       $(gsettings_schemas_in_in) \
        org.gnome.SessionManager.EndSessionDialog.xml \
        org.gnome.Mutter.DisplayConfig.xml \
        org.gnome.Mutter.IdleMonitor.xml \
@@ -90,6 +102,9 @@ EXTRA_DIST = \
 
 CLEANFILES = \
        $(desktop_DATA) \
-       $(BUILT_SOURCES)
+       $(BUILT_SOURCES) \
+       $(gsettings_schemas_in) \
+       $(gsettings_SCHEMAS) \
+       *.gschema.valid
 
 -include $(top_srcdir)/git.mk
diff --git a/data/org.gnome.gnome-flashback.gschema.xml.in.in 
b/gnome-flashback/org.gnome.gnome-flashback.gschema.xml.in.in
similarity index 100%
rename from data/org.gnome.gnome-flashback.gschema.xml.in.in
rename to gnome-flashback/org.gnome.gnome-flashback.gschema.xml.in.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 162f6ee..c600604 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,7 @@ data/gnome-flashback-compiz.desktop.in
 data/gnome-flashback-compiz.session.in
 data/gnome-flashback-metacity.desktop.in
 data/gnome-flashback-metacity.session.in
-data/org.gnome.gnome-flashback.gschema.xml.in.in
 gnome-flashback/flashback-inhibit-dialog.c
 [type: gettext/glade]gnome-flashback/flashback-inhibit-dialog.ui
 gnome-flashback/gnome-flashback.desktop.in
+gnome-flashback/org.gnome.gnome-flashback.gschema.xml.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 9cf303e..06e8e8c 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,3 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
-data/org.gnome.gnome-flashback.gschema.xml.in
+gnome-flashback/org.gnome.gnome-flashback.gschema.xml.in