[libvirt PATCH 316/351] meson: docs: introduce docs directory
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
docs/Makefile.am | 31 +------------------------------
docs/meson.build | 30 ++++++++++++++++++++++++++++++
meson.build | 2 ++
3 files changed, 33 insertions(+), 30 deletions(-)
create mode 100644 docs/meson.build
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6d4fcdc831a..6d97ed55c5b 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -16,8 +16,6 @@
## License along with this library. If not, see
## <http://www.gnu.org/licenses/>;.
-HTML_DIR = $(docdir)/html
-
modules = \
libvirt-common \
libvirt-domain \
@@ -140,33 +138,6 @@ logofiles = \
logofilesdir = $(HTML_DIR)/logos
logofiles_DATA = $(logofiles)
-assets = \
- android-chrome-192x192.png \
- android-chrome-256x256.png \
- apple-touch-icon.png \
- architecture.gif \
- browserconfig.xml \
- favicon.ico \
- favicon-16x16.png \
- favicon-32x32.png \
- generic.css \
- libvirt.css \
- libvirt-daemon-arch.png \
- libvirt-driver-arch.png \
- libvirt-object-model.png \
- libvirt-virConnect-example.png \
- main.css \
- manifest.json \
- migration-managed-direct.png \
- migration-managed-p2p.png \
- migration-native.png \
- migration-tunnel.png \
- migration-unmanaged-direct.png \
- mobile.css \
- mstile-150x150.png \
- node.gif \
- $(NULL)
-
internals_html_in = \
$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in))
internals_rst = \
@@ -324,7 +295,7 @@ dot_html = \
$(dot_rst_html_in:%.html.in=%.html)
htmldir = $(HTML_DIR)
-html_DATA = $(assets) $(dot_html)
+html_DATA = $(dot_html)
apidir = $(pkgdatadir)/api
api_DATA = \
diff --git a/docs/meson.build b/docs/meson.build
new file mode 100644
index 00000000000..529a1c003a7
--- /dev/null
+++ b/docs/meson.build
@@ -0,0 +1,30 @@
+docs_html_dir = docdir / 'html'
+
+docs_assets = [
+ 'android-chrome-192x192.png',
+ 'android-chrome-256x256.png',
+ 'apple-touch-icon.png',
+ 'architecture.gif',
+ 'browserconfig.xml',
+ 'favicon.ico',
+ 'favicon-16x16.png',
+ 'favicon-32x32.png',
+ 'generic.css',
+ 'libvirt.css',
+ 'libvirt-daemon-arch.png',
+ 'libvirt-driver-arch.png',
+ 'libvirt-object-model.png',
+ 'libvirt-virConnect-example.png',
+ 'main.css',
+ 'manifest.json',
+ 'migration-managed-direct.png',
+ 'migration-managed-p2p.png',
+ 'migration-native.png',
+ 'migration-tunnel.png',
+ 'migration-unmanaged-direct.png',
+ 'mobile.css',
+ 'mstile-150x150.png',
+ 'node.gif',
+]
+
+install_data(docs_assets, install_dir: docs_html_dir)
diff --git a/meson.build b/meson.build
index 8b434929825..65843ed574d 100644
--- a/meson.build
+++ b/meson.build
@@ -2211,6 +2211,8 @@ subdir('examples')
subdir('po')
+subdir('docs')
+
# generate meson-config.h file
configure_file(output: 'meson-config.h', configuration: conf)
--
2.26.2