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, 53 insertions, 55 deletions

diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 642a128f..648e0789 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -60,12 +60,10 @@ battstat_applet_LDADD = \
 			 -lm
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.panel.applet.battstat.gschema.xml
+batstat_gschema_in_files = org.mate.panel.applet.battstat.gschema.xml.in
+gsettings_SCHEMAS = $(batstat_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' < $< > $@
-
 appletdir       = $(datadir)/mate-panel/applets
 applet_in_files = org.mate.applets.BattstatApplet.mate-panel-applet.in
 applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
@@ -87,7 +85,7 @@ org.mate.panel.applet.BattstatAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in)  $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 uidir = $(datadir)/mate/ui
 ui_DATA = battstat-applet-menu.xml
@@ -97,7 +95,7 @@ EXTRA_DIST = 							\
 	$(ui_DATA)						\
 	org.mate.applets.BattstatApplet.mate-panel-applet.in.in	\
 	$(service_in_files)					\
-	$(gsettings_SCHEMAS).in.in
+	$(batstat_gschema_in_files)
 
 
 -include $(top_srcdir)/git.mk
diff --git a/battstat/org.mate.panel.applet.battstat.gschema.xml.in b/battstat/org.mate.panel.applet.battstat.gschema.xml.in
new file mode 100644
index 00000000..7deb8d54
--- /dev/null
+++ b/battstat/org.mate.panel.applet.battstat.gschema.xml.in
@@ -0,0 +1,49 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.applet.battstat">
+    <key name="red-value" type="i">
+      <default>15</default>
+      <summary>Red value level</summary>
+      <description>The battery level below which the battery is displayed as red. Also the value at which the low battery warning is displayed.</description>
+    </key>
+    <key name="red-value-is-time" type="b">
+      <default>false</default>
+      <summary>Warn on low time rather than low percentage</summary>
+      <description>Use the value defined in red_value as a time remaining to show the warning dialog rather than a percentage.</description>
+    </key>
+    <key name="low-battery-notification" type="b">
+      <default>true</default>
+      <summary>Low Battery Notification</summary>
+      <description>Notify user when the battery is low.</description>
+    </key>
+    <key name="full-battery-notification" type="b">
+      <default>false</default>
+      <summary>Full Battery Notification</summary>
+      <description>Notify user when the battery is full.</description>
+    </key>
+    <key name="beep" type="b">
+      <default>false</default>
+      <summary>Beep for warnings</summary>
+      <description>Beep when displaying a warning.</description>
+    </key>
+    <key name="drain-from-top" type="b">
+      <default>false</default>
+      <summary>Drain from top</summary>
+      <description>Show the battery meter draining from the top of the battery. Only implemented for traditional battery view.</description>
+    </key>
+    <key name="show-status" type="b">
+      <default>true</default>
+      <summary>Upright (small) battery</summary>
+      <description>Show the upright, smaller battery on the panel.</description>
+    </key>
+    <key name="show-battery" type="b">
+      <default>false</default>
+      <summary>Show the horizontal battery</summary>
+      <description>Show the traditional, horizontal battery on the panel.</description>
+    </key>
+    <key name="show-text" type="i">
+      <default>0</default>
+      <summary>Show the time/percent label</summary>
+      <description>0 for no label, 1 for percentage and 2 for time remaining.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/battstat/org.mate.panel.applet.battstat.gschema.xml.in.in b/battstat/org.mate.panel.applet.battstat.gschema.xml.in.in
deleted file mode 100644
index 7ffc06c0..00000000
--- a/battstat/org.mate.panel.applet.battstat.gschema.xml.in.in
+++ /dev/null
@@ -1,49 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.applet.battstat">
-    <key name="red-value" type="i">
-      <default>15</default>
-      <_summary>Red value level</_summary>
-      <_description>The battery level below which the battery is displayed as red. Also the value at which the low battery warning is displayed.</_description>
-    </key>
-    <key name="red-value-is-time" type="b">
-      <default>false</default>
-      <_summary>Warn on low time rather than low percentage</_summary>
-      <_description>Use the value defined in red_value as a time remaining to show the warning dialog rather than a percentage.</_description>
-    </key>
-    <key name="low-battery-notification" type="b">
-      <default>true</default>
-      <_summary>Low Battery Notification</_summary>
-      <_description>Notify user when the battery is low.</_description>
-    </key>
-    <key name="full-battery-notification" type="b">
-      <default>false</default>
-      <_summary>Full Battery Notification</_summary>
-      <_description>Notify user when the battery is full.</_description>
-    </key>
-    <key name="beep" type="b">
-      <default>false</default>
-      <_summary>Beep for warnings</_summary>
-      <_description>Beep when displaying a warning.</_description>
-    </key>
-    <key name="drain-from-top" type="b">
-      <default>false</default>
-      <_summary>Drain from top</_summary>
-      <_description>Show the battery meter draining from the top of the battery. Only implemented for traditional battery view.</_description>
-    </key>
-    <key name="show-status" type="b">
-      <default>true</default>
-      <_summary>Upright (small) battery</_summary>
-      <_description>Show the upright, smaller battery on the panel.</_description>
-    </key>
-    <key name="show-battery" type="b">
-      <default>false</default>
-      <_summary>Show the horizontal battery</_summary>
-      <_description>Show the traditional, horizontal battery on the panel.</_description>
-    </key>
-    <key name="show-text" type="i">
-      <default>0</default>
-      <_summary>Show the time/percent label</_summary>
-      <_description>0 for no label, 1 for percentage and 2 for time remaining.</_description>
-    </key>
-  </schema>
-</schemalist>