* make/lysdoc-targets.make (local-WWW): remove ps.gz target.

* make/ly-vars.make (DVIPS_FLAGS): don't load .map file.

* make/lysdoc-targets.make: .texi is .PRECIOUS

diff --git a/ChangeLog b/ChangeLog
index dad0b8b4c8f646b421cee3cad12e04e56801cc6b..6ba4f587f88a9d66f8639dab50b1c2b26ff8ddb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-04-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * make/lysdoc-targets.make (local-WWW): remove ps.gz target.
+
        * Documentation/user/changing-defaults.itely (Font selection):
        document font-name.
 

diff --git a/input/regression/GNUmakefile b/input/regression/GNUmakefile
index 220219881a93ee50d59aa56e4985f8c5ef936756..a0db49332a2dcd6c759ea6253056a373ac3b92f4 100644 (file)
--- a/input/regression/GNUmakefile
+++ b/input/regression/GNUmakefile
@@ -3,11 +3,9 @@ depth = ../..
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
 
-
 include $(depth)/make/stepmake.make 
 TITLE=LilyPond Regression Tests
 
-
 local-clean: local-delete
 
 # have to do it in 2 steps to prevent

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 4734f594c87862e2e6016dcb24d67183dc60c921..5048f717f4fd4e442906e1ce5ce924167616368b 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -12,7 +12,7 @@ $(outdir)/%.texi: %.tely
 
 $(outdir)/%.texi: $(outdir)/%.tely
        rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.tex 2>/dev/null)
-       $(PYTHON) $(LILYPOND_BOOK) --psfonts=$(basename $<).fonts.ps $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
+       $(PYTHON) $(LILYPOND_BOOK) --psfonts=$(notdir $(basename $<)).fonts.ps $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
 #
 # DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
 #      rm -f $<
@@ -34,10 +34,12 @@ $(outdir)/%-book.ps: $(outdir)/%.ps
        pstops '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@
 
 $(outdir)/%.pdf: $(outdir)/%.dvi
-       dvips $(DVIPS_FLAGS)  -o $@.pdfps -t $(DVIPS_PAPERSIZE)  $<
+       $(cd $(outdir) && dvips $(DVIPS_FLAGS)  -o $(notdir $@).pdfps -t $(DVIPS_PAPERSIZE)  $(notdir $<)  \
+        && gs -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$(notdir $@) -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -c .setpdfwrite -f $(notdir $@).pdfps )
+
 # without -dSAFER
 # gs 8.15 complains of safety of loading a ttf directly 
-       gs -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$@ -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -c .setpdfwrite -f $@.pdfps
+
 
 $(outdir)/%.html.omf: %.tely
        $(call GENERATE_OMF,html)

diff --git a/make/ly-vars.make b/make/ly-vars.make
index 26b8e461f1b51fd5729d1a2dbf407088eb91c9d9..7f574563db88107b3d2b9edd5405681c727ef5dc 100644 (file)
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -17,4 +17,4 @@ TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES)
 EXTRA_DIST_FILES +=$(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(ILY_FILES)
 
 
-DVIPS_FLAGS= -h $(subst dvi,fonts.ps,$<)
+DVIPS_FLAGS= -h $(subst pdf,fonts.ps,$(subst .ps,.fonts.ps, $(notdir $@ )))

diff --git a/make/lysdoc-targets.make b/make/lysdoc-targets.make
index 147ee6366f629e68eb6f7e440e4254d4f38c0afa..090c6c753c450501073fc9c266a8c16d2d317831 100644 (file)
--- a/make/lysdoc-targets.make
+++ b/make/lysdoc-targets.make
@@ -1,5 +1,5 @@
 
 
-local-WWW: $(outdir)/$(NAME).html $(outdir)/$(NAME).ps.gz $(outdir)/$(NAME).pdf
+local-WWW: $(outdir)/$(NAME).html $(outdir)/$(NAME).pdf
 
-.PRECIOUS: $(outdir)/$(NAME).texi
+#.PRECIOUS: $(outdir)/$(NAME).texi

diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
index ffb5eb4f65a2e06ec5d4f9c0d85d898adbf4f917..b0d99517a1ecb12f12108fc4d674be0b64a2ecd7 100644 (file)
--- a/scripts/GNUmakefile
+++ b/scripts/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ..
 
-SEXECUTABLES=convert-ly lilypond-book abc2ly etf2ly mup2ly midi2ly ps2png lilypond-pdfpc-helper lilypond-extract-fonts
+SEXECUTABLES=convert-ly lilypond-book abc2ly etf2ly mup2ly midi2ly ps2png lilypond-pdfpc-helper
 
 STEPMAKE_TEMPLATES=script help2man po
 LOCALSTEPMAKE_TEMPLATES = lilypond