[gnumeric] Schemas: cleanup.

[Morten Welinder <mortenw src gnome org>]

commit 51a17c9c7385d8e6eb6945489daa04dc6d9fb428
Author: Morten Welinder <terra gnome org>
Date:   Fri Oct 28 10:14:46 2011 -0400

    Schemas: cleanup.

 schemas/Makefile.am |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 3a78a49..3db8db7 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,5 +1,13 @@
-SUFFIXES = .schemas.in .reg .hkcu.reg
+SUFFIXES = .schemas.in .reg .hkcu.reg .xml.in .xml.in.in
+
+gschema_inin_files = \
+	org.gnome.gnumeric.gschema.xml.in.in	\
+	org.gnome.gnumeric.dialogs.gschema.xml.in.in	\
+	org.gnome.gnumeric.plugin.gschema.xml.in.in
+gschema_in_files = $(gschema_inin_files:.xml.in.in=.xml.in)
+
 schema_in_files = gnumeric-dialogs.schemas.in gnumeric-general.schemas.in gnumeric-plugins.schemas.in
+
 if WITH_GCONF
 schemadir   	= @GCONF_SCHEMA_FILE_DIR@
 schema_DATA 	= $(schema_in_files:.schemas.in=.schemas)
@@ -11,10 +19,7 @@ CLEANFILES = $(schema_DATA)
 @INTLTOOL_SCHEMAS_RULE@
 
 if HAVE_GSETTINGS
-gsettings_SCHEMAS =	\
-	org.gnome.gnumeric.gschema.xml	\
-	org.gnome.gnumeric.dialogs.gschema.xml	\
-	org.gnome.gnumeric.plugin.gschema.xml
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
 CLEANFILES += $(gsettings_SCHEMAS)
 
 @INTLTOOL_XML_NOMERGE_RULE@
@@ -23,10 +28,7 @@ CLEANFILES += $(gsettings_SCHEMAS)
 
 endif
 
-EXTRA_DIST += $(schema_in_files)	\
-	org.gnome.gnumeric.gschema.xml.in.in	\
-	org.gnome.gnumeric.dialogs.gschema.xml.in.in	\
-	org.gnome.gnumeric.plugin.gschema.xml.in.in
+EXTRA_DIST += $(schema_in_files) $(gschema_inin_files)
 
 if GCONF_SCHEMAS_INSTALL
 # don't do this if we are building in eg. rpm
@@ -42,12 +44,14 @@ endif
 
 if WITH_NATIVE_WIN32
 regdir = $(prefix)/etc/win32/reg
-reg_DATA = $(schema_in_files:.schemas.in=.reg) $(schema_in_files:.schemas.in=.hkcu.reg)
+reg_DATA = $(gschema_in_files:.xml.in=.reg) $(gschema_in_files:.xml.in=.hkcu.reg)
 CLEANFILES += $(reg_DATA)
 endif
 
-.schemas.in.reg:
+# The resulting .reg files are only useful on win32 but we can produce them
+# on any system.
+.xml.in.reg:
 	@PERL@ $(top_srcdir)/tools/handle-conf-options --reg $< >$(abs_builddir)/$@
 
-.schemas.in.hkcu.reg:
+.xml.in.hkcu.reg:
 	@PERL@ $(top_srcdir)/tools/handle-conf-options --hkcu-reg $< >$(abs_builddir)/$@