From 428cf075f56eaeec0e9aaea48057c0519f6c4ab5 Mon Sep 17 00:00:00 2001 From: Ced Date: Mon, 29 Dec 2025 14:04:03 +0000 Subject: [PATCH] Remove old targets from Makefile we got rid of those a while ago. Also light cleaning/reorg --- book/makefile | 24 ++---------------------- makefile | 15 +++++---------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/book/makefile b/book/makefile index f4c2b60..ba02c8e 100644 --- a/book/makefile +++ b/book/makefile @@ -202,27 +202,6 @@ bw_ebook: epub/bw_book.epub low_res_ebook: epub/low_res_book.epub # }}} -# Old target names are disabled with helpful help message {{{ -build_pdf: - @echo "build_pdf target is not supported anymore, please use make pdf" - @exit -build_serif_pdf: - @echo "build_serif_pdf target is not supported anymore, please use make serif" - @exit -build_sans_serif_pdf: - @echo "build_sans_serif_pdf target is not supported anymore, please use make sans_serif" - @exit -build_ebook: - @echo "build_ebook target is not supported anymore, please use make ebook" - @exit -build_bw_ebook: - @echo "build_bw_ebook target is not supported anymore, please use make bw_ebook" - @exit -build_low_res_ebook: - @echo "build_low_res_ebook target is not supported anymore, please use make low_res_ebook" - @exit -# }}} - # Top level releases rules {{{ .PHONY: bake release_serif release_sans_serif bake: release_serif release_sans_serif website @@ -326,7 +305,8 @@ help: @echo "figures: build TikZ figures only" @echo "" @echo "Quick builds:" - @echo " quick: compiles serif_pdf but runs lulatex only once" + @echo " quick: compiles serif but runs lulatex only once" + @echo " will halt on first error" @echo " quick_ebook: compiles ebook but runs lulatex only once" @echo "" @echo "Checks:" diff --git a/makefile b/makefile index 23b31df..fedf5b1 100644 --- a/makefile +++ b/makefile @@ -1,11 +1,11 @@ -.DEFAULT_GOAL := build_pdf +.DEFAULT_GOAL := pdf DOCKER_IMAGE := ghcr.io/hendricius/the-sourdough-framework DOCKER_CMD := docker run --rm -it -v $(PWD):/opt/repo --platform linux/x86_64 $(DOCKER_IMAGE) /bin/bash -c -.PHONY: bake build_pdf build_docker_image push_docker_image validate website +.PHONY: build_docker_image push_docker_image .PHONY: print_os_version start_shell printvars show_tools_version mrproper -.PHONY: build_serif_pdf build_ebook +.PHONY: ebook serif website bake # Dockers targets build_docker_image: @@ -15,8 +15,8 @@ push_docker_image: build_docker_image docker push $(DOCKER_IMAGE):latest # Books/website -serif_pdf: - $(DOCKER_CMD) "cd /opt/repo/book && make serif_pdf" +serif: + $(DOCKER_CMD) "cd /opt/repo/book && make serif" ebook: $(DOCKER_CMD) "cd /opt/repo/book && make ebook" @@ -45,8 +45,3 @@ print_os_version: start_shell: docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash - -# Old names for backward compatibility -build_serif_pdf: serif_pdf -build_ebook: ebook -build_pdf: pdf