From b22793f57e6adc2a5537ee7cb06d936800848660 Mon Sep 17 00:00:00 2001
From: Ced <ced@sdf.org>
Date: Fri, 27 Oct 2023 21:05:21 +0100
Subject: [PATCH] Simplify verify target

Little value in building the sans-serif pdf... can only fails if a font
is missing.
---
 makefile | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/makefile b/makefile
index a52e6e3..b67496a 100644
--- a/makefile
+++ b/makefile
@@ -1,45 +1,38 @@
 DOCKER_IMAGE := ghcr.io/hendricius/the-sourdough-framework
+DOCKER_CMD := docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash -c
 
-.PHONY: build_pdf
-build_pdf: mrproper
-	docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash -c "cd /opt/repo/book && make"
+.PHONY: bake build_pdf build_docker_image push_docker_image validate website
+.PHONY: print_os_version start_shell printvars show_tools_version mrproper
 
-.PHONY: bake
-bake: mrproper
-	docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash -c "cd /opt/repo/book && make bake"
+build_pdf:
+	 "cd /opt/repo/book && make"
+
+bake:
+	$(DOCKER_CMD) "cd /opt/repo/book && make bake"
 
-.PHONY: build_docker_image
 build_docker_image:
 	docker build -t $(DOCKER_IMAGE) -f Dockerfile --progress=plain .
 
-.PHONY: push_docker_image
-push_docker_image:
+push_docker_image: build_docker_image
 	docker push $(DOCKER_IMAGE):latest
 
-.PHONY: website
-website: mrproper
-	docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash -c "cd /opt/repo/book && make website"
+website:
+	$(DOCKER_CMD) "cd /opt/repo/book && make website"
 
-.PHONY: validate
-validate: mrproper
-	docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash -c "cd /opt/repo/book && make -j build_pdf build_ebook"
+validate:
+	$(DOCKER_CMD) "cd /opt/repo/book && make -j build_serif_pdf build_ebook"
 
-.PHONY: mrproper
 mrproper:
-	docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash -c "cd /opt/repo/book && make mrproper"
+	$(DOCKER_CMD) "cd /opt/repo/book && make mrproper"
 
-.PHONY: show_tools_version
 show_tools_version:
-	docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash -c "cd /opt/repo/book && make show_tools_version"
+	$(DOCKER_CMD) "cd /opt/repo/book && make show_tools_version"
 
-.PHONY: printvars
 printvars:
-	docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash -c "cd /opt/repo/book && make printvars"
+	$(DOCKER_CMD) "cd /opt/repo/book && make printvars"
 
-.PHONY: print_os_version
 print_os_version:
-	docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash -c "cat /etc/*release"
+	$(DOCKER_CMD) "cat /etc/*release"
 
-.PHONY: start_shell
 start_shell:
 	docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash