X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Makefile;h=257238f6fbdb205ab30fa55a7e0ee39ec9f93e40;hb=8c96bdcdd19c4c3cbe9f86357508f5efb7169cc5;hp=89d89e96840c1ae9baeff9f853a9e80c8f7a515e;hpb=d118ff9d857683084065145df45135ef6fa06711;p=msc-thesis1617.git

diff --git a/Makefile b/Makefile
index 89d89e9..257238f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,22 +3,20 @@ GREP?=grep
 LATEX?=pdflatex
 BIBTEX?=bibtex
 BIBTEXFLAGS:=
-MAKEGLOSSARIES?=makeglossaries
-MAKEGLOSSARIESFLAGS?=
-LATEXFLAGS:=\
-	-file-line-error\
-	-halt-on-error\
-	-no-shell-escape
-
-FIGURES:=$(addsuffix .png,$(addprefix img/,$(notdir $(basename $(wildcard fig/*.dot)))))
+MAKEGL?=makeglossaries
+MAKEGLFLAGS?=
+MAKEINDEX?=makeindex
+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)) $(FIGURES)
+.SECONDARY: $(DOCS:%=%.fmt) $(FIGURES)
 
-all: $(addsuffix .pdf,$(DOCS))
+all: $(DOCS:%=%.pdf)
 
 %.fmt: %.pre
 	$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $<)" "&$(LATEX) $<\dump"
@@ -29,15 +27,16 @@ all: $(addsuffix .pdf,$(DOCS))
 %.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 $(MAKEINDEX) $(basename $<); fi
 	$(LATEX) $(LATEXFLAGS) $< | tee $@
 
 img/%.png: fig/%.dot
 	dot -Tpng $< > $@
 
-clean: $(addprefix clean-,$(DOCS))
-	$(RM) -v $(FIGURES)
+clean: $(DOCS:%=clean-%)
+	$(RM) $(FIGURES)
 
 clean-%:
-	$(RM) -v $(addprefix $(@:clean-=).,acn acr alg aux bbl blg fmt glg glo\
-		gls ist lof log lol lot out pdf tdo toc)
+	$(RM) $(addprefix $(@:clean-%=%).,acn acr alg aux bbl blg fmt glg glo\
+		gls ist lof log lol lot mlog out pdf tdo toc)