Commit 2ed13de1 authored by Matthias Clasen's avatar Matthias Clasen

Fix issues with GSETTINGS_CHECK_RULE

Rename the --schema-files option to --schema-file, since it only
accepts one file at a time. Change the GSETTINGS_CHECK_RULE to
use it that way, too. And also make it work better with !srcdir
builds.

Bugs #616731 and #616864
parent 763c1dab
......@@ -647,7 +647,7 @@ main (int argc, char **argv)
{ "allow-any-name", 0, 0, G_OPTION_ARG_NONE, &allow_any_name, N_("Do not enforce key name restrictions") },
/* These options are only for use in the gschema-compile tests */
{ "schema-files", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME_ARRAY, &schema_files, NULL, NULL },
{ "schema-file", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME_ARRAY, &schema_files, NULL, NULL },
{ NULL }
};
......
......@@ -23,7 +23,7 @@ test_schema (gpointer data)
gchar *argv[] = {
"../glib-compile-schemas",
"--dry-run",
"--schema-files", path,
"--schema-file", path,
(gchar *)test->opt,
NULL
};
......
......@@ -25,11 +25,10 @@ AC_DEFUN([GLIB_GSETTINGS],
GSETTINGS_CHECK_RULE='
.PHONY : check-gsettings-schema
gschema_xml_files := $(wildcard $(srcdir)/*.gschema.xml)
check-gsettings-schema: gsettings_schema_validate_stamp
MOSTLYCLEANFILES += gsettings_schema_validate_stamp
gsettings_schema_validate_stamp: $(gschema_xml_files)
$(GLIB_COMPILE_SCHEMAS) --dry-run --schema-files $?
gsettings_schema_validate_stamp: *.gschema.xml
$(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --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