Revert "Meson: Fix build when glib is built as subproject"

This reverts commit ec00edd941953626ac027810f747847f68a71000.

The nightly run time does not have Meson 0.54.
This commit is contained in:
Emmanuele Bassi 2020-04-24 11:52:45 +01:00
parent 75a1bb1e13
commit 3d39d61e3d
2 changed files with 1 additions and 4 deletions

View File

@ -26,7 +26,6 @@ cmph_sources = [
cmph_deps = [ cmph_deps = [
glib_dep, glib_dep,
gobject_dep,
cc.find_library('m', required: false), cc.find_library('m', required: false),
] ]
@ -68,7 +67,6 @@ cmph_test = executable('cmph-bdz-test', '../cmph-bdz-test.c',
dependencies: [ dependencies: [
cmph_dep, cmph_dep,
glib_dep, glib_dep,
gobject_dep,
], ],
c_args: custom_c_args, c_args: custom_c_args,
) )

View File

@ -17,13 +17,12 @@ girepo_gthash_lib = static_library('girepository-gthash',
cmph_dep, cmph_dep,
glib_dep, glib_dep,
gmodule_dep, gmodule_dep,
gobject_dep,
], ],
) )
girepo_gthash_dep = declare_dependency( girepo_gthash_dep = declare_dependency(
link_with: girepo_gthash_lib, link_with: girepo_gthash_lib,
dependencies: [glib_dep, gmodule_dep, gobject_dep], dependencies: [glib_dep, gmodule_dep],
include_directories: include_directories('.'), include_directories: include_directories('.'),
) )