From 5032dab8152792564c2adcf653d5505ee710dde7 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 11 Apr 2004 20:03:05 +0000
Subject: [PATCH] ($(outdir)-$(PAPERSIZE)/%.dvi): incude ec-sauter.map in rules

---
 ChangeLog                              |  3 +++
 input/mutopia/F.Schubert/morgenlied.ly |  3 ++-
 make/ly-vars.make                      |  2 +-
 make/mutopia-rules.make                |  6 +++---
 scripts/lilypond.py                    | 20 +-------------------
 5 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b18bec1fc..b9db6dded3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-04-11  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* make/mutopia-rules.make ($(outdir)-$(PAPERSIZE)/%.dvi): incude
+	ec-sauter.map in rules
+
 	* mf/ecb.mf (font_identifier): new file, based on ecbx
 
 	* mf/ecb10.mf (gensize): new file.
diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 0de034dc0b..19128cd7e1 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -146,7 +146,7 @@ pianoLH = \notes \relative c'' \repeat volta 2 {
     <c g e c>8 <c e g> <c e g>     <c e g> <c e g> <c e g> |
     <c e g> r r <c, c,>8 r r\fermata \clef treble
     }
-
+\book {
 \score {
 
     << \time 6/8
@@ -189,3 +189,4 @@ pianoLH = \notes \relative c'' \repeat volta 2 {
 	\tempo 4 = 70
 	}
 }
+}
diff --git a/make/ly-vars.make b/make/ly-vars.make
index 08d608dfb2..7fe835f7ad 100644
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -16,4 +16,4 @@ TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES)
 
 EXTRA_DIST_FILES += $(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(LYINC_FILES)
 
-DVIPS_FLAGS= -u +lilypond.map  -Ppdf
+DVIPS_FLAGS= -u+ec-mftrace.map -u +lilypond.map  -Ppdf
diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index b9452646f8..8a243f1c17 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -20,14 +20,14 @@ $(outdir)/%.ly: %.abc
 	$(PYTHON) $(ABC2LY) --strict -o $@ $< 
 
 $(outdir)/%.dvi: $(outdir)/%.ly
-	$(PYTHON) $(LY2DVI) --output=$@ --dependencies $<  
+	$(PYTHON) $(LY2DVI) --output=$@ $<  
 
 # don't junk intermediate .dvi files.  They're easier to view than
 # .ps or .png
 .PRECIOUS: $(outdir)/%.dvi
 
 $(outdir)/%.dvi: %.ly
-	$(PYTHON) $(LY2DVI) --output=$@ --dependencies $< 
+	$(PYTHON) $(LY2DVI) --output=$@ $< 
 
 
 $(outdir)/%.pdf: $(outdir)/%.dvi
@@ -35,6 +35,6 @@ $(outdir)/%.pdf: $(outdir)/%.dvi
 	ps2pdf -sPAPERSIZE=$(DVIPS_PAPERSIZE) $@.pdfps $@
 
 $(outdir)-$(PAPERSIZE)/%.dvi: %.ly
-	$(PYTHON) $(LY2DVI) --output=$@ --dependencies --set=papersize=$(PAPERSIZE) $< 
+	$(PYTHON) $(LY2DVI) --output=$@ --set=papersize=$(PAPERSIZE) $< 
 
 
diff --git a/scripts/lilypond.py b/scripts/lilypond.py
index ad0b414faa..fc9566ed4a 100644
--- a/scripts/lilypond.py
+++ b/scripts/lilypond.py
@@ -105,8 +105,6 @@ copyright = ('Han-Wen Nienhuys <hanwen@cs.uu.nl',
 	     'Jan Nieuwenhuizen <janneke@gnu.org')
 
 option_definitions = [
-	('', 'd', 'dependencies',
-	 _ ("write Makefile dependencies for every input file")),
 	('', 'h', 'help', _ ("print this help")),
 	('', '', 'debug', _ ("print even more output")),
 	(_ ("FILE"), 'f', 'find-pfa', _ ("find pfa fonts used in FILE")),
@@ -180,7 +178,6 @@ output_name = ''
 # Output formats that lilypond should create
 targets = ['DVI', 'LATEX', 'MIDI', 'TEX', 'PDF', 'PS']
 
-track_dependencies_p = 0
 dependency_files = []
 
 #what a name.
@@ -227,10 +224,6 @@ def run_lilypond (files, dep_prefix):
 		opts = opts + ' -f pdftex'		
 	if safe_mode_p:
 		opts = opts + ' --safe-mode'
-	if track_dependencies_p:
-		opts = opts + " --dependencies"
-		if dep_prefix:
-			opts = opts + ' --dep-prefix=%s' % dep_prefix
 
 	fs = string.join (map (escape_shell, files))
 
@@ -677,8 +670,6 @@ for opt in options:
 	elif o == '--set' or o == '-S':
 		ss = string.split (a, '=')
 		set_setting (extra_init, ss[0], ss[1])
-	elif o == '--dependencies' or o == '-d':
-		track_dependencies_p = 1
 	elif o == '--verbose' or o == '-V':
 		verbose_p = 1
 	elif o == '--version' or o == '-v':
@@ -771,7 +762,7 @@ if 1:
 		dep_prefix = 0
 
 	reldir = os.path.dirname (output_name)
-	if outdir != '.' and (track_dependencies_p or targets):
+	if outdir != '.' and targets:
 		ly.mkdir_p (outdir, 0777)
 
 	tmpdir = ly.setup_temp ()
@@ -880,15 +871,6 @@ if 1:
 				   resolution = preview_resolution
 				   )
 
-	# add DEP to targets?
-	if track_dependencies_p:
-		depfile = os.path.join (outdir, outbase + '.dep')
-		generate_dependency_file (depfile, depfile)
-		if os.path.isfile (depfile):
-			ly.progress (_ ("dependencies output to `%s'...") %
-				     depfile)
-			ly.progress ('\n')
-
 	if pseudo_filter_p:
 		main_target = 0
 		for i in 'PDF', 'PS', 'PNG', 'DVI', 'LATEX':
-- 
2.39.5