From bff7b5e54b63ed71cf50383b70181801beabc466 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 26 Dec 2012 04:12:55 +0100 Subject: [PATCH] Revert "redone the lilypond commands in the makefile" pointless change This reverts commit 6e490e4408540703579cb49bf7b69e2ae2b98a47. --- Makefile | 6 +++--- Makefile~ | 37 ------------------------------------- 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 Makefile~ diff --git a/Makefile b/Makefile index e0df849..b937794 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ OUTDIR=out PDFDIR=pdf FILE = sheet-music_tinwhistle -LILY_PDF = /usr/bin/env lilypond-book --pdf -o $(OUTDIR) -PDF=cd $(OUTDIR) && /usr/bin/env pdflatex $(FILE).tex -INDEX=cd $(OUTDIR) && /usr/bin/env makeindex $(FILE).tex +LILY_PDF = lilypond-book --pdf -o $(OUTDIR) +PDF=cd $(OUTDIR) && pdflatex $(FILE).tex +INDEX=cd $(OUTDIR) && makeindex $(FILE).tex # The suffixes used in this Makefile. .SUFFIXES: .lytex .tex .ly .pdf diff --git a/Makefile~ b/Makefile~ deleted file mode 100644 index e0df849..0000000 --- a/Makefile~ +++ /dev/null @@ -1,37 +0,0 @@ -OUTDIR=out -PDFDIR=pdf -FILE = sheet-music_tinwhistle -LILY_PDF = /usr/bin/env lilypond-book --pdf -o $(OUTDIR) -PDF=cd $(OUTDIR) && /usr/bin/env pdflatex $(FILE).tex -INDEX=cd $(OUTDIR) && /usr/bin/env makeindex $(FILE).tex - -# The suffixes used in this Makefile. -.SUFFIXES: .lytex .tex .ly .pdf - -# Input and output files are searched in the directories listed in -# the VPATH variable. All of them are subdirectories of the current -# directory (given by the GNU make variable `CURDIR'). -VPATH = \ - $(CURDIR)/lyrics \ - $(CURDIR)/notes \ - $(CURDIR)/pdf \ - -all: book - -book: $(OUTDIR) $(PDFDIR) - cp headfoot.tex $(OUTDIR)/ - cp -r images/ $(OUTDIR)/ - $(LILY_PDF) $(FILE).lytex - $(PDF) - $(INDEX) - $(PDF) - cp $(CURDIR)/$(OUTDIR)/$(FILE).pdf $(CURDIR)/$(PDFDIR)/$(FILE).pdf - -$(OUTDIR): - mkdir -p $(OUTDIR) - -$(PDFDIR): - mkdir -p $(PDFDIR) - -clean: - rm -rf $(OUTDIR)