[gnome-online-accounts] build: Fix the Makefile rules for the GSettings schema

[Debarshi Ray <debarshir src gnome org>]

commit 66b2bb58650cde71949e3deba1bfb02004e826ad
Author: Debarshi Ray <debarshir gnome org>
Date:   Thu Oct 26 17:52:35 2017 +0200

    build: Fix the Makefile rules for the GSettings schema
    
    There's no need for the extra *.in indirection with intltool >= 0.50.1.
    That's what commit 34093e8e1f9621e3, where the schema was introduced,
    intended to do but somehow didn't end up doing.
    
    The use of INTLTOOL_XML_RULE was completely needless. It is meant for
    merging translations back into appdata and desktop files, but that's
    not the case for GSettings schemas. Like code, those translations are
    fetched at runtime.
    
    Fallout from 34093e8e1f9621e35783d8426e3ea1ddd030432a

 configure.ac                                       |    1 -
 data/Makefile.am                                   |   10 ++--------
 ...ml.in => org.gnome.online-accounts.gschema.xml} |    0
 po/POTFILES.in                                     |    2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b7e6544..94876aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -566,7 +566,6 @@ data/icons/32x32/Makefile
 data/icons/48x48/Makefile
 data/icons/96x96/Makefile
 data/icons/256x256/Makefile
-data/org.gnome.online-accounts.gschema.xml
 src/Makefile
 src/goa/Makefile
 src/goa/goa-1.0.pc
diff --git a/data/Makefile.am b/data/Makefile.am
index 0c32a0b..286dcd0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,11 +3,9 @@ NULL =
 
 SUBDIRS = icons
 
-gsettings_in_files = org.gnome.online-accounts.gschema.xml.in
+gsettings_SCHEMAS = org.gnome.online-accounts.gschema.xml
 
 if BUILD_BACKEND
-gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
 @GSETTINGS_RULES@
 
 servicedir       = $(datadir)/dbus-1/services
@@ -23,7 +21,7 @@ service_DATA     = $(service_in_files:.service.in=.service)
 endif
 
 EXTRA_DIST =                                           \
-       $(gsettings_in_files)                           \
+       $(gsettings_SCHEMAS)                            \
        dbus-interfaces.xml                             \
        org.gnome.Identity.service.in                   \
        org.gnome.OnlineAccounts.service.in             \
@@ -34,10 +32,6 @@ CLEANFILES =                                         \
        org.gnome.Identity.service                      \
        $(NULL)
 
-DISTCLEANFILES =                                       \
-       $(gsettings_SCHEMAS)                            \
-       $(NULL)
-
 clean-local :
        rm -f *~
 
diff --git a/data/org.gnome.online-accounts.gschema.xml.in b/data/org.gnome.online-accounts.gschema.xml
similarity index 100%
rename from data/org.gnome.online-accounts.gschema.xml.in
rename to data/org.gnome.online-accounts.gschema.xml
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e5a35ca..1d8d13c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 [encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/org.gnome.online-accounts.gschema.xml.in
+data/org.gnome.online-accounts.gschema.xml
 src/daemon/goadaemon.c
 src/goabackend/goaewsclient.c
 src/goabackend/goaexchangeprovider.c