diff options
| author | infirit <[email protected]> | 2015-09-08 11:51:41 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-08 11:51:41 +0200 |
| commit | bcf861f9a00d1e6e67616eee898291e1ed6cca36 (patch) | |
| tree | eb569b16b4caa5a2b5cd3ef8d34741b2ad085af9 /Makefile.am | |
| parent | 57026bf522ee80d8fc3710ca33da73ff103f98c3 (diff) | |
| download | mate-control-center-bcf861f9a00d1e6e67616eee898291e1ed6cca36.tar.bz2 mate-control-center-bcf861f9a00d1e6e67616eee898291e1ed6cca36.tar.xz | |
Rework gsettings schema building
* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 4feaf0ba..58d51686 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,13 +14,12 @@ SUBDIRS += typing-break endif @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = \ - org.mate.control-center.gschema.xml \ - org.mate.control-center.keybinding.gschema.xml -@GSETTINGS_RULES@ +gsettingsschema_in_files = \ + org.mate.control-center.gschema.xml.in \ + org.mate.control-center.keybinding.gschema.xml.in -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) +@GSETTINGS_RULES@ convertdir = $(datadir)/MateConf/gsettings convert_DATA = mate-control-center.convert @@ -28,7 +27,6 @@ convert_DATA = mate-control-center.convert ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} CLEANFILES = \ - $(gsettings_SCHEMAS_in) \ $(gsettings_SCHEMAS) \ *.gschema.valid @@ -53,8 +51,7 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ autogen.sh \ - org.mate.control-center.gschema.xml.in.in \ - org.mate.control-center.keybinding.gschema.xml.in.in \ + $(gsettingsschema_in_files) \ $(convert_DATA) DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb |