summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--stafftab.ly5
-rw-r--r--targets.mk4
2 files changed, 5 insertions, 4 deletions
diff --git a/stafftab.ly b/stafftab.ly
index 77aae83..cc36d35 100644
--- a/stafftab.ly
+++ b/stafftab.ly
@@ -1,3 +1,7 @@
+%% TODO: this relative path won't be correct unless make is run from
+%% within one of the song directories
+#(load "../stafftab-engraver.scm")
+
%% tunings for 12-string Chapman Stick
\makeDefaultStringTuning #'stick-classic-tuning
\stringTuning <d' a e b, fis, cis, c,, g,, d, a, e b>
@@ -79,7 +83,6 @@ stick-string-group = #(lambda (tuning group)
accommodated for typesetting a piece in StaffTab notation."
}
\context {
- #(use-modules (guile-user))
\Voice
\name "StickVoice"
\alias "Voice"
diff --git a/targets.mk b/targets.mk
index f305970..f566a21 100644
--- a/targets.mk
+++ b/targets.mk
@@ -5,10 +5,8 @@ TOP := $(dir $(lastword $(MAKEFILE_LIST)))
SOUNDFONT = $(HOME)/soundfonts/FluidR3GM.sf2
# Determine how many processors are present
CPU_CORES=`grep -m1 "cpu cores" /proc/cpuinfo | tr -cd '[:digit:]'`
-# StaffTab loader
-STAFFTAB_LOADER = "(load \"$(TOP)/stafftab-engraver.scm\")"
# The command to run lilypond
-LILY_CMD = lilypond -ddelete-intermediate-files -drelative-includes -djob-count=$(CPU_CORES) -e $(STAFFTAB_LOADER)
+LILY_CMD = lilypond -ddelete-intermediate-files -drelative-includes -djob-count=$(CPU_CORES)
parts/%.pdf: parts/%.ly music/%.ly
$(LILY_CMD) $<