Commit 66b2bb58 authored by Debarshi Ray's avatar Debarshi Ray

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 34093e8e, 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 34093e8e
parent 1f069d27
......@@ -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
......
......@@ -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 *~
......
[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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment