Rework gsettings schema building

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

3 files changed, 28 insertions, 30 deletions

diff --git a/command/Makefile.am b/command/Makefile.am
index e9df3c81..3159add3 100644
--- a/command/Makefile.am
+++ b/command/Makefile.am
@@ -32,15 +32,13 @@ org.mate.panel.applet.CommandAppletFactory.service: $(service_in_files)
 		$< > $@
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.panel.applet.command.gschema.xml
+command_gschema_in_files = org.mate.panel.applet.command.gschema.xml.in
+gsettings_SCHEMAS = $(command_gschema_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' < $< > $@
-
 EXTRA_DIST = \
 	$(applets_in_files).in \
 	$(service_in_files) \
-	$(gsettings_SCHEMAS).in.in
+	$(command_gschema_in_files)
 
-CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in)  $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
diff --git a/command/org.mate.panel.applet.command.gschema.xml.in b/command/org.mate.panel.applet.command.gschema.xml.in
new file mode 100644
index 00000000..b352a21b
--- /dev/null
+++ b/command/org.mate.panel.applet.command.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.applet.command">
+    <key name="command" type="s">
+      <default>'date +%T'</default>
+      <summary>Command to execute</summary>
+      <description>Command/script to execute to get the output</description>
+    </key>
+    <key name="interval" type="i">
+      <default>1</default>
+      <summary>Interval for the command</summary>
+      <description>Interval to execute the command (in seconds)</description>
+    </key>
+    <key name="width" type="i">
+      <default>60</default>
+      <summary>Width of output</summary>
+      <description>Number of characters to display</description>
+    </key>
+    <key name="show-icon" type="b">
+      <default>false</default>
+      <summary>Show icon</summary>
+      <description>If applet icon is shown or not</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/command/org.mate.panel.applet.command.gschema.xml.in.in b/command/org.mate.panel.applet.command.gschema.xml.in.in
deleted file mode 100644
index f5d61479..00000000
--- a/command/org.mate.panel.applet.command.gschema.xml.in.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.applet.command">
-    <key name="command" type="s">
-      <default>'date +%T'</default>
-      <_summary>Command to execute</_summary>
-      <_description>Command/script to execute to get the output</_description>
-    </key>
-    <key name="interval" type="i">
-      <default>1</default>
-      <_summary>Interval for the command</_summary>
-      <_description>Interval to execute the command (in seconds)</_description>
-    </key>
-    <key name="width" type="i">
-      <default>60</default>
-      <_summary>Width of output</_summary>
-      <_description>Number of characters to display</_description>
-    </key>
-    <key name="show-icon" type="b">
-      <default>false</default>
-      <_summary>Show icon</_summary>
-      <_description>If applet icon is shown or not</_description>
-    </key>
-  </schema>
-</schemalist>