From 3b15e8f213dce9fd3896977635159ef3d3599f86 Mon Sep 17 00:00:00 2001
From: Alexandre Dupas <alexandre.dupas@gmail.com>
Date: Mon, 26 Jul 2010 15:03:50 +0200
Subject: [PATCH] Remove options to generate ps files and add a LATEX_OPIONS
 env variable

---
 makefile | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/makefile b/makefile
index c0eaafeb..e8864bb4 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
+$(PDF): LATEX = pdflatex $(LATEX_OPTIONS)
 $(PDF): %.pdf: %.tex %.aux
 
 %.aux: %.tex
@@ -102,4 +88,3 @@ include $(SONGBOOKS:%.sb=%.d)
 
 $(CHORDS): $(CHORDS_SRC)
 	$(MAKE_CHORDS) -o $@
-