diff options
| author | Íñigo Huguet <inigohuguet@hotmail.com> | 2023-10-25 10:14:26 +0000 |
|---|---|---|
| committer | Íñigo Huguet <inigohuguet@hotmail.com> | 2023-10-25 10:14:26 +0000 |
| commit | f084eaf58bfdd711b630a25dd6115772ccd2694c (patch) | |
| tree | 1f1c7a5c38843e3594eed693a4345524fc017870 | |
| parent | 56b1a2c06a8236a11d2203df9fbe71c2eb52debf (diff) | |
| parent | 848a303d3dc9d5834663d326e121d07f81b4520d (diff) | |
merge: branch 'jv/fix-meson-doc-libnm'
Fix building libnm documentation with meson
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1717
| -rw-r--r-- | docs/libnm/meson.build | 4 | ||||
| -rw-r--r-- | src/libnm-client-impl/meson.build | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index 01c9b66959..fcc4611dcc 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -27,7 +27,7 @@ private_headers = [ scan_args = [ '--rebuild-types', '--rebuild-sections', - '--ignore-decorators=NM_AVAILABLE_IN_\d+_\d+|NM_DEPRECATED_IN_\d+_\d+|NM_DEPRECATED_IN_\d+_\d+_FOR\(\)', + '--ignore-decorators=NM_AVAILABLE_IN_[0-9]+_[0-9]+|NM_DEPRECATED_IN_[0-9]+_[0-9]+|NM_DEPRECATED_IN_[0-9]+_[0-9]+_FOR[(][)]', '--ignore-headers=' + ' '.join(private_headers), ] @@ -43,6 +43,8 @@ gnome.gtkdoc( src_dir: [ libnm_core_public_inc, libnm_client_public_inc, + libnm_core_impl_inc, + libnm_client_impl_inc ], dependencies: libnm_dep, scan_args: scan_args, diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index 0765944808..967565362d 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -1,5 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later +libnm_client_impl_inc = include_directories('.') + libnm_client_impl_sources = files( 'nm-access-point.c', 'nm-active-connection.c', |