Rename `error-index-generator` to `error_index_generator`

[rust.git] / mk / docs.mk

diff --git a/mk/docs.mk b/mk/docs.mk
index b0872c88c141a5f892fbc2ae06d26120e8878181..83cdb7f8023bcdac86de2ce319bde1c4a1d9a0d1 100644 (file)
--- a/mk/docs.mk
+++ b/mk/docs.mk
@@ -59,13 +59,14 @@ RUSTBOOK_EXE = $(HBIN2_H_$(CFG_BUILD))/rustbook$(X_$(CFG_BUILD))
 # ./configure
 RUSTBOOK = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(RUSTBOOK_EXE)
 
-# The error-index-generator executable...
-ERR_IDX_GEN_EXE = $(HBIN2_H_$(CFG_BUILD))/error-index-generator$(X_$(CFG_BUILD))
+# The error_index_generator executable...
+ERR_IDX_GEN_EXE = $(HBIN2_H_$(CFG_BUILD))/error_index_generator$(X_$(CFG_BUILD))
 ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
+ERR_IDX_GEN_MD = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE) markdown
 
 D := $(S)src/doc
 
-DOC_TARGETS := trpl nomicon style error-index
+DOC_TARGETS := book nomicon style error-index
 COMPILER_DOC_TARGETS :=
 DOC_L10N_TARGETS :=
 
@@ -194,12 +195,12 @@ docs: $(DOC_TARGETS)
 doc: docs
 compiler-docs: $(COMPILER_DOC_TARGETS)
 
-trpl: doc/book/index.html
+book: doc/book/index.html
 
-doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
+doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/book/*.md) | doc/
        @$(call E, rustbook: $@)
        $(Q)rm -rf doc/book
-       $(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book
+       $(Q)$(RUSTBOOK) build $(S)src/doc/book doc/book
 
 nomicon: doc/nomicon/index.html
 
@@ -217,6 +218,12 @@ doc/style/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/style/*.md) | doc/
 
 error-index: doc/error-index.html
 
-doc/error-index.html: $(ERR_IDX_GEN_EXE) | doc/
-       $(Q)$(call E, error-index-generator: $@)
+# Metadata used to generate the index is created as a side effect of
+# the build so this depends on every crate being up to date.
+doc/error-index.html: $(ERR_IDX_GEN_EXE) $(CSREQ$(2)_T_$(CFG_BUILD)_H_$(CFG_BUILD)) | doc/
+       $(Q)$(call E, error_index_generator: $@)
        $(Q)$(ERR_IDX_GEN)
+
+doc/error-index.md: $(ERR_IDX_GEN_EXE) $(CSREQ$(2)_T_$(CFG_BUILD)_H_$(CFG_BUILD)) | doc/
+       $(Q)$(call E, error_index_generator: $@)
+       $(Q)$(ERR_IDX_GEN_MD)