External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs: fix handling of static assets in build dir

Browse Source 
We previously added a hack to symlink CSS files from the source dir into
the build dir, to allow the website to be browsed locally. We should
have also done this for any images.

This change merges several variables into one "$(assets)" so that we
treat all static files in the root dir the same way.

Reviewed-by: Laine Stump <laine@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-04-16 12:41:52 +01:00
parent b85a8f2288
commit 9e2160bef0
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
docs/Makefile.am
View File

@ -48,7 +48,7 @@ vpathhack:
do \ do \
test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \ test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \
done done
@for file in $(css); \ @for file in $(assets); \
do \ do \
test -e $$file || ln -s $(srcdir)/$$file $$file ; \ test -e $$file || ln -s $(srcdir)/$$file $$file ; \
done done
@ -58,7 +58,7 @@ clean-local:
do \ do \
rm -f $$dir ; \ rm -f $$dir ; \
done done
for file in $(css); \ for file in $(assets); \
do \ do \
rm -f $$file ; \ rm -f $$file ; \
done done
@ -104,12 +104,6 @@ apipng = \
apirefdir = $(HTML_DIR)/html apirefdir = $(HTML_DIR)/html
apiref_DATA = $(apihtml) $(apiadminhtml) $(apiqemuhtml) $(apilxchtml) $(apipng) apiref_DATA = $(apihtml) $(apiadminhtml) $(apiqemuhtml) $(apilxchtml) $(apipng)
css = \
generic.css \
libvirt.css \
mobile.css \
main.css
javascript = \ javascript = \
js/main.js \ js/main.js \
$(NULL) $(NULL)
@ -156,20 +150,23 @@ logofiles = \
logofilesdir = $(HTML_DIR)/logos logofilesdir = $(HTML_DIR)/logos
logofiles_DATA = $(logofiles) logofiles_DATA = $(logofiles)
png = \ assets = \
32favicon.png \ 32favicon.png \
architecture.gif \
generic.css \
libvirt.css \
libvirt-daemon-arch.png \ libvirt-daemon-arch.png \
libvirt-driver-arch.png \ libvirt-driver-arch.png \
libvirt-object-model.png \ libvirt-object-model.png \
main.css \
migration-managed-direct.png \ migration-managed-direct.png \
migration-managed-p2p.png \ migration-managed-p2p.png \
migration-native.png \ migration-native.png \
migration-tunnel.png \ migration-tunnel.png \
migration-unmanaged-direct.png migration-unmanaged-direct.png \
mobile.css \
gif = \ node.gif \
architecture.gif \ $(NULL)
node.gif
internals_html_in = \ internals_html_in = \
$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in))
@ -326,7 +323,7 @@ dot_html = \
$(dot_rst_html_in:%.html.in=%.html) $(dot_rst_html_in:%.html.in=%.html)
htmldir = $(HTML_DIR) htmldir = $(HTML_DIR)
html_DATA = $(css) $(png) $(gif) $(dot_html) html_DATA = $(assets) $(dot_html)
apidir = $(pkgdatadir)/api apidir = $(pkgdatadir)/api
api_DATA = \ api_DATA = \
@ -351,8 +348,8 @@ schema_DATA = $(wildcard $(srcdir)/schemas/*.rng)
EXTRA_DIST= \ EXTRA_DIST= \
site.xsl subsite.xsl newapi.xsl page.xsl \ site.xsl subsite.xsl newapi.xsl page.xsl \
wrapstring.xsl \ wrapstring.xsl \
$(dot_html_in) $(dot_rst) $(gif) $(apipng) \ $(dot_html_in) $(dot_rst) $(apipng) \
$(fig) $(png) $(css) \ $(fig) $(assets) \
$(javascript) $(logofiles) \ $(javascript) $(logofiles) \
$(internals_html_in) $(internals_rst) $(fonts) \ $(internals_html_in) $(internals_rst) $(fonts) \
$(kbase_html_in) $(kbase_rst) \ $(kbase_html_in) $(kbase_rst) \