From ddf66032a7375c70befe4a0d72ba04d7bc6b0f15 Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 8 Sep 2015 12:39:43 +0200 Subject: Rework gsettings schema building * Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files --- maximus/Makefile.am | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'maximus/Makefile.am') diff --git a/maximus/Makefile.am b/maximus/Makefile.am index b1994a4..3326b6b 100644 --- a/maximus/Makefile.am +++ b/maximus/Makefile.am @@ -31,14 +31,11 @@ mate_maximus_SOURCES = \ xutils.h @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.maximus.gschema.xml +gsettingsschema_in_files = org.mate.maximus.gschema.xml.in -gsettings_SCHEMAS_in_in = $(gsettings_SCHEMAS:.xml=.xml.in.in) +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - convertdir = $(datadir)/MateConf/gsettings convert_DATA = mate-maximus.convert @@ -47,8 +44,6 @@ dist_desktop_DATA=mate-maximus-autostart.desktop man_MANS = mate-maximus.1 -CLEANFILES = $(gsettings_SCHEMAS) \ - $(gsettings_SCHEMAS_in) - +CLEANFILES = $(gsettings_SCHEMAS) *.gschema.valid -EXTRA_DIST = $(gsettings_SCHEMAS_in_in) $(convert_DATA) $(man_MANS) +EXTRA_DIST = $(gsettingsschema_in_files) $(convert_DATA) $(man_MANS) -- cgit v1.2.1