meson: docs: introduce docs directory

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6d4fcdc831a6fc47e4676e8b8c0029c703c9833a..6d97ed55c5b845660bbf7e5d7323df5eac80774d 100644 (file)
--- 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 (file)
index 0000000..529a1c0
--- /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 a1f4435dc3b3495a84adb5620084d93ccc0ebec2..5b9b45a5dc7802c0ac2029d0ed0f28cd90eb8cbf 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2231,6 +2231,8 @@ subdir('examples')
 
 subdir('po')
 
+subdir('docs')
+
 
 # generate meson-config.h file
 configure_file(output: 'meson-config.h', configuration: conf)