Merge branch 'dev/texi2html' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into...

[lilypond.git] / make / ly-rules.make

diff --git a/make/ly-rules.make b/make/ly-rules.make
index d276e188ef044042be2080e7fb83e0ae7724e8bf..caad2146d8b0dab7a699a6eeaa1c2b62cfd439dd 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -1,53 +1,25 @@
-.SUFFIXES: .doc .dvi .tely .texi .ly
+.SUFFIXES: .doc .tely .texi .ly
+
+# TODO: fix hardcoded out/ ?
+LYS_OUTPUT_OPTION= --lily-output-dir $(top-build-dir)/out/lybook-db/
+LILYPOND_BOOK_FLAGS += $(LYS_OUTPUT_OPTION)
+$(outdir)/%.latex:  %.doc
+       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) $(LILYPOND_BOOK_FLAGS) $<
 
 
-$(outdir)/%.latex $(outdir)/%.fonts.ps:  %.doc
-       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --verbose $(LILYPOND_BOOK_FLAGS) $<
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
-$(outdir)/%.texi: %.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) $<
+$(outdir)/%.texi: %.tely $(outdir)/version.itexi
+       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir)  --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<
+
 
-$(outdir)/%.texi: $(outdir)/%.tely
-       rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.tex 2>/dev/null)
-       $(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) $<
+$(outdir)/%.texi: $(outdir)/%.tely $(outdir)/version.itexi
+       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<
 #
 # DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
 #      rm -f $<
 
-# nexi: n[o-lilypond t]exi
-# for plain info doco: don't run lilypond
-$(outdir)/%.nexi: %.tely
-       rm -f $(outdir)/$*.texi
-       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) --process='true' $<
-       mv $(outdir)/$*.texinfo $@ 2>/dev/null || mv $(outdir)/$*.texi $@
-
-$(outdir)/%.info: $(outdir)/%.nexi
-       $(MAKEINFO) -I $(outdir) --output=$(outdir)/$(*F).info $<
-
-# Timothy's booklet
-#
-$(outdir)/%-book.ps: $(outdir)/%.ps
-       psbook $< $<.tmp
-       pstops '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@
-
-$(outdir)/%.pdf: $(outdir)/%.dvi
-       $(shell cd $(outdir) \
-               && dvips $(DVIPS_FLAGS) -t $(DVIPS_PAPERSIZE) \
-                       -o $(notdir $@).pdfps $(notdir $<) \
-               && gs -dCompatibilityLevel=1.2\
-                       -sPAPERSIZE=a4\
-                       -q\
-                       -dNOPAUSE\
-                       -dBATCH\
-                       -sDEVICE=pdfwrite\
-                       -sOutputFile=$(notdir $@)\
-                       -dCompatibilityLevel=1.2\
-                       -sPAPERSIZE=a4\
-                       -c .setpdfwrite\
-                       -f $(notdir $@).pdfps)
 
 $(outdir)/%.html.omf: %.tely
        $(call GENERATE_OMF,html)
@@ -56,7 +28,7 @@ $(outdir)/%.pdf.omf: %.tely
        $(call GENERATE_OMF,pdf)
 
 $(outdir)/%.ps.gz.omf: %.tely
-       $(call GENERATE_OMF,ps.gz) 
+       $(call GENERATE_OMF,ps.gz)
 
 $(outdir)/%.html.omf: $(outdir)/%.texi
        $(call GENERATE_OMF,html)
@@ -65,4 +37,4 @@ $(outdir)/%.pdf.omf: $(outdir)/%.texi
        $(call GENERATE_OMF,pdf)
 
 $(outdir)/%.ps.gz.omf: $(outdir)/%.texi
-       $(call GENERATE_OMF,ps.gz) 
+       $(call GENERATE_OMF,ps.gz)