diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-02-19 15:23:34 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-02-24 12:48:37 +0100 |
| commit | 9bba4871f3d46a3eccec84ac63e053e1dd1775b9 (patch) | |
| tree | 45a7c0786e32220ff5100a171f5c9efb889b0621 /docs | |
| parent | b53c50e7786c6a5015fae0fc7538ccdd460ef985 (diff) | |
| download | NetworkManager-9bba4871f3d46a3eccec84ac63e053e1dd1775b9.tar.gz | |
build: move "libnm/" to "src/" and split it
Like with "libnm-core/", split "libnm/" into different directories for
the public headers, for the implementation and for the helper "aux"
library.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libnm/Makefile.am | 17 | ||||
| -rw-r--r-- | docs/libnm/meson.build | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index c868fff790..3de6976b70 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -17,8 +17,11 @@ DOC_SOURCE_DIR= \ $(top_srcdir)/src/libnm-core-public \ $(top_builddir)/src/libnm-core-impl \ $(top_srcdir)/src/libnm-core-impl \ - $(top_srcdir)/libnm \ - $(top_builddir)/libnm + $(top_srcdir)/src/libnm-client-public \ + $(top_builddir)/src/libnm-client-public \ + $(top_srcdir)/src/libnm-client-impl \ + $(top_builddir)/src/libnm-client-impl \ + $(NULL) # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS=--rebuild-types --rebuild-sections --ignore-decorators="NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?" @@ -30,8 +33,8 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml FIXXREF_OPTIONS= # Used for dependencies. -HFILE_GLOB=$(top_srcdir)/src/libnm-core-public/*.h $(top_srcdir)/libnm/*.h -CFILE_GLOB=$(top_srcdir)/src/libnm-core-impl/*.c $(top_srcdir)/libnm/*.c +HFILE_GLOB=$(top_srcdir)/src/libnm-core-public/*.h $(top_srcdir)/src/libnm-client-public/*.h +CFILE_GLOB=$(top_srcdir)/src/libnm-core-impl/*.c $(top_srcdir)/src/libnm-client-impl/*.c # Header files to ignore when scanning. IGNORE_HFILES= \ @@ -88,14 +91,14 @@ extra_files = libnm.png GTKDOC_CFLAGS = \ -I$(top_builddir)/src/libnm-core-public \ -I$(top_srcdir)/src/libnm-core-public \ - -I$(top_builddir)/libnm \ - -I$(top_srcdir)/libnm \ + -I$(top_srcdir)/src/libnm-client-public \ + -I$(top_builddir)/src/libnm-client-public \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) GTKDOC_LIBS = \ - $(top_builddir)/libnm/libnm.la \ + $(top_builddir)/src/libnm-client-impl/libnm.la \ $(GLIB_LIBS) \ $(SANITIZER_EXEC_LDFLAGS) diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index 7cb5c646ee..746335c4ce 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -54,7 +54,7 @@ gnome.gtkdoc( main_xml: libnm_name + '-docs.xml', src_dir: [ libnm_core_public_inc, - libnm_inc, + libnm_client_public_inc, ], dependencies: libnm_dep, scan_args: scan_args, |