X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Makefile;h=7df546862c29fc162b145984c622b16547da2c8b;hb=9c940edab2b3282dc658a629a24573e92964ae77;hp=01c05628627f4bb72ce8bdd1faab90e9e4d1054e;hpb=0dd82c0183888f46ac4eb4f66380356b1aa5eb4d;p=msc-thesis1617.git

diff --git a/Makefile b/Makefile
index 01c0562..7df5468 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?=makeglossaries
 LATEXFLAGS:=-file-line-error -halt-on-error -no-shell-escape
 
 .PHONY: all clean
@@ -12,19 +15,16 @@ all: $(addsuffix .pdf,$(DOCS))
 %.fmt: %.pre
 	$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
-%.fmt: preamble.tex
-	$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
-
 %.pdf: %.mlog
-	grep -iFq 'Rerun to get' $< &&\
-		$(LATEX) $(LATEXFLAGS) $(basename $<) || true
+	$(GREP) -iFq 'Rerun to get' $< && $(LATEX) $(LATEXFLAGS) $(basename $<) || true
 
-%.mlog: %.tex %.fmt $(wildcard *.bib)
+%.mlog: %.tex %.fmt $(wildcard *.bib) $(wildcard *.tex)
 	$(LATEX) $(LATEXFLAGS) $<
-	grep -q '^\\bibdata{' $(basename $<).aux &&\
-		$(BIBTEX) $(BIBTEXFLAGS) $(basename $<) || true
+	$(GREP) -q '^\\bibdata{' $(basename $<).aux && $(BIBTEX) $(BIBTEXFLAGS) $(basename $<) || true
+	$(GREP) -q '\@istfilename' $(basename $<).aux && $(MAKEGLOSSARIES) $(MAKEGLOSSARIESFLAGSFLAGS) $(basename $<)
 	$(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 log nav out pdf run.xml snm\
+		tdo toc vrb xdy))