Disable old rules in makefile and other cleanup

1) build_* now exit with an error message telling you what to do, this is
stage 2 of clean up

2) Fix the folding markers

3) reduce number of rm calls in clean targets

4) cleanup of spaces... to be more consistent
This commit is contained in:
Ced
2025-03-03 14:49:49 +00:00
parent 6b1d2c3de6
commit 7dc000f8ba

View File

@@ -75,7 +75,7 @@ low_res_images := $(filter-out %.png, $(low_res_images))
# All together. # All together.
src_all := $(src_tex) $(src_figures) $(src_tables) $(images) $(src_plots) src_all := $(src_tex) $(src_figures) $(src_tables) $(images) $(src_plots)
# And format specific configurations # Format specific configuration files
ebook_src := $(src_all) tex4ebook.cfg book.mk4 book-ebook.css ebook_src := $(src_all) tex4ebook.cfg book.mk4 book-ebook.css
website_src := $(src_all) website.cfg style.css website_src := $(src_all) website.cfg style.css
@@ -83,6 +83,7 @@ website_dir := static_website_html
website_assets := $(wildcard ../website/assets/*) website_assets := $(wildcard ../website/assets/*)
ruby_src := ../website/modify_build.rb $(website_assets) ruby_src := ../website/modify_build.rb $(website_assets)
ruby_pkg := ../website/Gemfile ../website/Gemfile.lock ruby_pkg := ../website/Gemfile ../website/Gemfile.lock
#}}}
# Flowcharts {{{ # Flowcharts {{{
# TODO: check if it works on github CI # TODO: check if it works on github CI
@@ -98,7 +99,7 @@ ruby_pkg := ../website/Gemfile ../website/Gemfile.lock
ebb -x $< ebb -x $<
# }}} # }}}
# pdf {{{ # Pdf {{{
# Default rules for pdf, getting overwritten when built in a sub-directory # Default rules for pdf, getting overwritten when built in a sub-directory
%.pdf: %.tex %.pdf: %.tex
$(LATEX) $< $(LATEX) $<
@@ -200,12 +201,24 @@ bw_ebook: epub/bw_book.epub
low_res_ebook: epub/low_res_book.epub low_res_ebook: epub/low_res_book.epub
# We keep the old target names for backward compatibility # We keep the old target names for backward compatibility
build_pdf: pdf build_pdf:
build_serif_pdf: serif @echo "build_pdf target is not supported anymore, please use make pdf"
build_sans_serif_pdf: sans_serif @exit
build_ebook: ebook build_serif_pdf:
build_bw_ebook: bw_ebook @echo "build_serif_pdf target is not supported anymore, please use make serif"
build_low_res_ebook: low_res_ebook @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 # top level releases rules
.PHONY: bake release_serif release_sans_serif .PHONY: bake release_serif release_sans_serif
@@ -243,12 +256,9 @@ clean_figures:
clean_ebook_build: clean_ebook_build:
-rm epub_build/book*.{4ct,4tc,aux,bbl,bcf,blg,dvi,fdb_latexmk,fls,html} -rm epub_build/book*.{4ct,4tc,aux,bbl,bcf,blg,dvi,fdb_latexmk,fls,html}
-rm epub_build/book*.{idv,lg,loc,log,ncx,run.xml,tmp,xref} -rm epub_build/book*.{idv,lg,loc,log,ncx,run.xml,tmp,xref}
-rm epub_build/{book.css,content.opf} epub_build/book-epub/mimetype
-rm epub_build/book*x.svg -rm epub_build/book*x.svg
-rm epub_build/book.css -rm -rf epub_build/book-epub/META-INF epub_build/book-epub/OEBPS
-rm epub_build/content.opf
-rm epub_build/book-epub/mimetype
-rm -rf epub_build/book-epub/META-INF
-rm -rf epub_build/book-epub/OEBPS
clean_website_build: clean_website_build:
-rm website_build/book*.{4ct,4tc,aux,bbl,bcf,blg,dvi,fdb_latexmk,fls,html} -rm website_build/book*.{4ct,4tc,aux,bbl,bcf,blg,dvi,fdb_latexmk,fls,html}
@@ -265,14 +275,10 @@ mrproper: clean
$(CLEAN) -C -output-directory=book_serif book.tex $(CLEAN) -C -output-directory=book_serif book.tex
$(CLEAN) -C -output-directory=book_sans_serif book_sans_serif.tex $(CLEAN) -C -output-directory=book_sans_serif book_sans_serif.tex
-rm figures/*.png -rm figures/*.png
-rm -rf epub/
-rm -rf release/ -rm -rf release/
-rm -rf book_serif/ -rm -rf book_serif/ book_sans_serif/
-rm -rf book_sans_serif/ -rm -rf epub/ epub_build/ bw-book-epub/ low-res-book-epub/
-rm -rf *book-epub/ -rm -rf website_build/ $(website_dir)
-rm -rf epub_build/
-rm -rf website_build/
-rm -rf $(website_dir)
#}}} #}}}
# Help {{{ # Help {{{
@@ -367,40 +373,40 @@ quick_ebook: cover/cover-page.xbb # run latex only once no biber, ref etc...
$(EBOOK) --mode draft book.tex $(EBOOK) --mode draft book.tex
show_tools_version: # Show version of tools used on the build machine {{{ show_tools_version: # Show version of tools used on the build machine {{{
- $(GIT) log -1 --pretty=%B -$(GIT) log -1 --pretty=%B
@echo "" @echo ""
- uname -a -uname -a
@echo "" @echo ""
- $(SHELL) --version -$(SHELL) --version
@echo "" @echo ""
- @echo "PATH:" -@echo "PATH:"
- @echo $(PATH) | tr ':' '\n' -@echo $(PATH) | tr ':' '\n'
@echo "" @echo ""
- latexmk --version -latexmk --version
@echo "" @echo ""
- lualatex --version -lualatex --version
@echo "" @echo ""
- tex4ebook --version -tex4ebook --version
@echo "" @echo ""
- make4ht --version -make4ht --version
@echo "" @echo ""
- tidy -version -tidy -version
@echo "" @echo ""
- dvisvgm --version -dvisvgm --version
@echo "" @echo ""
- lacheck | head -5 | tail -1 -lacheck | head -5 | tail -1
@echo "" @echo ""
- chktex --version -chktex --version
@echo "" @echo ""
- make --version -make --version
@echo "" @echo ""
- biber -version -biber -version
@echo "" @echo ""
- ruby --version -ruby --version
@echo "" @echo ""
- $(CONVERT_PIC) --version -$(CONVERT_PIC) --version
@echo "" @echo ""
- rsync --version -rsync --version
# }}} # }}}
# You can find the value of variable X with the following command: # You can find the value of variable X with the following command: