mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-02 08:27:59 +02:00
d984b2ce4a
From the files under "shared/nm-utils" we build an internal library
that provides glib-based helper utilities.
Move the files of that basic library to a new subdirectory
"shared/nm-glib-aux" and rename the helper library "libnm-core-base.la"
to "libnm-glib-aux.la".
Reasons:
- the name "utils" is overused in our code-base. Everything's an
"utils". Give this thing a more distinct name.
- there were additional files under "shared/nm-utils", which are not
part of this internal library "libnm-utils-base.la". All the files
that are part of this library should be together in the same
directory, but files that are not, should not be there.
- the new name should better convey what this library is and what is isn't:
it's a set of utilities and helper functions that extend glib with
funcitonality that we commonly need.
There are still some files left under "shared/nm-utils". They have less
a unifying propose to be in their own directory, so I leave them there
for now. But at least they are separate from "shared/nm-glib-aux",
which has a very clear purpose.
(cherry picked from commit 80db06f768)
45 lines
867 B
Meson
45 lines
867 B
Meson
deps = [
|
|
dbus_dep,
|
|
dbus_glib_dep,
|
|
libnm_util_dep,
|
|
shared_nm_glib_aux_dep,
|
|
]
|
|
|
|
cflags = common_cflags + [
|
|
'-DNETWORKMANAGER_COMPILATION_TEST',
|
|
]
|
|
|
|
test = 'test-libnm-linking'
|
|
|
|
test_libnm_linking = executable(
|
|
test,
|
|
test + '.c',
|
|
dependencies: deps + [libnm_dep],
|
|
c_args: cflags,
|
|
)
|
|
|
|
test_units = [
|
|
['test-crypto', [libtest_crypto], []],
|
|
['test-general', [], [test_libnm_linking]],
|
|
['test-secrets', [], []],
|
|
['test-setting-8021x', [], []],
|
|
['test-setting-dcb', [], []],
|
|
['test-settings-defaults', [], []],
|
|
]
|
|
|
|
foreach test_unit: test_units
|
|
exe = executable(
|
|
'libnm-util-' + test_unit[0],
|
|
test_unit[0] + '.c',
|
|
dependencies: deps,
|
|
c_args: cflags,
|
|
link_with: test_unit[1],
|
|
link_depends: test_unit[2],
|
|
)
|
|
|
|
test(
|
|
'libnm-util/' + test_unit[0],
|
|
test_script,
|
|
args: test_args + [exe.full_path()],
|
|
)
|
|
endforeach
|