diff --git a/docs/api.rst b/docs/api.rst index a8f527e197..d9f01fb403 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -260,6 +260,6 @@ rules and guidelines. In order to add new API functionality follow the instructions regarding `implementing a new API in libvirt `__. -.. |first class objects exposed by the API| image:: libvirt-object-model.png -.. |The libvirt driver architecture| image:: libvirt-driver-arch.png -.. |The libvirt daemon and remote architecture| image:: libvirt-daemon-arch.png +.. |first class objects exposed by the API| image:: images/libvirt-object-model.png +.. |The libvirt driver architecture| image:: images/libvirt-driver-arch.png +.. |The libvirt daemon and remote architecture| image:: images/libvirt-daemon-arch.png diff --git a/docs/goals.html.in b/docs/goals.html.in index 39d5e75359..d205bf4f42 100644 --- a/docs/goals.html.in +++ b/docs/goals.html.in @@ -15,7 +15,7 @@ virtualized machine provided by the hypervisor

- Hypervisor and domains running on a node + Hypervisor and domains running on a node

Now we can define the goal of libvirt: to provide a common and stable layer sufficient to securely manage domains on a node, possibly diff --git a/docs/event_loop_simple.png b/docs/images/event_loop_simple.png similarity index 100% rename from docs/event_loop_simple.png rename to docs/images/event_loop_simple.png diff --git a/docs/event_loop_simple.svg b/docs/images/event_loop_simple.svg similarity index 100% rename from docs/event_loop_simple.svg rename to docs/images/event_loop_simple.svg diff --git a/docs/event_loop_worker.png b/docs/images/event_loop_worker.png similarity index 100% rename from docs/event_loop_worker.png rename to docs/images/event_loop_worker.png diff --git a/docs/event_loop_worker.svg b/docs/images/event_loop_worker.svg similarity index 100% rename from docs/event_loop_worker.svg rename to docs/images/event_loop_worker.svg diff --git a/docs/libvirt-daemon-arch.png b/docs/images/libvirt-daemon-arch.png similarity index 100% rename from docs/libvirt-daemon-arch.png rename to docs/images/libvirt-daemon-arch.png diff --git a/docs/libvirt-daemon-arch.svg b/docs/images/libvirt-daemon-arch.svg similarity index 100% rename from docs/libvirt-daemon-arch.svg rename to docs/images/libvirt-daemon-arch.svg diff --git a/docs/libvirt-driver-arch.png b/docs/images/libvirt-driver-arch.png similarity index 100% rename from docs/libvirt-driver-arch.png rename to docs/images/libvirt-driver-arch.png diff --git a/docs/libvirt-driver-arch.svg b/docs/images/libvirt-driver-arch.svg similarity index 100% rename from docs/libvirt-driver-arch.svg rename to docs/images/libvirt-driver-arch.svg diff --git a/docs/libvirt-object-model.png b/docs/images/libvirt-object-model.png similarity index 100% rename from docs/libvirt-object-model.png rename to docs/images/libvirt-object-model.png diff --git a/docs/libvirt-object-model.svg b/docs/images/libvirt-object-model.svg similarity index 100% rename from docs/libvirt-object-model.svg rename to docs/images/libvirt-object-model.svg diff --git a/docs/libvirt-virConnect-example.png b/docs/images/libvirt-virConnect-example.png similarity index 100% rename from docs/libvirt-virConnect-example.png rename to docs/images/libvirt-virConnect-example.png diff --git a/docs/libvirt-virConnect-example.svg b/docs/images/libvirt-virConnect-example.svg similarity index 100% rename from docs/libvirt-virConnect-example.svg rename to docs/images/libvirt-virConnect-example.svg diff --git a/docs/images/meson.build b/docs/images/meson.build new file mode 100644 index 0000000000..85a35da4aa --- /dev/null +++ b/docs/images/meson.build @@ -0,0 +1,24 @@ +docs_image_files = [ + 'event_loop_simple.png', + 'event_loop_worker.png', + 'libvirt-daemon-arch.png', + 'libvirt-driver-arch.png', + 'libvirt-object-model.png', + 'libvirt-virConnect-example.png', + 'migration-managed-direct.png', + 'migration-managed-p2p.png', + 'migration-native.png', + 'migration-tunnel.png', + 'migration-unmanaged-direct.png', + 'node.gif', +] + +install_data(docs_image_files, install_dir: docs_html_dir / 'images') + +foreach file : docs_image_files + # This hack enables us to view the web pages + # from within the uninstalled build tree + configure_file(input: file, output: file, copy: true) + + install_web_files += '@0@:@1@'.format(meson.current_source_dir() / file, docs_html_dir / 'images') +endforeach diff --git a/docs/migration-managed-direct.png b/docs/images/migration-managed-direct.png similarity index 100% rename from docs/migration-managed-direct.png rename to docs/images/migration-managed-direct.png diff --git a/docs/migration-managed-direct.svg b/docs/images/migration-managed-direct.svg similarity index 100% rename from docs/migration-managed-direct.svg rename to docs/images/migration-managed-direct.svg diff --git a/docs/migration-managed-p2p.png b/docs/images/migration-managed-p2p.png similarity index 100% rename from docs/migration-managed-p2p.png rename to docs/images/migration-managed-p2p.png diff --git a/docs/migration-managed-p2p.svg b/docs/images/migration-managed-p2p.svg similarity index 100% rename from docs/migration-managed-p2p.svg rename to docs/images/migration-managed-p2p.svg diff --git a/docs/migration-native.png b/docs/images/migration-native.png similarity index 100% rename from docs/migration-native.png rename to docs/images/migration-native.png diff --git a/docs/migration-native.svg b/docs/images/migration-native.svg similarity index 100% rename from docs/migration-native.svg rename to docs/images/migration-native.svg diff --git a/docs/migration-tunnel.png b/docs/images/migration-tunnel.png similarity index 100% rename from docs/migration-tunnel.png rename to docs/images/migration-tunnel.png diff --git a/docs/migration-tunnel.svg b/docs/images/migration-tunnel.svg similarity index 100% rename from docs/migration-tunnel.svg rename to docs/images/migration-tunnel.svg diff --git a/docs/migration-unmanaged-direct.png b/docs/images/migration-unmanaged-direct.png similarity index 100% rename from docs/migration-unmanaged-direct.png rename to docs/images/migration-unmanaged-direct.png diff --git a/docs/migration-unmanaged-direct.svg b/docs/images/migration-unmanaged-direct.svg similarity index 100% rename from docs/migration-unmanaged-direct.svg rename to docs/images/migration-unmanaged-direct.svg diff --git a/docs/node.gif b/docs/images/node.gif similarity index 100% rename from docs/node.gif rename to docs/images/node.gif diff --git a/docs/node.svg b/docs/images/node.svg similarity index 100% rename from docs/node.svg rename to docs/images/node.svg diff --git a/docs/internals.html.in b/docs/internals.html.in index 3a96ff73b4..e474f7ddd7 100644 --- a/docs/internals.html.in +++ b/docs/internals.html.in @@ -35,7 +35,7 @@

virConnectOpen calling sequence + src="images/libvirt-virConnect-example.png"/>