X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly-rules.make;h=25dd5b2fbbb64afbc1a0bd315f46694cb15c8389;hb=4935f81a94ae1b98cd017a96571c153cee3e5686;hp=4908997f9d83074b1fbc120fc909a8cc0ad4bfe4;hpb=c6554467b0a9beddf0d7ef12746ae31a25fe36e7;p=lilypond.git

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 4908997f9d..25dd5b2fbb 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -2,29 +2,32 @@
 
 # TODO: fix hardcoded out/ ?
 LYS_OUTPUT_OPTION= --lily-output-dir $(LYS_OUTPUT_DIR)
-LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-db/
+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 $(INIT_LY_SOURCES) $(SCHEME_SOURCES)
+	LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) $(LILYPOND_BOOK_FLAGS) --redirect-lilypond-output $<
 
 
 # This allows -j make option while making sure only one lilypond-book instance
-# is running at the same time
+# is running at the same time, using GNU make's order-only prerequisites so
+# as to not create superficial dependencies between unrelated manuals.
 define CHAIN_RULE
-$(i)
+| $(i)
 $(i): 
 endef
 
-$(eval $(firstword $(MASTER_TEXI_FILES)): $(foreach i, $(wordlist 2, $(words $(MASTER_TEXI_FILES)), $(MASTER_TEXI_FILES)),$(CHAIN_RULE)))
+$(eval $(firstword $(TEXI_FILES_FROM_TELY)):\
+ $(foreach i, $(wordlist 2, $(words $(TEXI_FILES_FROM_TELY)),\
+ $(TEXI_FILES_FROM_TELY)),$(CHAIN_RULE)))
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
-$(outdir)/%.texi: %.tely $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET)
-	$(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: %.tely $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET) $(INIT_LY_SOURCES) $(SCHEME_SOURCES)
+	LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) --redirect-lilypond-output $<
 
 
-$(outdir)/%.texi: $(outdir)/%.tely $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET)
-	$(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 $(DOCUMENTATION_LOCALE_TARGET) $(INIT_LY_SOURCES) $(SCHEME_SOURCES)
+	LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(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) --redirect-lilypond-output $<
 
 
 $(outdir)/%.html.omf: %.tely
@@ -33,14 +36,15 @@ $(outdir)/%.html.omf: %.tely
 $(outdir)/%.pdf.omf: %.tely
 	$(call GENERATE_OMF,pdf)
 
-$(outdir)/%.ps.gz.omf: %.tely
-	$(call GENERATE_OMF,ps.gz)
-
-$(outdir)/%.html.omf: $(outdir)/%.texi
+$(outdir)/%.html.omf: $(outdir)/%.texi | $(OUT_TEXINFO_MANUALS)
 	$(call GENERATE_OMF,html)
 
-$(outdir)/%.pdf.omf: $(outdir)/%.texi
+$(outdir)/%.pdf.omf: $(outdir)/%.texi | $(OUT_TEXINFO_MANUALS)
 	$(call GENERATE_OMF,pdf)
 
-$(outdir)/%.ps.gz.omf: $(outdir)/%.texi
-	$(call GENERATE_OMF,ps.gz)
+$(outdir)/others-did.itexi $(outdir)/we-wrote.itexi: $(outdir)/%.itexi: $(top-src-dir)/Documentation/web/%.bib $(top-src-dir)/Documentation/lily-bib.bst
+	BSTINPUTS=$(top-src-dir)/Documentation/web/ $(buildscript-dir)/bib2texi \
+		-s $(top-src-dir)/Documentation/lily-bib \
+		-o $(outdir)/$*.itexi \
+		-q \
+		$(top-src-dir)/Documentation/web/$*.bib