X-Git-Url: https://git.ralfj.de/rust-101.git/blobdiff_plain/cb170f41304c809a22de172621845e637e28b8d2..68122e49effdf4d4210ddc0ebec69af88b50812a:/Makefile

diff --git a/Makefile b/Makefile
index 01d7298..9264efc 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,12 @@ all: docs workspace crates
 ## Documentation
 docs: $(DOCFILES)
 
-.tmp/docs/%.rs: src/%.rs Makefile
+.tmp/docs/%.rs: src/%.rs Makefile dup-unimpl.sed
 	@mkdir -p .tmp/docs
 	@echo "$< -> $@"
-	@# sed-fu: remove the "@" from "//@", and remove trailing "/*@*/".
-	@sed 's|^\(\s*//\)@|\1|;s|\s*/\*@\*/$$||' $< > $@
+	@# sed-fu: remove the "@" from "//@", and remove trailing "/*@*/", replace lines ending in  "/*@@*/" by "unimplemented!()".
+	@# Also coalesce multiple adjacent such lines to one.
+	@sed 's|^\(\s*//\)@|\1|;s|\s*/\*@\*/$$||;s|\(\s*\)\S.*/\*@@\*/|\1unimplemented!()|' $< | sed -f dup-unimpl.sed > $@
 
 docs/%.html: .tmp/docs/%.rs
 	@./pycco-rs $<
@@ -28,7 +29,7 @@ workspace/src/%.rs: src/%.rs Makefile dup-unimpl.sed
 	@echo "$< -> $@"
 	@# sed-fu: remove lines starting with "//@", and replace those ending in "/*@*/" by "unimplemented!()".
 	@# Also coalesce multiple adjacent such lines to one.
-	@sed '/^\s*\/\/@/d;s|\(\s*\)\S.*/\*@\*/|\1unimplemented!()|' $< | sed -f dup-unimpl.sed > $@
+	@sed '/^\s*\/\/@/d;s|\(\s*\)\S.*/\*@@\?\*/|\1unimplemented!()|' $< | sed -f dup-unimpl.sed > $@
 
 workspace/src/main.rs:
 	# Don't touch this file
@@ -36,5 +37,5 @@ workspace/src/main.rs:
 ## Crates
 crates: $(WORKSPACEFILES)
 	@cargo build
-	@cd solutions && cargo build
 	@cd workspace && cargo build
+	@cd solutions && cargo build && cargo test