diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-02-12 15:01:09 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-02-18 19:46:51 +0100 |
| commit | fdf9614ba793a023d9b6c0f6a078beded8143771 (patch) | |
| tree | 1c21d90c0873da541302bc0e209428b667029054 /examples | |
| parent | 2c1f8e9108a33eb3819b1bda1138a01bfd71746a (diff) | |
build: move "libnm-core/" to "src/" and split it
"libnm-core/" is rather complicated. It provides a static library that
is linked into libnm.so and NetworkManager. It also contains public
headers (like "nm-setting.h") which are part of public libnm API.
Then we have helper libraries ("libnm-core/nm-libnm-core-*/") which
only rely on public API of libnm-core, but are themself static
libraries that can be used by anybody who uses libnm-core. And
"libnm-core/nm-libnm-core-intern" is used by libnm-core itself.
Move "libnm-core/" to "src/". But also split it in different
directories so that they have a clearer purpose.
The goal is to have a flat directory hierarchy. The "src/libnm-core*/"
directories correspond to the different modules (static libraries and set
of headers that we have). We have different kinds of such modules because
of how we combine various code together. The directory layout now reflects
this.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/C/qt/meson.build | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/examples/C/qt/meson.build b/examples/C/qt/meson.build index 7e4e127419..8b905bd61d 100644 --- a/examples/C/qt/meson.build +++ b/examples/C/qt/meson.build @@ -6,13 +6,6 @@ examples = [ ['change-ipv4-addresses', []], ] -deps = [ - dbus_dep, - qt_core_dep, - qt_dbus_dep, - qt_network_dep, -] - moc = find_program('moc-qt4', required: false) if not moc.found() moc = qt_core_dep.get_pkgconfig_variable('moc_location') @@ -34,8 +27,13 @@ foreach example: examples executable( example[0], example[0] + '.cpp', - include_directories: libnm_core_inc, - dependencies: deps, + include_directories: libnm_core_public_inc, + dependencies: [ + dbus_dep, + qt_core_dep, + qt_dbus_dep, + qt_network_dep, + ], link_depends: example[1], ) endforeach |