From 0a2b766ed6cf71fc3adede55461207c06b54951c Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 15 Jul 2004 23:25:53 +0000
Subject: [PATCH] ($(addprefix $(outdir)/,$(LYM4_FILES): bypass dvi.

---
 ChangeLog               |  3 +++
 input/GNUmakefile       |  4 ----
 make/mutopia-rules.make | 19 +++++--------------
 make/mutopia-vars.make  |  1 -
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 14df3554fe..3fa75feeb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-16  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* make/mutopia-vars.make ($(addprefix $(outdir)/,$(LYM4_FILES):
+	bypass dvi. 
+
 	* input/regression/font-postscript.ly: new file. 
 
 	* scm/framework-ps.scm (load-fonts): load pfb files too.
diff --git a/input/GNUmakefile b/input/GNUmakefile
index 60b44ff8b7..0811e7f9e4 100644
--- a/input/GNUmakefile
+++ b/input/GNUmakefile
@@ -8,7 +8,3 @@ LOCALSTEPMAKE_TEMPLATES=ly mutopia
 EXTRA_DIST_FILES=paddy.abc
 
 include $(depth)/make/stepmake.make 
-
-local-check: $(addsuffix .dvi, $(addprefix $(outdir)/, $(examples)))
-
-
diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 8a243f1c17..8c51c6f197 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -19,22 +19,13 @@ $(outdir)/%.ly.txt: %.abc
 $(outdir)/%.ly: %.abc
 	$(PYTHON) $(ABC2LY) --strict -o $@ $< 
 
-$(outdir)/%.dvi: $(outdir)/%.ly
+$(outdir)/%.ps: $(outdir)/%.ly
 	$(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=$@ $< 
-
-
-$(outdir)/%.pdf: $(outdir)/%.dvi
-	dvips $(DVIPS_FLAGS) -t $(DVIPS_PAPERSIZE) -o $@.pdfps $<
-	ps2pdf -sPAPERSIZE=$(DVIPS_PAPERSIZE) $@.pdfps $@
+$(outdir)/%.ps: %.ly
+	$(PYTHON) $(LY2DVI) --output=$@ $<  
 
-$(outdir)-$(PAPERSIZE)/%.dvi: %.ly
-	$(PYTHON) $(LY2DVI) --output=$@ --set=papersize=$(PAPERSIZE) $< 
+$(outdir)/%.pdf: $(outdir)/%.ps
+	ps2pdf -sPAPERSIZE=a4 $< $@
 
 
diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make
index 84bc7bf849..fd05f5444d 100644
--- a/make/mutopia-vars.make
+++ b/make/mutopia-vars.make
@@ -12,7 +12,6 @@ EXTRA_DIST_FILES +=  $(M4_FILES) $(LYM4_FILES)
 
 ly_examples=$(addprefix $(outdir)/, $(addsuffix .ly.txt, $(examples)))
 all_examples=$(examples)
-dvi_examples=$(addprefix $(outdir)/, $(addsuffix .dvi, $(all_examples)))
 ps_examples=$(addprefix $(outdir)/, $(addsuffix .ps.gz, $(all_examples)))
 pdf_examples=$(addprefix $(outdir)/, $(addsuffix .pdf, $(all_examples)))
 gif_examples=$(addprefix $(outdir)/, $(addsuffix .gif, $(all_examples)))
-- 
2.39.2