diff options
author | infirit <[email protected]> | 2015-09-08 12:27:48 +0200 |
---|---|---|
committer | infirit <[email protected]> | 2015-09-08 12:27:48 +0200 |
commit | cec1b15a7cc94fd9dd935397e8bd4aa4bacdf48b (patch) | |
tree | f7d8cc0eb9ce11f0915e642aa1a56b3f9f712964 /schemas/Makefile.am | |
parent | afe549d385eeb99f00d15d19298fa25b3bec40e7 (diff) | |
download | mate-desktop-cec1b15a7cc94fd9dd935397e8bd4aa4bacdf48b.tar.bz2 mate-desktop-cec1b15a7cc94fd9dd935397e8bd4aa4bacdf48b.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 'schemas/Makefile.am')
-rw-r--r-- | schemas/Makefile.am | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/schemas/Makefile.am b/schemas/Makefile.am index 14959d8..aec793c 100644 --- a/schemas/Makefile.am +++ b/schemas/Makefile.am @@ -1,31 +1,27 @@ -desktop_gschemas_in_in = \ - org.mate.accessibility-keyboard.gschema.xml.in.in \ - org.mate.accessibility-startup.gschema.xml.in.in \ - org.mate.applications-at-mobility.gschema.xml.in.in \ - org.mate.applications-at-visual.gschema.xml.in.in \ - org.mate.applications-browser.gschema.xml.in.in \ - org.mate.applications-office.gschema.xml.in.in \ - org.mate.applications-terminal.gschema.xml.in.in \ - org.mate.background.gschema.xml.in.in \ - org.mate.debug.gschema.xml.in.in \ - org.mate.file-views.gschema.xml.in.in \ - org.mate.interface.gschema.xml.in.in \ - org.mate.lockdown.gschema.xml.in.in \ - org.mate.peripherals-keyboard.gschema.xml.in.in \ - org.mate.peripherals-mouse.gschema.xml.in.in \ - org.mate.sound.gschema.xml.in.in \ - org.mate.thumbnail-cache.gschema.xml.in.in \ - org.mate.thumbnailers.gschema.xml.in.in \ - org.mate.typing-break.gschema.xml.in.in +desktop_gschemas_in = \ + org.mate.accessibility-keyboard.gschema.xml.in \ + org.mate.accessibility-startup.gschema.xml.in \ + org.mate.applications-at-mobility.gschema.xml.in \ + org.mate.applications-at-visual.gschema.xml.in \ + org.mate.applications-browser.gschema.xml.in \ + org.mate.applications-office.gschema.xml.in \ + org.mate.applications-terminal.gschema.xml.in \ + org.mate.background.gschema.xml.in \ + org.mate.debug.gschema.xml.in \ + org.mate.file-views.gschema.xml.in \ + org.mate.interface.gschema.xml.in \ + org.mate.lockdown.gschema.xml.in \ + org.mate.peripherals-keyboard.gschema.xml.in \ + org.mate.peripherals-mouse.gschema.xml.in \ + org.mate.sound.gschema.xml.in \ + org.mate.thumbnail-cache.gschema.xml.in \ + org.mate.thumbnailers.gschema.xml.in \ + org.mate.typing-break.gschema.xml.in @INTLTOOL_XML_NOMERGE_RULE@ -desktop_gschemas_in = $(desktop_gschemas_in_in:.xml.in.in=.xml.in) gsettings_SCHEMAS = $(desktop_gschemas_in:.xml.in=.xml) -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - @GSETTINGS_RULES@ convertdir = $(datadir)/MateConf/gsettings @@ -33,9 +29,8 @@ convert_DATA = mate-desktop.convert EXTRA_DIST = \ $(convert_DATA) \ - $(desktop_gschemas_in_in) + $(desktop_gschemas_in) CLEANFILES = \ - $(desktop_gschemas_in) \ $(gsettings_SCHEMAS) \ *.gschema.valid |