diff options
| author | infirit <[email protected]> | 2015-09-08 15:30:42 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-08 15:30:42 +0200 |
| commit | 36aaf5759c1beececce2b161b47de7c6337bb279 (patch) | |
| tree | edf7ffc5959645179e832a1e7e10aa74cc97676c /data/Makefile.am | |
| parent | 2db7cc811d771c2f2dd5ee9b0cbb6be1f6401170 (diff) | |
| download | mate-settings-daemon-36aaf5759c1beececce2b161b47de7c6337bb279.tar.bz2 mate-settings-daemon-36aaf5759c1beececce2b161b47de7c6337bb279.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 | 51 |
1 files changed, 23 insertions, 28 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index e564600..9ee0f0f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,37 +1,33 @@ NULL = -msd_gschemas_in_in = \ - org.mate.applications-at.gschema.xml.in.in \ - org.mate.font-rendering.gschema.xml.in.in \ - org.mate.peripherals-smartcard.gschema.xml.in.in \ - org.mate.peripherals-touchpad.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.background.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.sound.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in.in \ - org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in.in \ +msd_gschemas_in = \ + org.mate.applications-at.gschema.xml.in \ + org.mate.font-rendering.gschema.xml.in \ + org.mate.peripherals-smartcard.gschema.xml.in \ + org.mate.peripherals-touchpad.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.background.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.sound.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in \ + org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in \ $(NULL) @INTLTOOL_XML_NOMERGE_RULE@ -msd_gschemas_in = $(msd_gschemas_in_in:.xml.in.in=.xml.in) gsettings_SCHEMAS = $(msd_gschemas_in:.xml.in=.xml) -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - @GSETTINGS_RULES@ convertdir = $(datadir)/MateConf/gsettings @@ -65,7 +61,7 @@ xml_in_files = 50-accessibility.xml.in xml_DATA = $(xml_in_files:.xml.in=.xml) EXTRA_DIST = \ - $(msd_gschemas_in_in) \ + $(msd_gschemas_in) \ $(convert_DATA) \ $(service_in_files) \ $(desktop_in_files) \ @@ -76,7 +72,6 @@ EXTRA_DIST = \ DISTCLEANFILES = \ $(gsettings_SCHEMAS) \ - $(msd_gschemas_in) \ $(service_DATA) \ $(desktop_DATA) \ $(xml_DATA) \ |