chiark / gitweb /
docs: Refer to new sphinx docs, not gone shapelib toml rustdoc
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 10 Jun 2021 12:46:17 +0000 (13:46 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 10 Jun 2021 12:46:17 +0000 (13:46 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Makefile

index 8f9d48bf5bc6885ad8918340732233326b119d0a..cce4386c7991676432ccea1a8959d3a2513920bc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,9 @@ full-check: all check cargo-syntaxcheck-release shapelib doc-sphinx
 full-check: for-deploy release
 everything: debug doc release check bundled-sources
 
-shapelib: templates/shapelib.html stamp/cargo.doc-otter-only
+shapelib: templates/shapelib.html docs/html/index.html
        @echo 'Shape library preview and docs can now be found here:'
-       @echo '  file://$(PWD)/$<'
-       @echo '  file://$(abspath $(TARGET_DIR)/doc/otter/shapelib_toml/index.html)'
+       @for f in $^; do echo '  file://$(PWD)/'$$f; done
 
 MAKEFILE_DEP ?= Makefile
 MAKEFILE_FIND_X ?=
@@ -222,10 +221,6 @@ stamp/cargo.doc: $(call rsrcs,.)
        $(CARGO) doc $(CARGO_DOC_OPTS) --workspace 2>&1 |egrep -vf .cargo-doc-suppress-errors
        $(stamp)
 
-stamp/cargo.doc-otter-only: $(call rsrcs,.)
-       $(CARGO) doc $(CARGO_DOC_OPTS) --workspace -p otter --no-deps
-       $(stamp)
-
 $(addprefix stamp/cargo.wasm-,$(DR)):: \
 stamp/cargo.wasm-%: $(call rsrcs, base wasm Cargo.*)
        $(CARGO) build --target $(WASM) -p otter-wasm $(call cr,$*)