X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=report%2FMakefile;h=b12d7fdfc2a8bd42c75077b77c605bb310cfeaad;hb=8393e7fae8720a46bc2832b8236b766f285a784d;hp=20d0aa59f410b89b063dbeeed557cf2cd06148f8;hpb=fa960dd59b57f192940b7eb3faecc40e0093c75a;p=ssproject1617.git

diff --git a/report/Makefile b/report/Makefile
index 20d0aa5..b12d7fd 100644
--- a/report/Makefile
+++ b/report/Makefile
@@ -6,11 +6,11 @@ LATEXFLAGS:=-file-line-error -halt-on-error -no-shell-escape
 TEXS:=$(wildcard *.tex)
 
 .PHONY: all
-.SECONDARY: $(DOC).fmt logo.png
+.SECONDARY: $(DOC).fmt
 
 all: $(DOC).pdf
 
-%.fmt: preamble.tex logo.png
+%.fmt: preamble.tex logo.pdf
 	$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
 %.pdf: %.tex %.fmt $(TEXS)
@@ -20,9 +20,9 @@ all: $(DOC).pdf
 	grep -qF 'Please rerun LaTeX.' $(basename $<).mlog &&\
 		$(LATEX) $(LATEXFLAGS) $< || true
 
-%.png: %.eps
-	convert -density 300 $< -resize x1000 $@
-
 clean:
-	$(RM) $(addprefix $(DOC).,aux log fmt toc bbl blg mlog run.xml pdf)\
+	$(RM) $(addprefix $(DOC).,aux log fmt toc bbl blg mlog run.xml out)\
 		$(DOC)-blx.bib logo.png
+
+clobber: clean
+	$(RM) $(DOC).pdf