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

diff --git a/Makefile b/Makefile
index 01c0562..6c581a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,38 @@
 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
 
+FIGURES:=$(addsuffix .png,$(addprefix img/,$(notdir $(basename $(wildcard fig/*.dot)))))
+LISTINGS:=$(wildcard listings/*)
+TEXS:=$(wildcard *.bib)
+BIBS:=$(wildcard *.tex)
+
 .PHONY: all clean
-.SECONDARY: $(addsuffix .fmt,$(DOCS))
+.SECONDARY: $(addsuffix .fmt,$(DOCS)) $(FIGURES)
 
 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
+	if $(GREP) -iFq 'Rerun' $<; then $(LATEX) $(LATEXFLAGS) $(basename $<); fi
 
-%.mlog: %.tex %.fmt $(wildcard *.bib)
+%.mlog: %.tex %.fmt $(BIBS) $(TEXS) $(FIGURES) $(LISTINGS)
 	$(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 $@
 
+img/%.png: fig/%.dot
+	dot -Tpng $< > $@
+
 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)) $(FIGURES)