diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-09-11 10:48:19 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-09-17 17:03:54 +0100 |
| commit | d3900dea28f9ab8207c35365b5fee2058b68fe91 (patch) | |
| tree | f5b0dfd717f5cc5795bcfd5101d0f9b558d7a52e /docs/Makefile | |
| parent | 730127d4a1f5fa60082c86e03e3b872b8e934819 (diff) | |
| download | xen-d3900dea28f9ab8207c35365b5fee2058b68fe91.tar.gz xen-d3900dea28f9ab8207c35365b5fee2058b68fe91.tar.bz2 xen-d3900dea28f9ab8207c35365b5fee2058b68fe91.zip | |
docs: fix documentation index for hypercalls
This was broken by 118104e5eaf2 "docs: Build docs for ARM as well as x86_64".
Move docs to hypercall/ARCH instead of hypercall-ARCH.
Support mulitple levels of subdirectories in gen-html-index tool.
This removes the need for a symlink hypercall->hypercall-x86_64 since there is
now a proper index at hypercall/index.html.
Update INDEX to human readable names for the architecture specific hypercalls.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'docs/Makefile')
| -rw-r--r-- | docs/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/docs/Makefile b/docs/Makefile index f4801716b3..8d5d48e355 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -15,8 +15,7 @@ DOC_HTML := $(patsubst %.markdown,html/%.html,$(DOC_MARKDOWN)) \ $(patsubst man/%.pod.1,html/man/%.1.html,$(DOC_MAN1SRC)) \ $(patsubst man/%.pod.5,html/man/%.5.html,$(DOC_MAN5SRC)) \ $(patsubst %.txt,html/%.txt,$(wildcard misc/*.txt)) \ - html/hypercall/index.html \ - $(patsubst %,html/hypercall-%/index.html,$(DOC_ARCHES)) + $(patsubst %,html/hypercall/%/index.html,$(DOC_ARCHES)) DOC_TXT := $(patsubst %.txt,txt/%.txt,$(wildcard misc/*.txt)) \ $(patsubst %.markdown,txt/%.txt,$(DOC_MARKDOWN)) \ $(patsubst man/%.pod.1,txt/man/%.1.txt,$(DOC_MAN1SRC)) \ @@ -125,9 +124,9 @@ else endif # For non-x86 arches exclude the subarch whole x86 arch. -$(foreach i,$(filter-out x86_32 x86_64,$(DOC_ARCHES)),html/hypercall-$(i)/index.html): EXTRA_EXCLUDE := -X arch-x86 +$(foreach i,$(filter-out x86_32 x86_64,$(DOC_ARCHES)),html/hypercall/$(i)/index.html): EXTRA_EXCLUDE := -X arch-x86 -html/hypercall-%/index.html: $(CURDIR)/xen-headers Makefile +html/hypercall/%/index.html: $(CURDIR)/xen-headers Makefile rm -rf $(@D) $(INSTALL_DIR) $(@D) $(PERL) -w $(CURDIR)/xen-headers -O $(@D) \ @@ -137,10 +136,7 @@ html/hypercall-%/index.html: $(CURDIR)/xen-headers Makefile $(EXTRA_EXCLUDE) \ $(XEN_ROOT)/xen include/public include/xen/errno.h -html/hypercall/index.html: html/hypercall-x86_64/index.html - ln -nfs hypercall-x86_64 html/hypercall - --include $(wildcard html/hypercall-*/.deps) +-include $(wildcard html/hypercall/*/.deps) txt/%.txt: %.txt $(INSTALL_DIR) $(@D) |