diff options
| author | infirit <[email protected]> | 2015-09-08 15:06:18 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-08 15:06:18 +0200 |
| commit | b7013f0eb5567b2cfbc7b43be6b8ffddfc7d3a03 (patch) | |
| tree | cb134d4ed50de5b42acef007a7880079b76f9955 /data/Makefile.am | |
| parent | 672ea03c5c3b923bb1302fd3039adc304e71eb6a (diff) | |
| download | mate-session-manager-b7013f0eb5567b2cfbc7b43be6b8ffddfc7d3a03.tar.bz2 mate-session-manager-b7013f0eb5567b2cfbc7b43be6b8ffddfc7d3a03.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 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 01b9bb1..a072618 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,12 +21,8 @@ endif @INTLTOOL_DESKTOP_RULE@ -org.mate.session.gschema.xml.in: org.mate.session.gschema.xml.in.in Makefile - $(AM_V_GEN)sed \ - -e "s|\@DEFAULT_WM\@|$(DEFAULT_WM)|" \ - $< > $@ - -gsettings_SCHEMAS = org.mate.session.gschema.xml +gsettingsschema_in_files = org.mate.session.gschema.xml.in +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) @INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ @@ -36,7 +32,7 @@ convert_DATA = mate-session.convert EXTRA_DIST = \ mate-wm \ $(xsession_in_files) \ - $(gsettings_SCHEMAS).in.in \ + $(gsettingsschema_in_files) \ $(convert_DATA) \ $(ui_DATA) \ $(pixmap_DATA_dist) @@ -44,8 +40,7 @@ EXTRA_DIST = \ CLEANFILES = \ $(xsession_DATA) \ $(desktop_DATA) \ - $(gsettings_SCHEMAS).in \ - $(gsettings_SCHEMAS) \ + $(gsettings_SCHEMAS) \ mate-wm.desktop DISTCLEANFILES = \ |