Rework gsettings schema building

* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files

7 files changed, 39 insertions, 45 deletions

diff --git a/configure.ac b/configure.ac
index 435aacc..67b4d75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
 
-IT_PROG_INTLTOOL([0.34])
+IT_PROG_INTLTOOL([0.50.1])
 
 AM_GLIB_GNU_GETTEXT
 
@@ -82,7 +82,9 @@ GLIB_GSETTINGS
 AC_OUTPUT([
 Makefile
 maximus/Makefile
+maximus/org.mate.maximus.gschema.xml
 mate-window-picker-applet/Makefile
+mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml
 po/Makefile.in
 ])
 
diff --git a/mate-window-picker-applet/Makefile.am b/mate-window-picker-applet/Makefile.am
index 0ecd7b4..71bfd50 100644
--- a/mate-window-picker-applet/Makefile.am
+++ b/mate-window-picker-applet/Makefile.am
@@ -47,14 +47,11 @@ org.mate.panel.applet.MateWindowPickerFactory.service: $(service_in_files)
 	$< > $@
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.panel.applet.mate-window-picker-applet.gschema.xml
+gsettingsschema_in_files = org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in
 
-gsettings_SCHEMAS_in_in = $(gsettings_SCHEMAS:.xml=.xml.in.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^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 xmluidir = $(datadir)/mate-panel/ui
 xmlui_DATA = mate-window-picker-applet-menu.xml
 
@@ -63,14 +60,14 @@ EXTRA_DIST = \
 	$(service_in_files) \
 	$(ui_DATA) \
 	$(convert_DATA) \
-	$(gsettings_SCHEMAS_in_in) \
+	$(gsettingsschema_in_files) \
 	$(xmlui_DATA)
 
 CLEANFILES = \
 	$(applet_DATA) \
 	$(applet_DATA).in \
-	$(gsettings_SCHEMAS_in) \
 	$(gsettings_SCHEMAS) \
+	*.gschema.valid \
 	$(service_DATA)
 
 clean:
diff --git a/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in.in b/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in
index 88964f1..71f3bd2 100644
--- a/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in.in
+++ b/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in
@@ -2,8 +2,8 @@
   <schema id="org.mate.panel.applet.mate-window-picker-applet">
     <key name="show-all-windows" type="b">
       <default>true</default>
-      <_summary>Show windows from all workspaces.</_summary>
-      <_description>Show windows from all workspaces.</_description>
+      <summary>Show windows from all workspaces.</summary>
+      <description>Show windows from all workspaces.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/maximus/Makefile.am b/maximus/Makefile.am
index b1994a4..3326b6b 100644
--- a/maximus/Makefile.am
+++ b/maximus/Makefile.am
@@ -31,14 +31,11 @@ mate_maximus_SOURCES = \
 	xutils.h 
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.maximus.gschema.xml
+gsettingsschema_in_files = org.mate.maximus.gschema.xml.in
 
-gsettings_SCHEMAS_in_in = $(gsettings_SCHEMAS:.xml=.xml.in.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^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 convertdir = $(datadir)/MateConf/gsettings
 convert_DATA = mate-maximus.convert
 
@@ -47,8 +44,6 @@ dist_desktop_DATA=mate-maximus-autostart.desktop
 
 man_MANS = mate-maximus.1
 
-CLEANFILES = $(gsettings_SCHEMAS) \
-	$(gsettings_SCHEMAS_in)
-
+CLEANFILES = $(gsettings_SCHEMAS) *.gschema.valid
 
-EXTRA_DIST =  $(gsettings_SCHEMAS_in_in) $(convert_DATA) $(man_MANS)
+EXTRA_DIST =  $(gsettingsschema_in_files) $(convert_DATA) $(man_MANS)
diff --git a/maximus/org.mate.maximus.gschema.xml.in b/maximus/org.mate.maximus.gschema.xml.in
new file mode 100644
index 0000000..0fde1cc
--- /dev/null
+++ b/maximus/org.mate.maximus.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.maximus" path="/org/mate/maximus/">
+    <key name="exclude-class" type="as">
+      <default>[ 'Totem' ]</default>
+      <summary>A list of exclusion strings which apply to the window class.</summary>
+      <description>A list of exclusion strings which apply to the window class</description>
+    </key>
+    <key name="binding" type="s">
+      <default>'disabled'</default>
+      <summary>A binding</summary>
+      <description>A binding</description>
+    </key>
+    <key name="undecorate" type="b">
+      <default>false</default>
+      <summary>Undecorate windows when maximized</summary>
+      <description>Undecorate windows when maximized</description>
+    </key>
+    <key name="no-maximize" type="b">
+      <default>true</default>
+      <summary>Do not automatically maximize newly opened windows</summary>
+      <description>Do not automatically maximize newly opened windows. If undecorate is set, will still undecorate maximised windows.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/maximus/org.mate.maximus.gschema.xml.in.in b/maximus/org.mate.maximus.gschema.xml.in.in
deleted file mode 100644
index 8f0c635..0000000
--- a/maximus/org.mate.maximus.gschema.xml.in.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.maximus" path="/org/mate/maximus/">
-    <key name="exclude-class" type="as">
-      <default>[ 'Totem' ]</default>
-      <_summary>A list of exclusion strings which apply to the window class.</_summary>
-      <_description>A list of exclusion strings which apply to the window class</_description>
-    </key>
-    <key name="binding" type="s">
-      <default>'disabled'</default>
-      <_summary>A binding</_summary>
-      <_description>A binding</_description>
-    </key>
-    <key name="undecorate" type="b">
-      <default>false</default>
-      <_summary>Undecorate windows when maximized</_summary>
-      <_description>Undecorate windows when maximized</_description>
-    </key>
-    <key name="no-maximize" type="b">
-      <default>true</default>
-      <_summary>Do not automatically maximize newly opened windows</_summary>
-      <_description>Do not automatically maximize newly opened windows. If undecorate is set, will still undecorate maximised windows.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b7cd102..7ac7a98 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
-mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in.in
+mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in
 mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.in.in
 mate-window-picker-applet/applet.c
 mate-window-picker-applet/task-title.c
 mate-window-picker-applet/task-item.c
-maximus/org.mate.maximus.gschema.xml.in.in
+maximus/org.mate.maximus.gschema.xml.in