Commit 3bfd7391 authored by Matthias Clasen's avatar Matthias Clasen

Rename gsettingsschemaupdatecache to the more sane gschema_compile

To follow existing glib pc variables for binaries.
parent 662f97fe
......@@ -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>
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment