From df7a7488950139e3884972e2363294051e33d45d Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Sun, 6 Sep 2015 21:55:35 +0200
Subject: Rework gsettings schema building

 * Bump intltool required version for gsettings support
 * Extract strings with intltool directly
 * Let autoconf generate the xml files
---
 geyes/Makefile.am                                   | 10 ++++------
 geyes/org.mate.panel.applet.geyes.gschema.xml.in    |  9 +++++++++
 geyes/org.mate.panel.applet.geyes.gschema.xml.in.in |  9 ---------
 3 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 geyes/org.mate.panel.applet.geyes.gschema.xml.in
 delete mode 100644 geyes/org.mate.panel.applet.geyes.gschema.xml.in.in

(limited to 'geyes')

diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index 09eaabf0..f8bb8c28 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -46,12 +46,10 @@ uidir = $(datadir)/mate/ui
 ui_DATA = geyes-applet-menu.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.panel.applet.geyes.gschema.xml
+geyes_gschema_in_files = org.mate.panel.applet.geyes.gschema.xml.in
+gsettings_SCHEMAS = $(geyes_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' < $< > $@
-
 themesdir = $(pkgdatadir)/geyes
 
 icons =	\
@@ -61,13 +59,13 @@ icons =	\
 	mate-eyes-applet.22.png \
 	mate-eyes-applet.16.png
 
-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
 
 EXTRA_DIST = \
 	     README.themes					\
 	     org.mate.applets.GeyesApplet.mate-panel-applet.in.in 	\
              $(service_in_files)				\
-	     $(gsettings_SCHEMAS).in.in				\
+	     $(geyes_gschema_in_files)				\
 	     $(ui_DATA)						\
 	     $(icons)
 
diff --git a/geyes/org.mate.panel.applet.geyes.gschema.xml.in b/geyes/org.mate.panel.applet.geyes.gschema.xml.in
new file mode 100644
index 00000000..aad28f71
--- /dev/null
+++ b/geyes/org.mate.panel.applet.geyes.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.applet.geyes">
+    <key name="theme-path" type="s">
+      <default>''</default>
+      <summary>Directory in which the theme is located</summary>
+      <description>Directory in which the theme is located</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/geyes/org.mate.panel.applet.geyes.gschema.xml.in.in b/geyes/org.mate.panel.applet.geyes.gschema.xml.in.in
deleted file mode 100644
index c551fb6a..00000000
--- a/geyes/org.mate.panel.applet.geyes.gschema.xml.in.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.applet.geyes">
-    <key name="theme-path" type="s">
-      <default>''</default>
-      <_summary>Directory in which the theme is located</_summary>
-      <_description>Directory in which the theme is located</_description>
-    </key>
-  </schema>
-</schemalist>
-- 
cgit v1.2.1