fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-20 22:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
NetworkManager/shared/meson.build

261 lines
5.9 KiB
Meson
Raw Normal View History

build/meson: fix meson build for shared files The files in shared/nm-utils are not compiled as one static library, instead each subproject that needs (parts of) them, re-compiles the files individually. The major reason for that is, because we might have different compile flags, depending on whether we build libnm-core or libnm-util/libnm-glib. Actually, I think that is not really the case, and maybe this should be refactored, to indeed build them all as a static library first. Anyway, libnm-util, libnm-glib, clients' common lib, they all need a different set of shared files that they should compile. Refactor "shared/meson.build" to account for that and handle it like autotools does. Another change is, that "shared_c_siphash_dep" no longer advertises "include_directories: include_directories('c-siphash/src')". We don't put c-siphash.h into the include search path. Users who need it, should include it via "#include <c-siphash/src/c-siphash.h>". The only exception is when building shared_n_acd library, which is not under our control.
2018-05-30 15:16:01 +02:00
shared_inc = include_directories('.')
build: meson: link NM against n-acd
2018-04-06 17:04:31 +02:00
meson: Use dependency for nm-default header The `nm-default.h` header is used widely in the code by many targets. This header includes different headers and needs different libraries depending the compilation flags. A new set of `*nm_default_dep` dependencies have been created to ease the inclusion of different directorires and libraries. This allows cleaner build files and avoiding linking unnecessary libraries so this has been applied allowing the removal of some dependencies involving the linking of unnecessary libraries.
2019-09-07 23:00:41 +02:00
nm_default_dep = declare_dependency(include_directories: [top_inc, shared_inc])
glib_nm_default_dep = declare_dependency(dependencies: [glib_dep, nm_default_dep])
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
libc_siphash = static_library(
'c-siphash',
sources: 'c-siphash/src/c-siphash.c',
include_directories: include_directories('c-stdaux/src'),
)
shared: move most of "shared/nm-utils" to "shared/nm-glib-aux" 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.
2019-04-15 08:16:00 +02:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
libc_rbtree = static_library(
'c-rbtree',
sources: 'c-rbtree/src/c-rbtree.c',
include_directories: include_directories('c-stdaux/src'),
c_args: '-std=c11',
build: include c-stdaux in c-util and nettools tools This is now a dependency for the internal tools. Add the include directive first, before upgrading the libraries.
2019-04-14 12:00:29 +02:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
sources = files(
'n-acd/src/n-acd.c',
'n-acd/src/n-acd-probe.c',
'n-acd/src/util/timer.c',
build: include c-stdaux in c-util and nettools tools This is now a dependency for the internal tools. Add the include directive first, before upgrading the libraries.
2019-04-14 12:00:29 +02:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
if enable_ebpf
sources += files('n-acd/src/n-acd-bpf.c')
else
sources += files('n-acd/src/n-acd-bpf-fallback.c')
endif
shared: move most of "shared/nm-utils" to "shared/nm-glib-aux" 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.
2019-04-15 08:16:00 +02:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
incs = include_directories(
'c-list/src',
'c-rbtree/src',
'c-siphash/src',
'c-stdaux/src',
build: meson: link NM against n-acd
2018-04-06 17:04:31 +02:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
c_flags = [
'-D_GNU_SOURCE',
'-DSO_ATTACH_BPF=50',
'-std=c11',
'-Wno-pointer-arith',
'-Wno-vla',
]
links = [
libc_rbtree,
libc_siphash,
]
libn_acd = static_library(
'n-acd',
sources: sources,
include_directories: incs,
c_args: c_flags,
link_with: links,
build: meson: link NM against n-acd
2018-04-06 17:04:31 +02:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
libn_acd_dep = declare_dependency(
include_directories: shared_inc,
link_with: libn_acd,
build: compile the c-rbtree library
2018-09-04 10:50:40 +02:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
sources = files(
'n-dhcp4/src/n-dhcp4-c-connection.c',
'n-dhcp4/src/n-dhcp4-c-lease.c',
'n-dhcp4/src/n-dhcp4-client.c',
'n-dhcp4/src/n-dhcp4-c-probe.c',
'n-dhcp4/src/n-dhcp4-incoming.c',
'n-dhcp4/src/n-dhcp4-outgoing.c',
'n-dhcp4/src/n-dhcp4-socket.c',
'n-dhcp4/src/util/packet.c',
'n-dhcp4/src/util/socket.c',
build: compile the c-rbtree library
2018-09-04 10:50:40 +02:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
incs = include_directories(
'c-list/src',
'c-siphash/src',
'c-stdaux/src',
)
build: allow disabling eBPF support in n-acd Add a configure option to disable eBPF support in n-acd. Note that, even if eBPF is not supported, n-acd requires a kernel > 3.19, which means that the setsockopt(..., SO_ATTACH_BPF) option must be defined. To allow building on older kernels without modifying the n-acd code, we inject the SO_ATTACH_BPF value as a preprocessor define in the compiler the command line.
2018-09-04 08:25:07 +02:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
c_flags = [
'-D_GNU_SOURCE',
'-Wno-declaration-after-statement',
'-Wno-pointer-arith',
]
build: allow disabling eBPF support in n-acd Add a configure option to disable eBPF support in n-acd. Note that, even if eBPF is not supported, n-acd requires a kernel > 3.19, which means that the setsockopt(..., SO_ATTACH_BPF) option must be defined. To allow building on older kernels without modifying the n-acd code, we inject the SO_ATTACH_BPF value as a preprocessor define in the compiler the command line.
2018-09-04 08:25:07 +02:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
libn_dhcp4 = static_library(
'n-dhcp4',
sources: sources,
c_args: c_flags,
include_directories: incs,
link_with: libc_siphash,
build: meson: link NM against n-acd
2018-04-06 17:04:31 +02:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
libn_dhcp4_dep = declare_dependency(
include_directories: shared_inc,
link_with: libn_dhcp4,
build: meson: link NM against n-acd
2018-04-06 17:04:31 +02:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
nm_version_macro_header = configure_file(
input: 'nm-version-macros.h.in',
output: '@BASENAME@',
build/meson: cleanup configuration_data() for paths We don't need such data duplicated. The build setup should have only one configuration_data() for patching such values. Now we only have one global, immutable data_conf dictionary with configuration values. Note that none of the users of data_conf uses all entries, but as the entries are basically only dependent on the meson/configure option and valid for the entire project, this simplifies to handling.
2019-11-21 15:27:21 +01:00
configuration: data_conf,
dhcp: add nettools dhcp4 client This is inspired by the existing systemd integration, with a few differences: * This parses the WPAD option, which systemd requested, but did not use. * We hook into the DAD handling, only making use of the configured address once DAD has completed successfully, and declining the lease if it fails. There are still many areas of possible improvement. In particular, we need to ensure the parsing of all options are compliant, as n-dhcp4 treats all options as opaque, unlike sd-dhcp4. We probably also need to look at how to handle failures and retries (in particular if we decline a lease). We need to query the current MTU at client startu, as well as the hardware broadcast address. Both these are provided by the kernel over netlink, so it should simply be a matter of hooking that up with NM's netlink layer. Contribution under LGPL2.0+, in addition to stated licenses.
2019-05-13 20:02:48 +02:00
)
meson: Improve the libnm-core build file The `libnm-core` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - Dependencies have been reviewed to store the necessary data. - The use of the libraries and dependencies created in this file has been reviewed through the entire source code. This has required the addition or the removal of different libraries and dependencies in different targets. - Some files used directly with the `files` function have been moved to their nearest path build file because meson stores their full path seamessly and they can be used anywhere later.
2019-09-09 11:40:11 +02:00
nm_ethtool_utils_source = files('nm-libnm-core-intern/nm-ethtool-utils.c')
nm_libnm_core_aux_source = files('nm-libnm-core-aux/nm-libnm-core-aux.c')
nm_libnm_core_utils_source = files('nm-libnm-core-intern/nm-libnm-core-utils.c')
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
nm_meta_setting_source = files('nm-meta-setting.c')
dhcp: add nettools dhcp4 client This is inspired by the existing systemd integration, with a few differences: * This parses the WPAD option, which systemd requested, but did not use. * We hook into the DAD handling, only making use of the configured address once DAD has completed successfully, and declining the lease if it fails. There are still many areas of possible improvement. In particular, we need to ensure the parsing of all options are compliant, as n-dhcp4 treats all options as opaque, unlike sd-dhcp4. We probably also need to look at how to handle failures and retries (in particular if we decline a lease). We need to query the current MTU at client startu, as well as the hardware broadcast address. Both these are provided by the kernel over netlink, so it should simply be a matter of hooking that up with NM's netlink layer. Contribution under LGPL2.0+, in addition to stated licenses.
2019-05-13 20:02:48 +02:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
nm_test_utils_impl_source = files('nm-test-utils-impl.c')
build: add initial support for meson build system meson is a build system focused on speed an ease of use, which helps speeding up the software development. This patch adds meson support along autotools. [thaller@redhat.com: rebased patch and adjusted for iwd support] https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00022.html
2017-11-25 11:39:06 +01:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
nm_vpn_plugin_utils_source = files('nm-utils/nm-vpn-plugin-utils.c')
build: add initial support for meson build system meson is a build system focused on speed an ease of use, which helps speeding up the software development. This patch adds meson support along autotools. [thaller@redhat.com: rebased patch and adjusted for iwd support] https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00022.html
2017-11-25 11:39:06 +01:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
c_flags = [
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
'-DNETWORKMANAGER_COMPILATION=0',
]
build: add initial support for meson build system meson is a build system focused on speed an ease of use, which helps speeding up the software development. This patch adds meson support along autotools. [thaller@redhat.com: rebased patch and adjusted for iwd support] https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00022.html
2017-11-25 11:39:06 +01:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
libnm_std_aux = static_library(
'nm-std-aux',
sources: 'nm-std-aux/c-list-util.c',
c_args: c_flags,
)
build: add initial support for meson build system meson is a build system focused on speed an ease of use, which helps speeding up the software development. This patch adds meson support along autotools. [thaller@redhat.com: rebased patch and adjusted for iwd support] https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00022.html
2017-11-25 11:39:06 +01:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
sources = files(
'nm-glib-aux/nm-dbus-aux.c',
'nm-glib-aux/nm-dedup-multi.c',
'nm-glib-aux/nm-enum-utils.c',
'nm-glib-aux/nm-errno.c',
'nm-glib-aux/nm-hash-utils.c',
'nm-glib-aux/nm-io-utils.c',
'nm-glib-aux/nm-json-aux.c',
'nm-glib-aux/nm-keyfile-aux.c',
shared/logging: add "nm-logging-base.h" We have "nm-logging-fwd.h", which (as the name implies) is header-only. Add instead a "nm-logging-base.c", which also contains implementation for logging functions that are not only useful under "src/nm-logging.c"
2019-11-24 10:28:22 +01:00
'nm-glib-aux/nm-logging-base.c',
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
'nm-glib-aux/nm-random-utils.c',
'nm-glib-aux/nm-ref-string.c',
'nm-glib-aux/nm-secret-utils.c',
'nm-glib-aux/nm-shared-utils.c',
shared: cleanup include guard for nm-logging-fwd.h
2019-11-24 10:30:10 +01:00
'nm-glib-aux/nm-time-utils.c',
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
)
build: add initial support for meson build system meson is a build system focused on speed an ease of use, which helps speeding up the software development. This patch adds meson support along autotools. [thaller@redhat.com: rebased patch and adjusted for iwd support] https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00022.html
2017-11-25 11:39:06 +01:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
c_flags = [
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
]
build/meson: add intermediate shared/nm-utils base library Like also done for autotools, create and use intermediate libraries from "shared/nm-utils/". Also, replace "shared_dep" by "shared_nm_utils_base_dep". We don't need super fine-grained selection of what we link. We can always link in "shared/libnm-utils-base.a", and let the linker throw away unsed parts.
2019-02-01 10:38:33 +01:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
links = [
libc_siphash,
libnm_std_aux,
]
shared: split C-only helper "shared/nm-std-aux" utils out of "shared/nm-utils" "shared/nm-utils" contains general purpose utility functions that only depend on glib (and extend glib with some helper functions). We will also add code that does not use glib, hence it would be good if the part of "shared/nm-utils" that does not depend on glib, could be used by these future projects. Also, we use the term "utils" everywhere. While that covers the purpose and content well, having everything called "nm-something-utils" is not great. Instead, call this "nm-std-aux", inspired by "c-util/c-stdaux".
2019-04-14 13:36:32 +02:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
libnm_utils_base = static_library(
'nm-utils-base',
sources: sources,
meson: Use dependency for nm-default header The `nm-default.h` header is used widely in the code by many targets. This header includes different headers and needs different libraries depending the compilation flags. A new set of `*nm_default_dep` dependencies have been created to ease the inclusion of different directorires and libraries. This allows cleaner build files and avoiding linking unnecessary libraries so this has been applied allowing the removal of some dependencies involving the linking of unnecessary libraries.
2019-09-07 23:00:41 +02:00
dependencies: glib_nm_default_dep,
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
c_args: c_flags,
link_with: links,
shared: split C-only helper "shared/nm-std-aux" utils out of "shared/nm-utils" "shared/nm-utils" contains general purpose utility functions that only depend on glib (and extend glib with some helper functions). We will also add code that does not use glib, hence it would be good if the part of "shared/nm-utils" that does not depend on glib, could be used by these future projects. Also, we use the term "utils" everywhere. While that covers the purpose and content well, having everything called "nm-something-utils" is not great. Instead, call this "nm-std-aux", inspired by "c-util/c-stdaux".
2019-04-14 13:36:32 +02:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
libnm_utils_base_dep = declare_dependency(
meson: Use dependency for nm-default header The `nm-default.h` header is used widely in the code by many targets. This header includes different headers and needs different libraries depending the compilation flags. A new set of `*nm_default_dep` dependencies have been created to ease the inclusion of different directorires and libraries. This allows cleaner build files and avoiding linking unnecessary libraries so this has been applied allowing the removal of some dependencies involving the linking of unnecessary libraries.
2019-09-07 23:00:41 +02:00
dependencies: glib_nm_default_dep,
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
link_with: libnm_utils_base,
)
shared: move most of "shared/nm-utils" to "shared/nm-glib-aux" 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.
2019-04-15 08:16:00 +02:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
deps = [
meson: Use dependency for nm-default header The `nm-default.h` header is used widely in the code by many targets. This header includes different headers and needs different libraries depending the compilation flags. A new set of `*nm_default_dep` dependencies have been created to ease the inclusion of different directorires and libraries. This allows cleaner build files and avoiding linking unnecessary libraries so this has been applied allowing the removal of some dependencies involving the linking of unnecessary libraries.
2019-09-07 23:00:41 +02:00
glib_nm_default_dep,
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
libudev_dep,
build/meson: add intermediate shared/nm-utils base library Like also done for autotools, create and use intermediate libraries from "shared/nm-utils/". Also, replace "shared_dep" by "shared_nm_utils_base_dep". We don't need super fine-grained selection of what we link. We can always link in "shared/libnm-utils-base.a", and let the linker throw away unsed parts.
2019-02-01 10:38:33 +01:00
]
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
libnm_udev_aux = static_library(
'nm-udev-aux',
sources: 'nm-udev-aux/nm-udev-utils.c',
dependencies: deps,
meson: Use dependency for nm-default header The `nm-default.h` header is used widely in the code by many targets. This header includes different headers and needs different libraries depending the compilation flags. A new set of `*nm_default_dep` dependencies have been created to ease the inclusion of different directorires and libraries. This allows cleaner build files and avoiding linking unnecessary libraries so this has been applied allowing the removal of some dependencies involving the linking of unnecessary libraries.
2019-09-07 23:00:41 +02:00
c_args: c_flags,
build/meson: add intermediate shared/nm-utils base library Like also done for autotools, create and use intermediate libraries from "shared/nm-utils/". Also, replace "shared_dep" by "shared_nm_utils_base_dep". We don't need super fine-grained selection of what we link. We can always link in "shared/libnm-utils-base.a", and let the linker throw away unsed parts.
2019-02-01 10:38:33 +01:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
libnm_udev_aux_dep = declare_dependency(
include_directories: shared_inc,
link_with: libnm_udev_aux,
meson: Improve dependency system Some targets are missing dependencies on some generated sources in the meson port. These makes the build to fail due to missing source files on a highly parallelized build. These dependencies have been resolved by taking advantage of meson's internal dependencies which can be used to pass source files, include directories, libraries and compiler flags. One of such internal dependencies called `core_dep` was already in use. However, in order to avoid any confusion with another new internal dependency called `nm_core_dep`, which is used to include directories and source files from the `libnm-core` directory, the `core_dep` dependency has been renamed to `nm_dep`. These changes have allowed minimizing the build details which are inherited by using those dependencies. The parallelized build has also been improved.
2018-01-07 15:39:42 +01:00
)
shared/tests: add test for "shared/nm-utils" "shared/nm-utils" is a loose collection of utility functions. There is a certain aim that they can be used independently. However, they also rely on each other. Add a test that we can build a minimal shared library with these tools, independent of libnm-core.
2018-10-12 18:05:48 +02:00
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
sources = files(
'systemd/src/basic/alloc-util.c',
'systemd/src/basic/escape.c',
'systemd/src/basic/env-file.c',
'systemd/src/basic/env-util.c',
'systemd/src/basic/ether-addr-util.c',
'systemd/src/basic/extract-word.c',
'systemd/src/basic/fd-util.c',
'systemd/src/basic/fileio.c',
'systemd/src/basic/format-util.c',
'systemd/src/basic/fs-util.c',
'systemd/src/basic/hash-funcs.c',
'systemd/src/basic/hashmap.c',
'systemd/src/basic/hexdecoct.c',
'systemd/src/basic/hostname-util.c',
'systemd/src/basic/in-addr-util.c',
'systemd/src/basic/io-util.c',
'systemd/src/basic/memory-util.c',
'systemd/src/basic/mempool.c',
'systemd/src/basic/parse-util.c',
'systemd/src/basic/path-util.c',
'systemd/src/basic/prioq.c',
'systemd/src/basic/process-util.c',
'systemd/src/basic/random-util.c',
'systemd/src/basic/socket-util.c',
'systemd/src/basic/stat-util.c',
'systemd/src/basic/string-table.c',
'systemd/src/basic/string-util.c',
'systemd/src/basic/strv.c',
'systemd/src/basic/strxcpyx.c',
'systemd/src/basic/time-util.c',
'systemd/src/basic/tmpfile-util.c',
'systemd/src/basic/utf8.c',
'systemd/src/basic/util.c',
'systemd/src/shared/dns-domain.c',
'systemd/nm-sd-utils-shared.c',
build/meson: add intermediate shared/nm-utils base library Like also done for autotools, create and use intermediate libraries from "shared/nm-utils/". Also, replace "shared_dep" by "shared_nm_utils_base_dep". We don't need super fine-grained selection of what we link. We can always link in "shared/libnm-utils-base.a", and let the linker throw away unsed parts.
2019-02-01 10:38:33 +01:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
incs = include_directories(
'systemd/sd-adapt-shared',
'systemd/src/basic',
'systemd/src/shared',
build/meson: add intermediate shared/nm-utils base library Like also done for autotools, create and use intermediate libraries from "shared/nm-utils/". Also, replace "shared_dep" by "shared_nm_utils_base_dep". We don't need super fine-grained selection of what we link. We can always link in "shared/libnm-utils-base.a", and let the linker throw away unsed parts.
2019-02-01 10:38:33 +01:00
)
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
c_flags = [
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED',
]
shared/tests: add test for "shared/nm-utils" "shared/nm-utils" is a loose collection of utility functions. There is a certain aim that they can be used independently. However, they also rely on each other. Add a test that we can build a minimal shared library with these tools, independent of libnm-core.
2018-10-12 18:05:48 +02:00
systemd: move basic systemd library to shared/nm-utils For better or worse, we already pull in large parts of systemd sources. I need a base64 decode implementation (because glib's g_base64_decode() cannot reject invalid encodings). Instead of coming up with my own or copy-paste if from somewhere, reuse systemd's unbase64mem(). But for that, make systemd's basic bits an independent static library first because I will need it in libnm-core. This doesn't really change anything except making "libnm-systemd-core.la" an indpendent static library that could be used from "libnm-core". We shall still be mindful about which internal code of systemd we use, and only access functionality that is exposed via "systemd/nm-sd-utils-shared.h".
2018-12-28 18:11:16 +01:00
libnm_systemd_shared = static_library(
'nm-systemd-shared',
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
sources: sources,
include_directories: incs,
meson: Use dependency for nm-default header The `nm-default.h` header is used widely in the code by many targets. This header includes different headers and needs different libraries depending the compilation flags. A new set of `*nm_default_dep` dependencies have been created to ease the inclusion of different directorires and libraries. This allows cleaner build files and avoiding linking unnecessary libraries so this has been applied allowing the removal of some dependencies involving the linking of unnecessary libraries.
2019-09-07 23:00:41 +02:00
dependencies: glib_nm_default_dep,
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
c_args: c_flags,
systemd: move basic systemd library to shared/nm-utils For better or worse, we already pull in large parts of systemd sources. I need a base64 decode implementation (because glib's g_base64_decode() cannot reject invalid encodings). Instead of coming up with my own or copy-paste if from somewhere, reuse systemd's unbase64mem(). But for that, make systemd's basic bits an independent static library first because I will need it in libnm-core. This doesn't really change anything except making "libnm-systemd-core.la" an indpendent static library that could be used from "libnm-core". We shall still be mindful about which internal code of systemd we use, and only access functionality that is exposed via "systemd/nm-sd-utils-shared.h".
2018-12-28 18:11:16 +01:00
)
libnm_systemd_shared_dep = declare_dependency(
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
include_directories: incs,
meson: Use dependency for nm-default header The `nm-default.h` header is used widely in the code by many targets. This header includes different headers and needs different libraries depending the compilation flags. A new set of `*nm_default_dep` dependencies have been created to ease the inclusion of different directorires and libraries. This allows cleaner build files and avoiding linking unnecessary libraries so this has been applied allowing the removal of some dependencies involving the linking of unnecessary libraries.
2019-09-07 23:00:41 +02:00
dependencies: glib_dep,
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
link_with: libnm_systemd_shared,
systemd: move basic systemd library to shared/nm-utils For better or worse, we already pull in large parts of systemd sources. I need a base64 decode implementation (because glib's g_base64_decode() cannot reject invalid encodings). Instead of coming up with my own or copy-paste if from somewhere, reuse systemd's unbase64mem(). But for that, make systemd's basic bits an independent static library first because I will need it in libnm-core. This doesn't really change anything except making "libnm-systemd-core.la" an indpendent static library that could be used from "libnm-core". We shall still be mindful about which internal code of systemd we use, and only access functionality that is exposed via "systemd/nm-sd-utils-shared.h".
2018-12-28 18:11:16 +01:00
)
libnm: use "libnm-systemd-shared.a" in "libnm-core.la" (and "libnm.so") It's not yet used, but it will be. We will need nm_sd_utils_unbase64mem() to strictly validate WireGuard settings, which contain keys in base64 encoding. Note that we also need a stub implementation for logging. This will do nothing for all logging from "libnm-systemd-shared.a". This makes sense because "libnm.so" as a library should not log directly. Also, "libnm.so" will only use a small portion of "libnm-systemd-shared.a" which doesn't log anything. Thus this code is unused and dropped by the linker with "--gc-sections".
2018-12-28 21:30:03 +01:00
libnm_systemd_logging_stub = static_library(
'nm-systemd-logging-stub',
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
sources: 'systemd/nm-logging-stub.c',
meson: Use dependency for nm-default header The `nm-default.h` header is used widely in the code by many targets. This header includes different headers and needs different libraries depending the compilation flags. A new set of `*nm_default_dep` dependencies have been created to ease the inclusion of different directorires and libraries. This allows cleaner build files and avoiding linking unnecessary libraries so this has been applied allowing the removal of some dependencies involving the linking of unnecessary libraries.
2019-09-07 23:00:41 +02:00
dependencies: glib_nm_default_dep,
meson: Improve the shared build file The `shared` build file has been improved by applying a set of changes: - Indentation has been fixed to be consistent. - Unused libraries and dependencies have been removed. - Dependencies have been reviewed to store the necessary data. - Set of objects used in targets have been grouped together. - Header files have been removed from sources lists as it's unnecessary. - Library variable names have been changed to `lib{name}` pattern following their filename pattern. - `shared` prefix has been removed from all variables using it. - `version_header` its related configuration `version_conf` variables have been renamed to `nm_version_macro*` following its input and final file names.
2019-09-03 09:48:59 +02:00
c_args: c_flags,
libnm: use "libnm-systemd-shared.a" in "libnm-core.la" (and "libnm.so") It's not yet used, but it will be. We will need nm_sd_utils_unbase64mem() to strictly validate WireGuard settings, which contain keys in base64 encoding. Note that we also need a stub implementation for logging. This will do nothing for all logging from "libnm-systemd-shared.a". This makes sense because "libnm.so" as a library should not log directly. Also, "libnm.so" will only use a small portion of "libnm-systemd-shared.a" which doesn't log anything. Thus this code is unused and dropped by the linker with "--gc-sections".
2018-12-28 21:30:03 +01:00
)
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core "libnm-core" implements common functionality for "NetworkManager" and "libnm". Note that clients like "nmcli" cannot access the internal API provided by "libnm-core". So, if nmcli wants to do something that is also done by "libnm-core", , "libnm", or "NetworkManager", the code would have to be duplicated. Instead, such code can be in "libnm-libnm-core-{intern|aux}.la". Note that: 0) "libnm-libnm-core-intern.la" is used by libnm-core itsself. On the other hand, "libnm-libnm-core-aux.la" is not used by libnm-core, but provides utilities on top of it. 1) they both extend "libnm-core" with utlities that are not public API of libnm itself. Maybe part of the code should one day become public API of libnm. On the other hand, this is code for which we may not want to commit to a stable interface or which we don't want to provide as part of the API. 2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core" and thus directly available to "libnm" and "NetworkManager". On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm" and "NetworkManager". Both libraries may be statically linked by libnm clients (like nmcli). 3) it must only use glib, libnm-glib-aux.la, and the public API of libnm-core. This is important: it must not use "libnm-core/nm-core-internal.h" nor "libnm-core/nm-utils-private.h" so the static library is usable by nmcli which couldn't access these. Note that "shared/nm-meta-setting.c" is an entirely different case, because it behaves differently depending on whether linking against "libnm-core" or the client programs. As such, this file must be compiled twice.
2019-04-15 09:26:53 +02:00
build: fix meson warning about path separator in target Fix the following: WARNING: Target "nm-utils/tests/test-shared-general" has a path separator in its name. This is not supported, it can cause unexpected failures and will become a hard error in the future. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/217
2019-08-02 11:18:17 +02:00
if enable_tests
subdir('nm-utils/tests')
endif
Reference in a new issue Copy permalink