diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-06-09 17:20:40 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-06-11 10:53:50 +0200 |
| commit | b760dee8c86ce0ab61ef3c1cda2cdb32e0519f85 (patch) | |
| tree | e46f1ca994458af32ef076c74488285c094ac820 /docs/libnm | |
| parent | 98f3d68cbea3367c00e5d5dc00fabd7ad024edf7 (diff) | |
| download | NetworkManager-b760dee8c86ce0ab61ef3c1cda2cdb32e0519f85.tar.gz | |
all: move "shared/nm-keyfile" to "libnm-core/nm-keyfile"
Originally, these files were part of libnm-core and linked together.
However, that is a licensing violation, because the code is GPL-2.0+
licensed, while libnm-core also gets linked with libnm (it must thus
be LGPL-2.1+). The original intent behind moving the code to "shared/"
was to avoid the licensing issue, but also to prepare when we would add
a separate, GPL licensed libnm-keyfile. However, currently we hope to
be able to relicense the code, so that it actually could be exposed as
part of libnm. This is work in progress at ([1]).
[1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/ ## 517
Anyway, the current directory layout is problematic. libnm-keyfile
depends on libnm-core, while libnm-core depends on code under shared.
That means, there is a circular dependency and meson's subdir() does
not work well.
Move the code.
Diffstat (limited to 'docs/libnm')
| -rw-r--r-- | docs/libnm/Makefile.am | 14 | ||||
| -rw-r--r-- | docs/libnm/meson.build | 12 |
2 files changed, 16 insertions, 10 deletions
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index ce82d7eb94..7d16b8ca65 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -34,11 +34,12 @@ CFILE_GLOB=$(top_srcdir)/libnm-core/*.c $(top_srcdir)/libnm/*.c # Header files to ignore when scanning. IGNORE_HFILES= \ common.h \ - nm-crypto.h \ - nm-crypto-impl.h \ - nm-dbus-helpers.h \ nm-core-internal.h \ + nm-core-tests-enum-types.h \ nm-core-types-internal.h \ + nm-crypto-impl.h \ + nm-crypto.h \ + nm-dbus-helpers.h \ nm-device-private.h \ nm-dhcp4-config.h \ nm-dhcp6-config.h \ @@ -51,10 +52,13 @@ IGNORE_HFILES= \ nm-remote-connection-private.h \ nm-setting-private.h \ nm-utils-private.h \ - nm-core-tests-enum-types.h \ + \ + test-general-enums.h \ + \ nm-keyfile-internal.h \ nm-keyfile-utils.h \ - test-general-enums.h + \ + $(NULL) # Images to copy into HTML directory. HTML_IMAGES = libnm.png diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index 66cd31e899..92dce23d0c 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -7,11 +7,12 @@ src_dirs = [ private_headers = [ 'common.h', - 'nm-crypto.h', - 'nm-crypto-impl.h', - 'nm-dbus-helpers.h', 'nm-core-internal.h', + 'nm-core-tests-enum-types.h', 'nm-core-types-internal.h', + 'nm-crypto-impl.h', + 'nm-crypto.h', + 'nm-dbus-helpers.h', 'nm-device-private.h', 'nm-dhcp4-config.h', 'nm-dhcp6-config.h', @@ -24,10 +25,11 @@ private_headers = [ 'nm-remote-connection-private.h', 'nm-setting-private.h', 'nm-utils-private.h', - 'nm-core-tests-enum-types.h', + + 'test-general-enums.h', + 'nm-keyfile-internal.h', 'nm-keyfile-utils.h', - 'test-general-enums.h', ] scan_args = [ |