Simplify and improve clean rules

Things changed over time, with new versions of the tools and this was
not kept consistent.

also use -rm without space like in the manual... makes no difference but
both styles were used.
This commit is contained in:
Cedric
2024-12-28 15:38:37 +00:00
parent c6a5038d2f
commit d462e5adba

View File

@@ -247,35 +247,32 @@ spell-check: $(src_tex) spelling_exceptions.txt
# Clean up and delete generated files # Clean up and delete generated files
.PHONY: clean_figures clean_ebook_build clean_website_build clean mrproper .PHONY: clean_figures clean_ebook_build clean_website_build clean mrproper
clean_figures: clean_figures:
- $(CLEAN) $(patsubst %.tex, %.png.in, $(src_figures)) -$(CLEAN) $(patsubst %.tex, %.png.in, $(src_figures))
- rm $(patsubst %.tex, %.png.pdf, $(src_figures)) -rm $(patsubst %.tex, %.png.pdf, $(src_figures))
- rm $(patsubst %.tex, %.png.in, $(src_figures)) -rm $(patsubst %.tex, %.png.in, $(src_figures))
- rm $(wildcard figures/*.png.*) -rm $(wildcard figures/*.png.*)
- rm cover/cover-page.xbb -rm cover/cover-page.xbb
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*x.svg -rm epub_build/book*x.svg
-rm epub_build/book.css -rm epub_build/book.css
-rm epub_build/content.opf -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-*.svg -rm website_build/book*.{4ct,4tc,aux,bbl,bcf,blg,dvi,fdb_latexmk,fls,html}
-rm website_build/book*.{idv,lg,loc,log,ncx,run.xml,tmp,xref}
-rm website_build/book.{loc,dlog} -rm website_build/book.{loc,dlog}
-rm $(subst $(website_dir)/,, $(wildcard $(website_dir)/*.html))
clean: clean_ebook_build clean_figures clean_website_build clean: clean_ebook_build clean_figures clean_website_build
$(CLEAN) -output-directory=book_serif book.tex $(CLEAN) -output-directory=book_serif book.tex
$(CLEAN) -output-directory=book_sans_serif book_sans_serif.tex $(CLEAN) -output-directory=book_sans_serif book_sans_serif.tex
$(CLEAN) -output-directory=booklet booklet.tex $(CLEAN) -output-directory=booklet booklet.tex
-rm book*/*.{bbl,loc,.run.xml} -rm book*/*.{bbl,loc,run.xml}
-rm -rf *book-epub/META-INF
-rm -rf *book-epub/OEBPS
-rm *book-epub/mimetype
-rm -rf epub_build/book-epub/META-INF
-rm -rf epub_build/book-epub/OEBPS
-rm epub_build/book-epub/mimetype
mrproper: clean mrproper: clean
$(CLEAN) -C $(src_figures) $(CLEAN) -C $(src_figures)
@@ -283,8 +280,6 @@ mrproper: clean
$(CLEAN) -C -output-directory=book_sans_serif book_sans_serif.tex $(CLEAN) -C -output-directory=book_sans_serif book_sans_serif.tex
$(CLEAN) -C -output-directory=booklet booklet.tex $(CLEAN) -C -output-directory=booklet booklet.tex
-rm figures/*.png -rm figures/*.png
-rm *.html
-rm *.svg
-rm -rf epub/ -rm -rf epub/
-rm -rf release/ -rm -rf release/
-rm -rf book_serif/ -rm -rf book_serif/
@@ -326,7 +321,7 @@ html: $(website_dir)/book.html
# Because packages will be installed in hard to predict places use a file as # Because packages will be installed in hard to predict places use a file as
# marker.. # marker..
../website/_bundle_install_done: $(ruby_pkg) ../website/_bundle_install_done: $(ruby_pkg)
- rm ../website/$@ -rm ../website/$@
cd ../website && bundle install cd ../website && bundle install
touch ../website/$@ touch ../website/$@