From ca8ca6923e74bb307bfe6c99c691399987eda7ed Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 8 Sep 2015 17:19:30 +0200 Subject: Rework gsettings schema building * Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files --- plugins/filebrowser/Makefile.am | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'plugins/filebrowser/Makefile.am') diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am index 2124904c..3b494cdf 100644 --- a/plugins/filebrowser/Makefile.am +++ b/plugins/filebrowser/Makefile.am @@ -66,17 +66,14 @@ pluma-file-browser-marshal.c: pluma-file-browser-marshal.list $(GLIB_GENMARSHAL) plugin_DATA = $(plugin_in_files:.pluma-plugin.desktop.in=.pluma-plugin) @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.pluma.plugins.filebrowser.gschema.xml +filebrowser_gschema_in = org.mate.pluma.plugins.filebrowser.gschema.xml.in +gsettings_SCHEMAS = $(filebrowser_gschema_in:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - - EXTRA_DIST = \ $(ui_DATA) \ $(plugin_in_files) \ - $(gsettings_SCHEMAS).in.in \ + $(filebrowser_gschema_in) \ pluma-file-browser-enum-types.h.template \ pluma-file-browser-enum-types.c.template \ pluma-file-browser-enum-register.c.template \ -- cgit v1.2.1