Update

[linuxnijmegen-make.git] / Makefile

diff --git a/Makefile b/Makefile
index fa986e7..94ef4a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,19 @@
 DOC:=make
-LATEX:=latex
-LATEXFLAGS:=-file-line-error -halt-on-error -no-shell-escape
-
+LATEX?=pdflatex
+LATEXFLAGS?=-file-line-error -halt-on-error -no-shell-escape
 TEXS:=$(wildcard *.tex)
 
-.PHONY: all
+.PHONY: all clean
 .SECONDARY: $(DOC).fmt
 
-all: $(DOC).dvi
+all: $(DOC).pdf
 
 %.fmt: preamble.tex
        $(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
-%.ps.gz: %.dvi
-       dvips -o- $< | gzip -9 > $@
-
-%.dvi: %.tex %.fmt $(TEXS)
-       $(LATEX) $(LATEXFLAGS) $< | tee $(basename $<).mlog
-       grep -qF '(rerunfilecheck)' $(basename $<).mlog &&\
-               $(LATEX) $(LATEXFLAGS) $< || true
+%.pdf: %.tex %.fmt $(TEXS)
+       $(LATEX) $(LATEXFLAGS) $<
+       $(LATEX) $(LATEXFLAGS) $<
 
 clean:
-       $(RM) $(addprefix $(DOC).,dvi pdf log aux nav toc out snm mlog fmt ps*)
+       $(RM) $(addprefix $(DOC).,aux fmt log nav out pdf snm toc vrb)