[totem] Clean up GSettings makefile rules

[Philip Withnall <pwithnall src gnome org>]

commit ef64ed89ec5670ac5fb7b69804eb829d685f93c0
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Sep 5 12:58:38 2010 +0100

    Clean up GSettings makefile rules
    
    gsettings.m4 ensures that all the appropriate GSettings files are cleaned
    and distributed correctly, so we don't have to.

 data/Makefile.am                      |    5 +----
 src/plugins/jamendo/Makefile.am       |   12 ++++--------
 src/plugins/opensubtitles/Makefile.am |   12 ++++--------
 src/plugins/publish/Makefile.am       |   12 ++++--------
 src/plugins/pythonconsole/Makefile.am |   12 ++++--------
 5 files changed, 17 insertions(+), 36 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 0a1532b..d119781 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -59,7 +59,6 @@ gsettings_ENUM_FILES = $(top_srcdir)/src/*.h $(top_srcdir)/src/backend/*.h
 gsettings_SCHEMAS = org.gnome.totem.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
-
 @GSETTINGS_RULES@
 
 convertdir = $(datadir)/GConf/gsettings
@@ -81,7 +80,6 @@ EXTRA_DIST = \
 	mime-type-include.sh		\
 	mime-type-list.txt		\
 	mime-functions.sh		\
-	org.gnome.totem.gschema.xml.in.in	\
 	totem.convert			\
 	totem-video-thumbnailer.1	\
 	totem-video-thumbnailer.pod
@@ -90,8 +88,7 @@ CLEANFILES = \
 	*.bak *.uip core* *.orig *~ 	\
 	$(desktop_in_files)		\
 	$(desktop_DATA)			\
-	org.gnome.totem.gschema.xml	\
-	org.gnome.totem.gschema.xml.in	\
+	$(gsettings_SCHEMAS)		\
 	totem-mime-types.h		\
 	nautilus-audio-mime-types.h
 
diff --git a/src/plugins/jamendo/Makefile.am b/src/plugins/jamendo/Makefile.am
index 53bc9aa..adb052d 100644
--- a/src/plugins/jamendo/Makefile.am
+++ b/src/plugins/jamendo/Makefile.am
@@ -9,18 +9,14 @@ uidir = $(plugindir)
 ui_DATA = jamendo.ui
 EXTRA_DIST += $(ui_DATA)
 
-gsettings_SCHEMAS = org.gnome.totem.plugins.jamendo.gschema.xml
-
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
+gsettings_SCHEMAS = org.gnome.totem.plugins.jamendo.gschema.xml
+CLEANFILES += $(gsettings_SCHEMAS)
+
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = jamendo.convert
-
-EXTRA_DIST += jamendo.py org.gnome.totem.plugins.jamendo.gschema.xml.in.in jamendo.convert
-
-CLEANFILES += $(gsettings_SCHEMAS)
-DISTCLEANFILES += $(gsettings_SCHEMAS)
-MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
+EXTRA_DIST += jamendo.py jamendo.convert
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/opensubtitles/Makefile.am b/src/plugins/opensubtitles/Makefile.am
index 9e09dd7..cd78bb5 100644
--- a/src/plugins/opensubtitles/Makefile.am
+++ b/src/plugins/opensubtitles/Makefile.am
@@ -9,18 +9,14 @@ uidir = $(plugindir)
 ui_DATA = opensubtitles.ui
 EXTRA_DIST += $(ui_DATA)
 
-gsettings_SCHEMAS = org.gnome.totem.plugins.opensubtitles.gschema.xml
-
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
+gsettings_SCHEMAS = org.gnome.totem.plugins.opensubtitles.gschema.xml
+CLEANFILES += $(gsettings_SCHEMAS)
+
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = opensubtitles.convert
-
-EXTRA_DIST += opensubtitles.py hash.py org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in opensubtitles.convert
-
-CLEANFILES += $(gsettings_SCHEMAS)
-DISTCLEANFILES += $(gsettings_SCHEMAS)
-MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
+EXTRA_DIST += opensubtitles.py hash.py opensubtitles.convert
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/publish/Makefile.am b/src/plugins/publish/Makefile.am
index c5a5180..c96c52d 100644
--- a/src/plugins/publish/Makefile.am
+++ b/src/plugins/publish/Makefile.am
@@ -16,18 +16,14 @@ libpublish_la_CFLAGS = \
 	$(plugin_cflags)	\
 	$(LIBEPC_CFLAGS)
 
-gsettings_SCHEMAS = org.gnome.totem.plugins.publish.gschema.xml
-
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
+gsettings_SCHEMAS = org.gnome.totem.plugins.publish.gschema.xml
+CLEANFILES += $(gsettings_SCHEMAS)
+
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = publish.convert
-
-EXTRA_DIST += org.gnome.totem.plugins.publish.gschema.xml.in.in publish.convert
-
-CLEANFILES += $(gsettings_SCHEMAS)
-DISTCLEANFILES += $(gsettings_SCHEMAS)
-MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
+EXTRA_DIST += publish.convert
 
 -include $(top_srcdir)/git.mk
diff --git a/src/plugins/pythonconsole/Makefile.am b/src/plugins/pythonconsole/Makefile.am
index df78cd8..bfa67e5 100644
--- a/src/plugins/pythonconsole/Makefile.am
+++ b/src/plugins/pythonconsole/Makefile.am
@@ -5,18 +5,14 @@ plugin_PYTHON = pythonconsole.py console.py
 
 plugin_in_files = pythonconsole.totem-plugin.in
 
-gsettings_SCHEMAS = org.gnome.totem.plugins.pythonconsole.gschema.xml
-
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
+gsettings_SCHEMAS = org.gnome.totem.plugins.pythonconsole.gschema.xml
+CLEANFILES += $(gsettings_SCHEMAS)
+
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = pythonconsole.convert
-
-EXTRA_DIST += pythonconsole.py console.py org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in pythonconsole.convert
-
-CLEANFILES += $(gsettings_SCHEMAS)
-DISTCLEANFILES += $(gsettings_SCHEMAS)
-MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
+EXTRA_DIST += pythonconsole.py console.py pythonconsole.convert
 
 -include $(top_srcdir)/git.mk