diff --git a/gio/tests/gdbus-test-codegen.c b/gio/tests/gdbus-test-codegen.c index e212e98cc..8db555781 100644 --- a/gio/tests/gdbus-test-codegen.c +++ b/gio/tests/gdbus-test-codegen.c @@ -56,7 +56,7 @@ test_annotations (void) iface = foo_igen_bar_interface_info (); g_assert (iface != NULL); - /* see Makefile.am for where these annotations are injected */ + /* see meson.build for where these annotations are injected */ g_assert_cmpint (count_annotations (iface->annotations), ==, 1); g_assert_cmpstr (g_dbus_annotation_info_lookup (iface->annotations, "Key1"), ==, "Value1"); diff --git a/gio/tests/gschema-compile.c b/gio/tests/gschema-compile.c index 81ded83fa..8dc4985b8 100644 --- a/gio/tests/gschema-compile.c +++ b/gio/tests/gschema-compile.c @@ -11,11 +11,6 @@ typedef struct { const gchar *err; } SchemaTest; -/* Meson build defines this, autotools build does not */ -#ifndef GLIB_COMPILE_SCHEMAS -#define GLIB_COMPILE_SCHEMAS "../glib-compile-schemas" -#endif - static void test_schema_do_compile (gpointer data) { @@ -23,7 +18,7 @@ test_schema_do_compile (gpointer data) gchar *filename = g_strconcat (test->name, ".gschema.xml", NULL); gchar *path = g_test_build_filename (G_TEST_DIST, "schema-tests", filename, NULL); const gchar *argv[] = { - GLIB_COMPILE_SCHEMAS, + GLIB_COMPILE_SCHEMAS, /* defined in meson.build */ "--strict", "--dry-run", "--schema-file", path, diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c index 852a8b710..58217e982 100644 --- a/gio/tests/gsettings.c +++ b/gio/tests/gsettings.c @@ -2798,12 +2798,8 @@ main (int argc, char *argv[]) if (!backend_set) g_setenv ("GSETTINGS_BACKEND", "memory", TRUE); -/* Meson build defines this, autotools build does not */ -#ifndef GLIB_MKENUMS -#define GLIB_MKENUMS "../../gobject/glib-mkenums" -#endif - g_remove ("org.gtk.test.enums.xml"); + /* #GLIB_MKENUMS is defined in meson.build */ g_assert (g_spawn_command_line_sync (GLIB_MKENUMS " " "--template " SRCDIR "/enums.xml.template " SRCDIR "/testenum.h", @@ -2820,12 +2816,8 @@ main (int argc, char *argv[]) g_assert (g_file_set_contents ("org.gtk.test.gschema.override", override_text, -1, NULL)); g_free (override_text); -/* Meson build defines this, autotools build does not */ -#ifndef GLIB_COMPILE_SCHEMAS -#define GLIB_COMPILE_SCHEMAS "../glib-compile-schemas" -#endif - g_remove ("gschemas.compiled"); + /* #GLIB_COMPILE_SCHEMAS is defined in meson.build */ g_assert (g_spawn_command_line_sync (GLIB_COMPILE_SCHEMAS " --targetdir=. " "--schema-file=org.gtk.test.enums.xml " "--schema-file=org.gtk.test.gschema.xml " diff --git a/glib/gatomic.c b/glib/gatomic.c index 2c1faeeef..c52aaad91 100644 --- a/glib/gatomic.c +++ b/glib/gatomic.c @@ -90,7 +90,7 @@ #ifdef G_ATOMIC_LOCK_FREE -/* if G_ATOMIC_LOCK_FREE was defined by ./configure then we MUST +/* if G_ATOMIC_LOCK_FREE was defined by `meson configure` then we MUST * implement the atomic operations in a lock-free manner. */ @@ -669,7 +669,7 @@ gsize } #else -/* This error occurs when ./configure decided that we should be capable +/* This error occurs when `meson configure` decided that we should be capable * of lock-free atomics but we find at compile-time that we are not. */ #error G_ATOMIC_LOCK_FREE defined, but incapable of lock-free atomics. diff --git a/glib/ggettext.c b/glib/ggettext.c index a5223ceb9..b34521ff7 100644 --- a/glib/ggettext.c +++ b/glib/ggettext.c @@ -498,7 +498,7 @@ g_dngettext (const gchar *domain, * // Rest of your application. * } * ]| - * where `DATADIR` is as typically provided by automake. + * where `DATADIR` is as typically provided by automake or Meson. * * For a library, you only have to call bindtextdomain() and * bind_textdomain_codeset() in your initialization function. If your library