Commit 2cc7444c authored by Inigo Martínez's avatar Inigo Martínez Committed by Aleksander Morgado
Browse files

build: Improve symbols resolution

The `libmbim-glib-generated` library is now fully built in
`libmbim-glib-core` so it holds all the necessary symbols.
parent 6e65cea3
......@@ -147,9 +147,8 @@ libmbim_glib_generated = static_library(
c_args: c_flags,
)
libmbim_glib_generated_dep = declare_dependency(
generated_dep = declare_dependency(
sources: gen_headers,
include_directories: [libmbim_glib_inc, generated_inc],
dependencies: glib_deps,
link_with: libmbim_glib_generated,
)
......@@ -47,8 +47,8 @@ sources = files(
)
deps = [
generated_dep,
libmbim_common_dep,
libmbim_glib_generated_dep,
]
libmbim_glib_core = static_library(
......@@ -57,6 +57,7 @@ libmbim_glib_core = static_library(
include_directories: top_inc,
dependencies: deps + [gio_unix_dep],
c_args: common_c_flags,
link_whole: libmbim_glib_generated,
)
libmbim_glib_core_dep = declare_dependency(
......@@ -81,6 +82,7 @@ libmbim_glib = library(
version: mbim_glib_version,
sources: version_header,
include_directories: top_inc,
dependencies: generated_dep,
link_args: '-Wl,--version-script,' + symbol_map,
link_depends: symbol_map,
link_whole: libmbim_glib_core,
......
Supports Markdown
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