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

diff --git a/Makefile b/Makefile
index 7df5468..eadae05 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,13 @@ LATEX?=pdflatex
 BIBTEX?=bibtex
 BIBTEXFLAGS:=
 MAKEGLOSSARIES?=makeglossaries
-MAKEGLOSSARIESFLAGS?=makeglossaries
+MAKEGLOSSARIESFLAGS?=
 LATEXFLAGS:=-file-line-error -halt-on-error -no-shell-escape
 
+FIGURES:=$(addsuffix .png,$(addprefix img/,$(notdir $(basename $(wildcard fig/*.dot)))))
+
 .PHONY: all clean
-.SECONDARY: $(addsuffix .fmt,$(DOCS))
+.SECONDARY: $(addsuffix .fmt,$(DOCS)) $(FIGURES)
 
 all: $(addsuffix .pdf,$(DOCS))
 
@@ -16,15 +18,18 @@ 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)
+%.mlog: %.tex %.fmt $(wildcard *.bib) $(wildcard *.tex) $(FIGURES)
 	$(LATEX) $(LATEXFLAGS) $<
-	$(GREP) -q '^\\bibdata{' $(basename $<).aux && $(BIBTEX) $(BIBTEXFLAGS) $(basename $<) || true
-	$(GREP) -q '\@istfilename' $(basename $<).aux && $(MAKEGLOSSARIES) $(MAKEGLOSSARIESFLAGSFLAGS) $(basename $<)
+	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).,\
-		acn acr alg aux bbl blg fmt glg glo gls log nav out pdf run.xml snm\
-		tdo toc vrb xdy))
+		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)