X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Makefile;h=b26533f9cca9189b10a0064541cd10ea3e8dfaf4;hb=2857e75ec894637ddbc8fc1268719ef3cbcbe8ed;hp=8f9b5518bfdf30ac84deb6a3405a2370b4d33bea;hpb=532b0df9b179dee113aefb25ec9e879ebd8398bb;p=msc-thesis1617.git

diff --git a/Makefile b/Makefile
index 8f9b551..b26533f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,38 +3,43 @@ GREP?=grep
 LATEX?=pdflatex
 BIBTEX?=bibtex
 BIBTEXFLAGS:=
-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)))))
+MAKEGL?=makeglossaries
+MAKEGLFLAGS?=
+MAKEIDX?=makeindex
+MAKEIDXFLAGS?=
+DOT?=dot
+DOTFLAGS?=-Tpng
+LATEXFLAGS:=-file-line-error -halt-on-error
+
+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)) $(FIGURES)
+.SECONDARY: $(DOCS:%=%.fmt) $(FIGURES)
 
-all: $(addprefix output/,$(addsuffix .pdf,$(DOCS)))
+all: $(DOCS:%=%.pdf)
 
-output/%.fmt: %.pre
+%.fmt: %.pre
 	$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $<)" "&$(LATEX) $<\dump"
 
-output/%.pdf: %.mlog
-	if $(GREP) -iFq 'Rerun' $<; then $(LATEX) $(LATEXFLAGS) $(basename $<); fi
+%.pdf: %.mlog
+	if grep -Fiq "Rerun" $<; then $(LATEX) $(LATEXFLAGS) $(basename $<); fi
 
-%.mlog: %.tex output/%.fmt $(BIBS) $(TEXS) $(FIGURES) $(LISTINGS)
+%.mlog: %.tex %.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
+	if $(GREP) -q '\@istfilename' $(basename $<).aux; then $(MAKEGL) $(MAKEGLFLAGS) $(basename $<); fi
+	if [ -f $(basename $<).idx ]; then $(MAKEIDX) $(MAKEIDXFLAGS) $(basename $<); fi
 	$(LATEX) $(LATEXFLAGS) $< | tee $@
 
 img/%.png: fig/%.dot
-	dot -Tpng $< > $@
+	$(DOT) $(DOTFLAGS) $< > $@
 
-clean:
-	$(RM) output/* $(FIGURES)
+clean: $(DOCS:%=clean-%)
+	$(RM) $(FIGURES)
+
+clean-%:
+	$(RM) $(addprefix $(@:clean-%=%).,acn acr alg aux bbl blg idl idx ilg ind\
+	fmt glg glo gls ist loa lof log lol lot mlog nav out pdf snm tdo toc)