diff --git a/makefile b/makefile
index d93f6dd1..b16de2e1 100644
--- a/makefile
+++ b/makefile
@@ -19,7 +19,6 @@ SONGBOOKS := $(wildcard *.sb)
 TARGETS = $(SONGBOOKS:%.sb=%)
 
 PDF = $(TARGETS:%=%.pdf)
-PSF = $(TARGETS:%=%.ps.gz)
 
 CHORDS = chords.tex
 CHORDS_SRC = $(shell ls songs/*/*.sg)
@@ -47,9 +46,6 @@ default: songbook.pdf
 
 all: $(PDF)
 
-ps: $(PSF)
-	gv $<
-
 pdf: $(PDF)
 	xpdf $<
 
@@ -58,28 +54,18 @@ lilypond: $(LILYFILE)
 clean:
 	@rm -f $(TARGETS:%=%.d)   $(TARGETS:%=%.tex) $(TARGETS:%=%.aux) \
 	       $(TARGETS:%=%.toc) $(TARGETS:%=%.out) $(TARGETS:%=%.log) \
-	       $(TARGETS:%=%.nav) $(TARGETS:%=%.snm) $(TARGETS:%=%.dvi)
+	       $(TARGETS:%=%.nav) $(TARGETS:%=%.snm)
 	@rm -f *.sbx *.sxd
 
 cleanall: clean
-	@rm -f $(PDF) $(PSF)
+	@rm -f $(PDF)
 	@rm -f $(LILYFILE)
 
 depend:
 
 ############################################################
 
-$(PSF): LATEX = latex
-$(PSF): %.ps.gz: %.ps
-	gzip -f $<
-
-%.ps: %.dvi
-	dvips -o $@ $<
-
-%.dvi: %.tex %.aux
-	$(LATEX) $<
-
-$(PDF): LATEX = pdflatex -halt-on-error
+$(PDF): LATEX = pdflatex $(LATEX_OPTIONS)
 $(PDF): %.pdf: %.tex %.aux
 
 %.aux: %.tex
@@ -94,8 +80,6 @@ $(PDF): %.pdf: %.tex %.aux
 %.d: %.sb
 	$(MAKE_SONGBOOK) -s $< -d -o $@
 
-include $(SONGBOOKS:%.sb=%.d)
-
 %.pdf: %.ly
 	@$(LILYPOND) --output=$(@:%.pdf=%) $<
 	@rm $(@:%.pdf=%.ps)
@@ -103,3 +87,11 @@ include $(SONGBOOKS:%.sb=%.d)
 $(CHORDS): $(CHORDS_SRC)
 	$(MAKE_CHORDS) -o $@
 
+
+ifeq (.pdf,$(suffix $(MAKECMDGOALS)))
+include $(MAKECMDGOALS:%.pdf=%.d)
+else ifneq ($(MAKECMDGOALS),clean)
+  ifneq ($(MAKECMDGOALS),cleanall)
+  include $(TARGETS:%=%.d)
+  endif
+endif