diff options
| author | Jules Aguillon <juloo.dsi@gmail.com> | 2021-12-07 13:46:43 +0100 |
|---|---|---|
| committer | Jules Aguillon <jules@j3s.fr> | 2022-01-28 16:00:34 +0100 |
| commit | ce478b19c4cf358c0a030019e95dbfbd57158221 (patch) | |
| tree | d633a82ddb8844cfea58cd8d375b24e9d05abf48 /api_docgen | |
| parent | cf7c3af7124566b08a32b69c478c3ed36f6cada0 (diff) | |
| download | ocaml-ce478b19c4cf358c0a030019e95dbfbd57158221.tar.gz | |
api_docgen: Don't expect ROOTDIR in doc Makefiles
These Makefiles are no longer included.
Diffstat (limited to 'api_docgen')
| -rw-r--r-- | api_docgen/Makefile | 7 | ||||
| -rw-r--r-- | api_docgen/Makefile.common | 1 | ||||
| -rw-r--r-- | api_docgen/ocamldoc/Makefile | 14 | ||||
| -rw-r--r-- | api_docgen/odoc/Makefile | 10 |
4 files changed, 19 insertions, 13 deletions
diff --git a/api_docgen/Makefile b/api_docgen/Makefile index dce2150e7d..0725464581 100644 --- a/api_docgen/Makefile +++ b/api_docgen/Makefile @@ -12,14 +12,15 @@ #* special exception on linking described in the file LICENSE. * #* * #************************************************************************** +# Used by included Makefiles ROOTDIR = .. --include $(ROOTDIR)/Makefile.build_config +-include ../Makefile.build_config odoc-%: - $(MAKE) -C odoc $* ROOTDIR=../.. + $(MAKE) -C odoc $* ocamldoc-%: - $(MAKE) -C ocamldoc $* ROOTDIR=../.. + $(MAKE) -C ocamldoc $* ifeq ($(DOCUMENTATION_TOOL),odoc) man: odoc-man diff --git a/api_docgen/Makefile.common b/api_docgen/Makefile.common index 34f59c1271..2a5e7e304d 100644 --- a/api_docgen/Makefile.common +++ b/api_docgen/Makefile.common @@ -12,7 +12,6 @@ #* special exception on linking described in the file LICENSE. * #* * #************************************************************************** -ROOTDIR = .. DOCGEN= $(ROOTDIR)/api_docgen include $(ROOTDIR)/Makefile.common diff --git a/api_docgen/ocamldoc/Makefile b/api_docgen/ocamldoc/Makefile index fe78a7a2d0..b83059e3c6 100644 --- a/api_docgen/ocamldoc/Makefile +++ b/api_docgen/ocamldoc/Makefile @@ -12,9 +12,11 @@ #* special exception on linking described in the file LICENSE. * #* * #************************************************************************** -include $(ROOTDIR)/api_docgen/Makefile.common -include $(ROOTDIR)/ocamldoc/Makefile.best_ocamldoc -vpath %.mli $(ROOTDIR)/stdlib $(DOC_COMPILERLIBS_DIRS) $(DOC_STDLIB_DIRS) +# Used by included Makefiles +ROOTDIR = ../.. +include ../Makefile.common +include ../../ocamldoc/Makefile.best_ocamldoc +vpath %.mli ../../stdlib $(DOC_COMPILERLIBS_DIRS) $(DOC_STDLIB_DIRS) man: build/man/Stdlib.3o @@ -41,7 +43,7 @@ build/latex/ifocamldoc.tex: | build/latex $(libref:%=build/libref/%.odoc): build/libref/%.odoc: %.mli | build/libref $(OCAMLDOC_RUN) -nostdlib -hide Stdlib -lib Stdlib \ -pp \ -"$(AWK) -v ocamldoc=true -f $(ROOTDIR)/stdlib/expand_module_aliases.awk" \ +"$(AWK) -v ocamldoc=true -f ../../stdlib/expand_module_aliases.awk" \ $(DOC_STDLIB_INCLUDES) $< -dump $@ $(compilerlibref:%=build/compilerlibref/%.odoc):\ @@ -100,9 +102,9 @@ build/latex/Stdlib.tex: $(ALL_COMPILED_DOC) | build/latex build/latex/alldoc.pdf: build/latex/Stdlib.tex build/latex/alldoc.tex \ | build/latex cd build/latex && \ - TEXINPUTS=$${TEXINPUTS}:$(ROOTDIR)/ocamldoc pdflatex alldoc + TEXINPUTS=$${TEXINPUTS}:../../ocamldoc pdflatex alldoc cd build/latex && \ - TEXINPUTS=$${TEXINPUTS}:$(ROOTDIR)/ocamldoc pdflatex alldoc + TEXINPUTS=$${TEXINPUTS}:../../ocamldoc pdflatex alldoc stdlib_INPUT=$(foreach module,\ $(filter-out stdlib.mli camlinternal%,$(stdlib_UNPREFIXED)),\ diff --git a/api_docgen/odoc/Makefile b/api_docgen/odoc/Makefile index d99f01c5b7..2f5dcf8e6e 100644 --- a/api_docgen/odoc/Makefile +++ b/api_docgen/odoc/Makefile @@ -12,10 +12,14 @@ #* special exception on linking described in the file LICENSE. * #* * #************************************************************************** -include $(ROOTDIR)/api_docgen/Makefile.common -vpath %.cmti $(ROOTDIR)/stdlib $(DOC_COMPILERLIBS_DIRS) $(DOC_STDLIB_DIRS) -vpath %.cmt $(ROOTDIR)/stdlib +# Used by included Makefiles +ROOTDIR = ../.. + +include ../Makefile.common + +vpath %.cmti ../../stdlib $(DOC_COMPILERLIBS_DIRS) $(DOC_STDLIB_DIRS) +vpath %.cmt ../../stdlib ifeq ($(DOCUMENTATION_TOOL),odoc) odoc ?= $(DOCUMENTATION_TOOL_CMD) |