($(addprefix $(outdir)/,$(LYM4_FILES):

bypass dvi.

diff --git a/ChangeLog b/ChangeLog
index 14df3554fe98cb0b0ab3a8926e7577aee73c6580..3fa75feeb7a967b88b89cc572711994d22da441a 100644 (file)
--- 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 60b44ff8b73a950d4df0260602fd480f28d62af7..0811e7f9e4fc853cd8de96d0129c2bb23dbd4e18 100644 (file)
--- 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 8a243f1c17e4a71899cbbbd3af7485f3f89f4d15..8c51c6f19778ba47c616e52d3aba7a0c5f8fb407 100644 (file)
--- 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 84bc7bf8498bd4ca782a4cdc793cf3d7f1e6362d..fd05f5444dee59d46b7b04fc8fd441d3a763c16a 100644 (file)
--- 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)))