summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-06-09 18:06:15 +0200
committerThomas Haller <thaller@redhat.com>2020-06-11 10:53:50 +0200
commite17a067e684d070c438febcc3e5c756eb984e821 (patch)
tree9d8920864a0ee093ca5ab2cc1472d6a3589f2edd /docs
parentb760dee8c86ce0ab61ef3c1cda2cdb32e0519f85 (diff)
downloadNetworkManager-e17a067e684d070c438febcc3e5c756eb984e821.tar.gz
all: move "shared/nm-libnm-core-intern" to "libnm-core/nm-libnm-core-intern"
The "shared" directory is used by libnm-core, it should thus only depend on code that is in the "shared" directory. Otherwise there is a circular dependency, and meson's subdir() does not work nicely. Also, libnm-core is really part of (and also an extension of) libnm-core, so it belongs there. I guess, the original idea was that this is also an extension for libnm, so another project could take these utility functions (by copying them into their source tree) and use them. That is still possible, it's just that the sources are no longer under the shared directory. Also add a readme to explain the non-obvious meaning of these files.
Diffstat (limited to 'docs')
-rw-r--r--docs/libnm/Makefile.am5
-rw-r--r--docs/libnm/meson.build5
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am
index 7d16b8ca65..f02c2de4f1 100644
--- a/docs/libnm/Makefile.am
+++ b/docs/libnm/Makefile.am
@@ -58,6 +58,11 @@ IGNORE_HFILES= \
nm-keyfile-internal.h \
nm-keyfile-utils.h \
\
+ nm-auth-subject.h \
+ nm-common-macros.h \
+ nm-ethtool-utils.h \
+ nm-libnm-core-utils.h \
+ \
$(NULL)
# Images to copy into HTML directory.
diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build
index 92dce23d0c..460e3e224d 100644
--- a/docs/libnm/meson.build
+++ b/docs/libnm/meson.build
@@ -30,6 +30,11 @@ private_headers = [
'nm-keyfile-internal.h',
'nm-keyfile-utils.h',
+
+ 'nm-auth-subject.h',
+ 'nm-common-macros.h',
+ 'nm-ethtool-utils.h',
+ 'nm-libnm-core-utils.h',
]
scan_args = [