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

diff --git a/Makefile b/Makefile
index eadae05..8f9b551 100644
--- a/Makefile
+++ b/Makefile
@@ -5,22 +5,29 @@ BIBTEX?=bibtex
 BIBTEXFLAGS:=
 MAKEGLOSSARIES?=makeglossaries
 MAKEGLOSSARIESFLAGS?=
-LATEXFLAGS:=-file-line-error -halt-on-error -no-shell-escape
+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)) $(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
+output/%.pdf: %.mlog
 	if $(GREP) -iFq 'Rerun' $<; then $(LATEX) $(LATEXFLAGS) $(basename $<); fi
 
-%.mlog: %.tex %.fmt $(wildcard *.bib) $(wildcard *.tex) $(FIGURES)
+%.mlog: %.tex output/%.fmt $(BIBS) $(TEXS) $(FIGURES) $(LISTINGS)
 	$(LATEX) $(LATEXFLAGS) $<
 	if $(GREP) -q '^\\bibdata{' $(basename $<).aux; then $(BIBTEX) $(BIBTEXFLAGS) $(basename $<); fi
 	if $(GREP) -q '\@istfilename' $(basename $<).aux; then $(MAKEGLOSSARIES) $(MAKEGLOSSARIESFLAGSFLAGS) $(basename $<); fi
@@ -30,6 +37,4 @@ img/%.png: fig/%.dot
 	dot -Tpng $< > $@
 
 clean:
-	$(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)
+	$(RM) output/* $(FIGURES)