[gedit] Fix gsettings schema generation

[Garrett Regier <gregier src gnome org>]

commit a11fab15b33f2ad41a86d5e18a349bc4caf10884
Author: Garrett Regier <alias301 gmail com>
Date:   Fri May 21 09:09:49 2010 -0700

    Fix gsettings schema generation

 configure.ac                    |    2 +-
 data/Makefile.am                |   11 ++++-------
 plugins/checkupdate/Makefile.am |   10 ++++------
 plugins/filebrowser/Makefile.am |   10 ++++------
 plugins/time/Makefile.am        |   10 ++++------
 5 files changed, 17 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4b4c9bf..698c25d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,7 +279,7 @@ PKG_CHECK_EXISTS([gtk+-3.0 >= 2.90],
 
 PKG_CHECK_MODULES(GEDIT, [
 	libxml-2.0 >= 2.5.0
-	glib-2.0 >= 2.25.0
+	glib-2.0 >= 2.25.6
 	gthread-2.0 >= 2.13.0
 	gio-2.0 >= 2.25.5
 	$GTK_REQUIRED >= $GTK_REQUIRED_VERSION
diff --git a/data/Makefile.am b/data/Makefile.am
index 49bc8a1..299d349 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,13 +21,10 @@ gedit- GEDIT_API_VERSION@.pc: gedit.pc
 bugreportdir = $(libexecdir)/gedit-2
 bugreport_SCRIPTS = gedit-bugreport.sh
 
-gsettingsschema_DATA = org.gnome.gedit.gschema.xml
- INTLTOOL_XML_NOMERGE_RULE@
+gsettingsschema_SCHEMAS = org.gnome.gedit.gschema.xml
 
-if GSETTINGS_SCHEMAS_INSTALL
-install-data-hook:
-	$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-endif
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
 
 EXTRA_DIST = 				\
 	$(desktop_in_files)		\
@@ -35,7 +32,7 @@ EXTRA_DIST = 				\
 	$(man_MANS)			\
 	gedit.pc.in			\
 	gedit-bugreport.sh.in		\
-	$(gsettingsschema_DATA)
+	$(gsettingsschema_SCHEMAS)
 
 CLEANFILES =	 			\
 	$(desktop_DATA)			\
diff --git a/plugins/checkupdate/Makefile.am b/plugins/checkupdate/Makefile.am
index 69fba3d..720a073 100644
--- a/plugins/checkupdate/Makefile.am
+++ b/plugins/checkupdate/Makefile.am
@@ -25,16 +25,14 @@ plugin_in_files = checkupdate.gedit-plugin.desktop.in
 plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
 
 gsettingsschema_DATA = org.gnome.gedit.checkupdate.gschema.xml
- INTLTOOL_XML_NOMERGE_RULE@
+gsettingsschema_SCHEMAS = $(gsettingsschema_DATA)
 
-if GSETTINGS_SCHEMAS_INSTALL
-install-data-hook:
-	$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-endif
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
 
 EXTRA_DIST = \
 	$(plugin_in_files)	\
-	$(gsettingsschema_DATA)
+	$(gsettingsschema_SCHEMAS)
 
 CLEANFILES = $(plugin_DATA)
 
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index 6411fe5..04051d0 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -66,12 +66,10 @@ gedit-file-browser-marshal.c: gedit-file-browser-marshal.list $(GLIB_GENMARSHAL)
 plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
 
 gsettingsschema_DATA = org.gnome.gedit.file-browser.gschema.xml
- INTLTOOL_XML_NOMERGE_RULE@
+gsettingsschema_SCHEMAS = $(gsettingsschema_DATA)
 
-if GSETTINGS_SCHEMAS_INSTALL
-install-data-hook:
-	$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-endif
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
 
 EXTRA_DIST = \
 	$(ui_DATA)					\
@@ -80,7 +78,7 @@ EXTRA_DIST = \
 	gedit-file-browser-enum-types.c.template	\
 	gedit-file-browser-enum-register.c.template	\
 	gedit-file-browser-marshal.list			\
-	$(gsettingsschema_DATA)
+	$(gsettingsschema_SCHEMAS)
 
 CLEANFILES = \
 	$(plugin_DATA)		\
diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am
index 7b128e2..9604f31 100644
--- a/plugins/time/Makefile.am
+++ b/plugins/time/Makefile.am
@@ -28,14 +28,12 @@ plugin_in_files = time.gedit-plugin.desktop.in
 plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
 
 gsettingsschema_DATA = org.gnome.gedit.time.gschema.xml
- INTLTOOL_XML_NOMERGE_RULE@
+gsettingsschema_SCHEMAS = $(gsettingsschema_DATA)
 
-if GSETTINGS_SCHEMAS_INSTALL
-install-data-hook:
-	$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-endif
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
 
-EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettingsschema_DATA)
+EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettingsschema_SCHEMAS)
 
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)