diff options
| -rw-r--r-- | gio/gschema-compile.c | 2 | ||||
| -rw-r--r-- | gio/tests/gschema-compile.c | 2 | ||||
| -rw-r--r-- | m4macros/gsettings.m4 | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/gio/gschema-compile.c b/gio/gschema-compile.c index f8b535a86..ee7726822 100644 --- a/gio/gschema-compile.c +++ b/gio/gschema-compile.c @@ -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 } }; diff --git a/gio/tests/gschema-compile.c b/gio/tests/gschema-compile.c index 81ae4b70a..3ea0e978a 100644 --- a/gio/tests/gschema-compile.c +++ b/gio/tests/gschema-compile.c @@ -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 }; diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4 index 78a20d3dd..12760eebf 100644 --- a/m4macros/gsettings.m4 +++ b/m4macros/gsettings.m4 @@ -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 |