X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly-rules.make;h=e7dbb42719f60faf7fbfc3100170c19241599ed7;hb=44eef75fc924487b8d322d7f4c7a4d9d73d204b1;hp=4876e5bb9b1a6247a00915617fc7b5645de1b481;hpb=f8d1bb34b7c5f7deafa32be53f540f3102e82f3a;p=lilypond.git

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 4876e5bb9b..e7dbb42719 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -1,58 +1,47 @@
-# Mudela_rules.make
+.SUFFIXES: .doc .tely .texi .ly
 
-.SUFFIXES: .doc .dvi .mudtex .tely .texi .ly
 
-
-$(outdir)/%.latex: %.doc
-	-chmod a+w $@
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_FLAGS) --verbose --dependencies --outdir=$(outdir) $<
-	chmod -w $@
+$(outdir)/%.latex:  %.doc
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(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
-	-chmod a+w $@
-	set|egrep '(TEX|LILY)'  # ugh, what's this?
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
-	chmod -w $@
+	rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.*tex 2>/dev/null)
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
+
 
 $(outdir)/%.texi: $(outdir)/%.tely
-	-chmod a+w $@
-# debugging:
-#	set|egrep '(TEX|LILY)'
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
+	rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.*tex 2>/dev/null)
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
 #
 # DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
 #	rm -f $<
-	chmod -w $@
 
-# nexi: no-lily texi
-# for plain info doco: don't run lily
+# nexi: n[o-lilypond t]exi
+# for plain info doco: don't run lilypond
 $(outdir)/%.nexi: %.tely
-	-chmod a+w $@
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --no-lily $(LILYPOND_BOOK_FLAGS) $<
-	mv $(@D)/$(*F).texi $@
-	chmod -w $@
+	rm -f $(outdir)/$*.texi
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(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) --output=$(outdir)/$(*F).info $<
+	$(MAKEINFO) -I $(outdir) --output=$(outdir)/$(*F).info $<
 
-# nfo: info from non-lily texi
-#$(outdir)/%.nfo: $(outdir)/%.nexi
-#	$(MAKEINFO) --output=$(outdir)/$(*F).info $<
+$(outdir)/%.html.omf: %.tely
+	$(call GENERATE_OMF,html)
 
-$(outdir)/%.tex: $(outdir)/%.ly
-	$(LILYPOND) $(LILYPOND_BOOK_INCLUDES) -o $@ $< 
+$(outdir)/%.pdf.omf: %.tely
+	$(call GENERATE_OMF,pdf)
 
-#
-# Timothy's booklet
-#
-$(outdir)/%-book.ps: $(outdir)/%.ps
-	psbook $< $<.tmp
-	pstops  '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@
+$(outdir)/%.ps.gz.omf: %.tely
+	$(call GENERATE_OMF,ps.gz)
+
+$(outdir)/%.html.omf: $(outdir)/%.texi
+	$(call GENERATE_OMF,html)
 
-$(outdir)/%.pdf: $(outdir)/%.dvi
-	dvips -u lilypond.map -o $@.pdfps  -Ppdf $<
-	ps2pdf $@.pdfps $@
+$(outdir)/%.pdf.omf: $(outdir)/%.texi
+	$(call GENERATE_OMF,pdf)
 
+$(outdir)/%.ps.gz.omf: $(outdir)/%.texi
+	$(call GENERATE_OMF,ps.gz)