summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--schemas/Makefile.am47
2 files changed, 27 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac
index c5d3d88..943b082 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ m4_define(mate_version, [mate_platform.mate_minor.mate_micro]),
AC_INIT([mate-desktop], mate_version, [https://github.com/mate-desktop/mate-desktop/])
AC_CONFIG_SRCDIR([libmate-desktop])
-AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 tar-ustar])
+AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz tar-ustar])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS([config.h])
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index c4ae89f..db1a018 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,35 +1,40 @@
+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.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
+
@INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = \
- org.mate.accessibility-keyboard.gschema.xml \
- org.mate.accessibility-startup.gschema.xml \
- org.mate.applications-at-mobility.gschema.xml \
- org.mate.applications-at-visual.gschema.xml \
- org.mate.applications-browser.gschema.xml \
- org.mate.applications-office.gschema.xml \
- org.mate.applications-terminal.gschema.xml \
- org.mate.background.gschema.xml \
- org.mate.file-views.gschema.xml \
- org.mate.interface.gschema.xml \
- org.mate.lockdown.gschema.xml \
- org.mate.peripherals-keyboard.gschema.xml \
- org.mate.peripherals-mouse.gschema.xml \
- org.mate.sound.gschema.xml \
- org.mate.thumbnail-cache.gschema.xml \
- org.mate.thumbnailers.gschema.xml \
- org.mate.typing-break.gschema.xml
-@GSETTINGS_RULES@
+
+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
convert_DATA = mate-desktop.convert
EXTRA_DIST = \
$(convert_DATA) \
- $(gsettings_SCHEMAS)
+ $(desktop_gschemas_in_in)
CLEANFILES = \
- $(gsettings_SCHEMAS_in) \
+ $(desktop_gschemas_in) \
$(gsettings_SCHEMAS) \
*.gschema.valid