X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly-rules.make;h=fe849db405729d138aae85bc6de929d523145dfc;hb=1ee79e6b8d4386a5885960a3eafb87db933d7f63;hp=e409630ef1adf2c1c1088ef01332f05f3179fa85;hpb=e70b859dd30b27fb61719f665df83cb594511c76;p=lilypond.git

diff --git a/make/ly-rules.make b/make/ly-rules.make
index e409630ef1..fe849db405 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -1,56 +1,37 @@
-# Mudela_rules.make
+.SUFFIXES: .doc .tely .texi .ly
 
-.SUFFIXES: .doc .dvi .mudtex .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
-	rm -f $@
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES)\
-$(LILYPOND_BOOK_FLAGS) --verbose --dependencies --outdir=$(outdir) $<
-	chmod -w $@
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
-$(outdir)/%.texi: %.tely
-	rm -f $@
-	set|egrep '(TEX|LILY)'  # ugh, what's this?
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --verbose $(LILYPOND_BOOK_FLAGS) $<
-	chmod -w $@
-
-$(outdir)/%.texi: $(outdir)/%.tely
-	rm -f $@
-	set|egrep '(TEX|LILY)'  # ugh, what's this?
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi $(LILYPOND_BOOK_FLAGS) $<
-	rm -f $<
-	chmod -w $@
-
-# nexi: no-lily texi
-# for plain info doco: don't run lily
-$(outdir)/%.nexi: %.tely
-	rm -f $@
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --no-lily $(LILYPOND_BOOK_FLAGS) $<
-	mv $(@D)/$(*F).texi $@
-	chmod -w $@
-
-# nfo: info from non-lily texi
-$(outdir)/%.info: $(outdir)/%.nexi
-	$(MAKEINFO) --output=$(outdir)/$(*F).info $<
-
-# nfo: info from non-lily texi
-#$(outdir)/%.nfo: $(outdir)/%.nexi
-#	$(MAKEINFO) --output=$(outdir)/$(*F).info $<
-
-$(outdir)/%.tex: $(outdir)/%.ly
-	$(LILYPOND) $(LILYPOND_BOOK_INCLUDES) -o $@ $< 
-
-#
-# 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 -u lilypond.map -o $@.pdfps  -Ppdf $<
-	ps2pdf $@.pdfps $@
+$(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 $(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)/%.html.omf: %.tely
+	$(call GENERATE_OMF,html)
+
+$(outdir)/%.pdf.omf: %.tely
+	$(call GENERATE_OMF,pdf)
+
+$(outdir)/%.ps.gz.omf: %.tely
+	$(call GENERATE_OMF,ps.gz)
+
+$(outdir)/%.html.omf: $(outdir)/%.texi
+	$(call GENERATE_OMF,html)
+
+$(outdir)/%.pdf.omf: $(outdir)/%.texi
+	$(call GENERATE_OMF,pdf)
+
+$(outdir)/%.ps.gz.omf: $(outdir)/%.texi
+	$(call GENERATE_OMF,ps.gz)