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

diff --git a/Makefile b/Makefile
index 45d3600..06f171a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,40 @@
 DOCS:=thesis
-LATEX:=pdflatex
-BIBTEX:=bibtex
+GREP?=grep
+LATEX?=pdflatex
+BIBTEX?=bibtex
 BIBTEXFLAGS:=
+MAKEGL?=makeglossaries
+MAKEGLFLAGS?=
 LATEXFLAGS:=-file-line-error -halt-on-error -no-shell-escape
 
+FIGURES:=$(patsubst fig/%.dot,img/%.png,$(wildcard fig/*.dot))
+LISTINGS:=$(wildcard listings/*)
+TEXS:=$(wildcard *.bib)
+BIBS:=$(wildcard *.tex)
+
 .PHONY: all clean
-.SECONDARY: $(addsuffix .fmt,$(DOCS))
+.SECONDARY: $(DOCS:%=%.fmt) $(FIGURES)
 
-all: $(addsuffix .pdf,$(DOCS))
+all: $(DOCS:%=%.pdf)
 
 %.fmt: %.pre
-	$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
+	$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $<)" "&$(LATEX) $<\dump"
 
 %.pdf: %.mlog
-	grep -iFq 'Rerun to get' $< && $(LATEX) $(LATEXFLAGS) $(basename $<) || true
+	if grep -Fiq "Rerun" $<; then $(LATEX) $(LATEXFLAGS) $(basename $<); fi
 
-%.mlog: %.tex %.fmt $(wildcard *.bib) $(wildcard *.tex)
+%.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 $(MAKEGL) $(MAKEGLFLAGS) $(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))
+img/%.png: fig/%.dot
+	dot -Tpng $< > $@
+
+clean: $(DOCS:%=clean-%)
+	$(RM) $(FIGURES)
+
+clean-%:
+	$(RM) $(addprefix $(@:clean-%=%).,acn acr alg aux bbl blg fmt glg glo\
+		gls ist lof log lol lot mlog out pdf tdo toc)