From 42b7d634a9a7500dcc71651f71844148fc200be3 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 24 Apr 2020 11:52:45 +0100 Subject: Revert "Meson: Fix build when glib is built as subproject" This reverts commit ec00edd941953626ac027810f747847f68a71000. The nightly run time does not have Meson 0.54. --- girepository/cmph/meson.build | 2 -- girepository/meson.build | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/girepository/cmph/meson.build b/girepository/cmph/meson.build index 2a0cef7e..5bc41a33 100644 --- a/girepository/cmph/meson.build +++ b/girepository/cmph/meson.build @@ -26,7 +26,6 @@ cmph_sources = [ cmph_deps = [ glib_dep, - gobject_dep, cc.find_library('m', required: false), ] @@ -68,7 +67,6 @@ cmph_test = executable('cmph-bdz-test', '../cmph-bdz-test.c', dependencies: [ cmph_dep, glib_dep, - gobject_dep, ], c_args: custom_c_args, ) diff --git a/girepository/meson.build b/girepository/meson.build index 6cd8fd30..204659fe 100644 --- a/girepository/meson.build +++ b/girepository/meson.build @@ -17,13 +17,12 @@ girepo_gthash_lib = static_library('girepository-gthash', cmph_dep, glib_dep, gmodule_dep, - gobject_dep, ], ) girepo_gthash_dep = declare_dependency( link_with: girepo_gthash_lib, - dependencies: [glib_dep, gmodule_dep, gobject_dep], + dependencies: [glib_dep, gmodule_dep], include_directories: include_directories('.'), ) -- cgit v1.2.1