X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly-rules.make;h=2e9e5ff0224f7f2eaa02b62553fd417297d28925;hb=c61c9155a8aac86a9fc226bc29cdd0e4ed6d1e0b;hp=e95bfafe62bcd18b2cba68cbbe080d927a2a3be0;hpb=cda8fc1780778b760905c8832f7e984161218f20;p=lilypond.git

diff --git a/make/ly-rules.make b/make/ly-rules.make
index e95bfafe62..2e9e5ff022 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -1,36 +1,45 @@
-# Mudela_rules.make
+.SUFFIXES: .doc .tely .texi .ly
 
-.SUFFIXES: .doc .dvi .mudtex .tely .texi
 
-SUBST_TEXI_DEPS=sed 's! \.\./! !g' < $(basename $@).dep > $(outdir)/temp.dep ; 	mv $(outdir)/temp.dep $(basename $@).dep 
-
-$(outdir)/%.latex: %.doc
-	rm -f $@
-	LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ $<
-	chmod -w $@
-	$(SUBST_TEXI_DEPS)
+$(outdir)/%.latex:  %.doc
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir)  $(LILYPOND_BOOK_FLAGS) $<
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
-# it is not, for --scrdir builds
+# it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely
-	rm -f $@
-	LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --format=texi $<
-	$(SUBST_TEXI_DEPS)
-	chmod -w $@
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<
+
 
-# nexi: no-lily texi
-# for plain info doco: don't run lily
+$(outdir)/%.texi: $(outdir)/%.tely
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --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 $@
-	LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) --no-lily -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi $<
-	mv $(@D)/$(*F).texi $@
-	$(SUBST_TEXI_DEPS)
-	chmod -w $@
+	rm -f $(outdir)/$*.texi
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) --process='true' $<
+	mv -f $(outdir)/$*.texinfo $@ 2>/dev/null || mv -f $(outdir)/$*.texi $@
 
-# nfo: info from non-lily texi
 $(outdir)/%.info: $(outdir)/%.nexi
-	-$(MAKEINFO) --force --output=$(outdir)/$(*F).info $<
+	$(MAKEINFO) -I $(outdir) --output=$(outdir)/$(*F).info $<
+
+$(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)
 
-# nfo: info from non-lily texi
-#$(outdir)/%.nfo: $(outdir)/%.nexi
-#	-$(MAKEINFO) --force --output=$(outdir)/$(*F).info $<
+$(outdir)/%.ps.gz.omf: $(outdir)/%.texi
+	$(call GENERATE_OMF,ps.gz)