X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Makefile;h=8f9b5518bfdf30ac84deb6a3405a2370b4d33bea;hb=96c38eaced38e4a3cb8df44ec54b778a1dc11b24;hp=a352d3a7c460e401e90624578ae972a5b7ca9315;hpb=6ee111e09a76e74ba5d55492df62702a364216fd;p=msc-thesis1617.git

diff --git a/Makefile b/Makefile
index a352d3a..8f9b551 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,40 @@
 DOCS:=thesis
-LATEX:=pdflatex
-BIBTEX:=bibtex
+GREP?=grep
+LATEX?=pdflatex
+BIBTEX?=bibtex
 BIBTEXFLAGS:=
-LATEXFLAGS:=-file-line-error -halt-on-error -no-shell-escape
+MAKEGLOSSARIES?=makeglossaries
+MAKEGLOSSARIESFLAGS?=
+LATEXFLAGS:=\
+	-file-line-error\
+	-halt-on-error\
+	-no-shell-escape\
+	-output-directory=./output/
+
+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))
+all: $(addprefix output/,$(addsuffix .pdf,$(DOCS)))
 
-%.fmt: %.pre
-	$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
+output/%.fmt: %.pre
+	$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $<)" "&$(LATEX) $<\dump"
 
-%.pdf: %.mlog
-	grep -iFq 'Rerun to get' $< && $(LATEX) $(LATEXFLAGS) $(basename $<) || true
+output/%.pdf: %.mlog
+	if $(GREP) -iFq 'Rerun' $<; then $(LATEX) $(LATEXFLAGS) $(basename $<); fi
 
-%.mlog: %.tex %.fmt $(wildcard *.bib) $(wildcard *.tex)
+%.mlog: %.tex output/%.fmt $(BIBS) $(TEXS) $(FIGURES) $(LISTINGS)
 	$(LATEX) $(LATEXFLAGS) $<
-	grep -q '^\\bibdata{' $(basename $<).aux && $(BIBTEX) $(BIBTEXFLAGS) $(basename $<) || true
-	grep -q '\@istfilename' $(basename $<).aux && makeglossaries $(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).,aux log fmt toc bbl blg run.xml out pdf snm nav snm vrb glo tdo alg acn acr glg gls xdy))
+	$(RM) output/* $(FIGURES)