X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly-rules.make;h=ed3b85eedfb7e58a66859c25f0fd8869b3e6d1d9;hb=5479ee9877d8e418aefd1010bd786fd3315dccbd;hp=81b623957dbbdf91ecf245fa1c6e45aeca148d87;hpb=87932dcb8ec24b069bbce8edbb76f5258ca4ff1b;p=lilypond.git

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 81b623957d..ed3b85eedf 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -1,35 +1,39 @@
-# Mudela_rules.make
+.SUFFIXES: .doc .tely .texi .ly
 
-.SUFFIXES: .doc .dvi .mudtex .tely .texi
+# 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: %.doc
-	rm -f $@
-#	LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) $<
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --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 $@
-#	LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi $<
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi $<
-	chmod -w $@
-
-# nexi: no-lily texi
-# for plain info doco: don't run lily
-$(outdir)/%.nexi: %.tely
-	rm -f $@
-#	LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --no-lily $<
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --no-lily $<
-	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)/%.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 $(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 $<
+
+$(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)