fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 19:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: Improve the client common build file

Browse source 
The build file in the `client` `common` directory has been improved
by grouping the objects used in properties and by reviewing the
dependencies used by libraries built in the file.
This commit is contained in:
Iñigo Martínez 2019-09-11 12:03:42 +02:00 • committed by Thomas Haller
parent 25bb43f4db
commit 83b760cf98
1 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
clients/common/meson.build
View file

@ -2,29 +2,29 @@ common_inc = include_directories('.')
nm_polkit_listener = files('nm-polkit-listener.c') nm_polkit_listener = files('nm-polkit-listener.c')
deps = [ common_deps = [
libnm_dep, libnm_dep,
libnm_libnm_core_aux_dep,
libnm_nm_default_dep, libnm_nm_default_dep,
] ]
c_flags = clients_c_flags + [ common_c_flags = clients_c_flags + ['-DG_LOG_DOMAIN="libnmc"']
'-DG_LOG_DOMAIN="libnmc"',
] sources = files(
'nm-client-utils.c',
'nm-secret-agent-simple.c',
'nm-vpn-helpers.c',
)
libnmc_base = static_library( libnmc_base = static_library(
'nmc-base', 'nmc-base',
sources: files( sources: sources,
'nm-client-utils.c', dependencies: common_deps,
'nm-secret-agent-simple.c', c_args: common_c_flags,
'nm-vpn-helpers.c',
),
dependencies: deps,
c_args: c_flags,
) )
libnmc_base_dep = declare_dependency( libnmc_base_dep = declare_dependency(
include_directories: common_inc, include_directories: common_inc,
dependencies: common_deps,
link_with: libnmc_base, link_with: libnmc_base,
) )
@ -51,25 +51,22 @@ else
) )
endif endif
deps += [ sources = nm_meta_setting_source + [settings_docs_source] + files(
libnm_libnm_core_aux_dep, 'nm-meta-setting-access.c',
libnm_utils_base_dep, 'nm-meta-setting-desc.c',
] )
libnmc = static_library( libnmc = static_library(
'nmc', 'nmc',
sources: files( sources: sources,
'nm-meta-setting-access.c', dependencies: common_deps + [libnm_libnm_core_aux_dep],
'nm-meta-setting-desc.c',
) + nm_meta_setting_source + [settings_docs_source],
dependencies: deps,
c_args: c_flags, c_args: c_flags,
link_with: libnmc_base,
link_depends: settings_docs_source, link_depends: settings_docs_source,
) )
libnmc_dep = declare_dependency( libnmc_dep = declare_dependency(
include_directories: common_inc, include_directories: common_inc,
dependencies: common_deps,
link_with: libnmc, link_with: libnmc,
) )