X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Makefile;h=9c08e6eb64d25583f5b709a722de9df7bc36cdf2;hb=dc057560c806a535088e1d9ebdbdd0737467ecc3;hp=45d3600ca06bc18437175ce3766712840e8d2466;hpb=6c6184edee2e3ae64176ee53d891f244b649ba1b;p=msc-thesis1617.git

diff --git a/Makefile b/Makefile
index 45d3600..9c08e6e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
 DOCS:=thesis
-LATEX:=pdflatex
-BIBTEX:=bibtex
+GREP?=grep
+LATEX?=pdflatex
+BIBTEX?=bibtex
 BIBTEXFLAGS:=
+MAKEGLOSSARIES?=makeglossaries
+MAKEGLOSSARIESFLAGS?=
 LATEXFLAGS:=-file-line-error -halt-on-error -no-shell-escape
 
 .PHONY: all clean
@@ -13,12 +16,15 @@ all: $(addsuffix .pdf,$(DOCS))
 	$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
 %.pdf: %.mlog
-	grep -iFq 'Rerun to get' $< && $(LATEX) $(LATEXFLAGS) $(basename $<) || true
+	if $(GREP) -iFq 'Rerun' $<; then $(LATEX) $(LATEXFLAGS) $(basename $<); fi
 
 %.mlog: %.tex %.fmt $(wildcard *.bib) $(wildcard *.tex)
 	$(LATEX) $(LATEXFLAGS) $<
-	grep -q '^\\bibdata{' $(basename $<).aux && $(BIBTEX) $(BIBTEXFLAGS) $(basename $<) || true
+	if $(GREP) -q '^\\bibdata{' $(basename $<).aux; then $(BIBTEX) $(BIBTEXFLAGS) $(basename $<); fi
+	if $(GREP) -q '\@istfilename' $(basename $<).aux; then $(MAKEGLOSSARIES) $(MAKEGLOSSARIESFLAGSFLAGS) $(basename $<); fi
 	$(LATEX) $(LATEXFLAGS) $< | tee $@
 
 clean:
-	$(RM) $(foreach DOC,$(DOCS),$(addprefix $(DOC).,aux log fmt toc bbl blg run.xml out pdf snm nav snm vrb))
+	$(RM) $(foreach DOC,$(DOCS),$(addprefix $(DOC).,\
+		acn acr alg aux bbl blg fmt glg glo gls ist lof log lol lot nav out\
+		pdf run.xml snm tdo toc vrb xdy))