[glib] Rename gsettingsschemaupdatecache to the more sane gschema_compile



commit 3bfd739154b09c42b29bfcc38b03ff9b98ed4c4f
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Apr 21 11:50:21 2010 -0400

    Rename gsettingsschemaupdatecache to the more sane gschema_compile
    
    To follow existing glib pc variables for binaries.

 docs/reference/gio/migrating.xml |    7 ++++---
 gio-2.0.pc.in                    |    2 +-
 m4macros/gsettings.m4            |    4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/docs/reference/gio/migrating.xml b/docs/reference/gio/migrating.xml
index 8b886ae..be666f2 100644
--- a/docs/reference/gio/migrating.xml
+++ b/docs/reference/gio/migrating.xml
@@ -388,7 +388,7 @@ produces a <filename>org.gnome.font-rendering.gschema.xml</filename> file with t
       <para>
         Schemas are compiled into binary form by the
         <link linkend="gschema-compile">gschema-compile</link> utility.
-        GIO provides a <literal>gsettingsupdateschemacache</literal>
+        GIO provides a <literal>gschema_compile</literal>
         variable for the schema compiler, which can be used in
         <filename>configure.in</filename> as follows:
 <programlisting>
@@ -397,13 +397,14 @@ AM_GSETTINGS
         The corresponding <filename>Makefile.am</filename> fragment looks like
         this:
 <programlisting>
-# gsettingsschemadir is defined by the AM_GSETTINGS macro in configure.ac
+# gsettingsschemadir and gschema_compile are defined by the AM_GSETTINGS
+# macro in configure.ac
 gsettingsschema_DATA = my.app.gschema.xml
 # This rule will check your schemas for validity before installation
 @GSETTINGS_CHECK_RULE@
 if GSETTINGS_SCHEMAS_INSTALL
 install-data-hook:
-	$(gsettingsupdateschemacache) $(DESTDIR)$(gsettingsschemadir)
+	$(gschema_compile) $(DESTDIR)$(gsettingsschemadir)
 endif
 </programlisting>
       </para>
diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
index f630925..7297992 100644
--- a/gio-2.0.pc.in
+++ b/gio-2.0.pc.in
@@ -4,7 +4,7 @@ libdir= libdir@
 includedir= includedir@
 
 giomoduledir= GIO_MODULE_DIR@
-gsettingsupdateschemacache= bindir@/gschema-compile
+gschema_compile= bindir@/gschema-compile
 
 Name: GIO
 Description: glib I/O library
diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4
index 254fde8..46c0981 100644
--- a/m4macros/gsettings.m4
+++ b/m4macros/gsettings.m4
@@ -15,7 +15,7 @@ AC_DEFUN([AM_GSETTINGS],
   AM_CONDITIONAL([GSETTINGS_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
 
   AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
-  AC_SUBST(gsettingsupdateschemacache, `pkg-config --variable gsettingsupdateschemacache gio-2.0`)
+  AC_SUBST(gschema_compile, `pkg-config --variable gschema_compile gio-2.0`)
 
   GSETTINGS_CHECK_RULE='
 .PHONY : check-gsettings-schema
@@ -24,7 +24,7 @@ gschema_xml_files := $(wildcard *.gschema.xml)
 check-gsettings-schema: gsettings_schema_validate_stamp
 CLEANFILES += gsettings_schema_validate_stamp
 gsettings_schema_validate_stamp: $(gschema_xml_files)
-	$(gsettingsupdateschemacache) --dry-run --schema-files $?
+	$(gschema_compile) --dry-run --schema-files $?
 	touch [$]@
 
 all: check-gsettings-schema



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]