X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly-rules.make;h=bc9e47b963da2713c0c238c20396a5e9c1c93c94;hb=8c603a010e6700558cee38a801fbafe4c6968765;hp=adadab09425fca24515ce7b2b241fb805aede0ed;hpb=5c006bd489c6bceb39973a1cd4e2260c9391766a;p=lilypond.git

diff --git a/make/ly-rules.make b/make/ly-rules.make
index adadab0942..bc9e47b963 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -1,54 +1,25 @@
-.SUFFIXES: .doc .dvi .tely .texi .ly
+.SUFFIXES: .doc .tely .texi .ly
+
+# TODO: fix hardcoded out/ ?
+LYS_OUTPUT_OPTION= --lily-output-dir $(LYS_OUTPUT_DIR)
+LYS_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_LILYPOND_FLAGS)' --output=$(outdir) $(LILYPOND_BOOK_FLAGS) $<
 
 
-$(outdir)/%.latex: %.doc
-	if [ -f $@ ]; then chmod a+w $@; fi
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --verbose $(LILYPOND_BOOK_FLAGS) $<
-	chmod -w $@
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
-$(outdir)/%.texi: %.tely
-	if [ -f $@ ]; then chmod a+w $@; fi
-	rm -f $$(grep -LF '\lilypondend' out/lily-*.tex 2>/dev/null)
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
-	chmod -w $@
+$(outdir)/%.texi: %.tely $(outdir)/version.itexi
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir)  --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<
+
 
-$(outdir)/%.texi: $(outdir)/%.tely
-	if [ -f $@ ]; then chmod a+w $@; fi
-	rm -f $$(grep -LF '\lilypondend' out/lily-*.tex 2>/dev/null)
-	$(PYTHON) $(LILYPOND_BOOK) $(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 $<
-	chmod -w $@
-
-# nexi: n[o-lilypond t]exi
-# for plain info doco: don't run lilypond
-$(outdir)/%.nexi: %.tely
-	if [ -f $@ ]; then chmod a+w $@; fi
-	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 $@
-# makeinfo <= 4.6 image bug workaround
-	if [ $(MAKEINFO_VERSION) -le 4006000 ]; then \
-		(cd $(outdir) && \
-		ls -1 lily-*.ly | sed 's/.ly$$/.txt/' | xargs touch) || true; \
-	fi
-	chmod -w $@
-
-$(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
-	dvips $(DVIPS_FLAGS)  -o $@.pdfps -t $(DVIPS_PAPERSIZE)  $<
-	ps2pdf -sPAPERSIZE=$(DVIPS_PAPERSIZE) $@.pdfps $@
 
 $(outdir)/%.html.omf: %.tely
 	$(call GENERATE_OMF,html)
@@ -57,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)
@@ -66,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)