aboutsummaryrefslogtreecommitdiffstats
path: root/data/Makefile.am
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-23 20:17:49 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-23 21:06:48 +0800
commit9f2b7eb8484ed134431a526b651dbf1627da6342 (patch)
tree8b941bde01549568b29bcbbde06779ebac1cdb0e /data/Makefile.am
parentd710f1ef048c2eb98d6cb93186947c966d82ad58 (diff)
downloadgsoc2013-empathy-9f2b7eb8484ed134431a526b651dbf1627da6342.tar
gsoc2013-empathy-9f2b7eb8484ed134431a526b651dbf1627da6342.tar.gz
gsoc2013-empathy-9f2b7eb8484ed134431a526b651dbf1627da6342.tar.bz2
gsoc2013-empathy-9f2b7eb8484ed134431a526b651dbf1627da6342.tar.lz
gsoc2013-empathy-9f2b7eb8484ed134431a526b651dbf1627da6342.tar.xz
gsoc2013-empathy-9f2b7eb8484ed134431a526b651dbf1627da6342.tar.zst
gsoc2013-empathy-9f2b7eb8484ed134431a526b651dbf1627da6342.zip
Stop generating gschema from .in file
intltool now supports translating gschema files properly so we don't need to do this crack any more. https://bugzilla.gnome.org/show_bug.cgi?id=672619
Diffstat (limited to 'data/Makefile.am')
-rw-r--r--data/Makefile.am8
1 files changed, 2 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index a2be750cf..9a2dd880f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,11 +8,7 @@ desktop_in_files = \
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-gsettings_files = \
- org.gnome.Empathy.gschema.xml.in \
- $(NULL)
-gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml)
-@INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.Empathy.gschema.xml
@GSETTINGS_RULES@
# We need to compile schemas at make time
@@ -81,7 +77,7 @@ EXTRA_DIST = \
$(html_DATA) \
$(clientfile_DATA) \
$(servicefile_in_files) \
- $(gsettings_files) \
+ $(gsettings_SCHEMAS) \
$(NULL)
DISTCLEANFILES = \