diff options
| author | infirit <[email protected]> | 2015-09-06 20:43:52 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-06 20:43:52 +0200 |
| commit | d2c557097250a57ce81281a6113bcbe417bad0ee (patch) | |
| tree | b2cc173eb2b816339ed26fe03dda0aef8366ab11 /libmatekbd/Makefile.am | |
| parent | a347557efb5420776083fe83fe0e8cb626187615 (diff) | |
| download | libmatekbd-d2c557097250a57ce81281a6113bcbe417bad0ee.tar.bz2 libmatekbd-d2c557097250a57ce81281a6113bcbe417bad0ee.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 'libmatekbd/Makefile.am')
| -rw-r--r-- | libmatekbd/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmatekbd/Makefile.am b/libmatekbd/Makefile.am index f94ae7c..a6a0a06 100644 --- a/libmatekbd/Makefile.am +++ b/libmatekbd/Makefile.am @@ -75,20 +75,20 @@ noinst_HEADERS = $(extra_nih) \ matekbd-config-private.h @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.peripherals-keyboard-xkb.gschema.xml +gsettingsschema_in_files = org.mate.peripherals-keyboard-xkb.gschema.xml.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^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - convertdir = $(datadir)/MateConf/gsettings convert_DATA = matekbd.convert EXTRA_DIST = matekbd-indicator-marshal.list \ matekbd-keyboard-drawing-marshal.list \ - $(gsettings_SCHEMAS).in.in $(convert_DATA) $(ui_DATA) + $(gsettingsschema_in_files) \ + $(convert_DATA) \ + $(ui_DATA) -DISTCLEANFILES = $(gsettings_SCHEMAS).in $(gsettings_SCHEMAS) +DISTCLEANFILES = $(gsettings_SCHEMAS) GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0) |