X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Ftexinfo-rules.make;h=e3c602a6f7c653976073dd8406d09299ed754f95;hb=4748a329986a92b730a50a2234a700ba4c093f09;hp=351a1cc2d8a639754c8e1b43dea50efd5dec1cdf;hpb=20d140a1d53d39f400f0f0af76c37250dc76de24;p=lilypond.git

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 351a1cc2d8..e3c602a6f7 100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -13,7 +13,7 @@
 # prerequisite, otherwise %.info are always outdated (because older
 # than $(outdir)), hence this .dep file
 
-$(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep: $(INFO_DOCS:%=$(outdir)/%.texi)
+$(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep: $(OUT_TEXI_FILES)
 ifneq ($(INFO_IMAGES_DIR),)
 	rm -f $(INFO_IMAGES_DIR)
 	ln -s $(outdir) $(INFO_IMAGES_DIR)
@@ -23,28 +23,28 @@ ifneq ($(INFO_IMAGES_DIR),)
 endif
 	touch $@
 
+$(outdir)/%.texi: %.texi
+	cp -p $< $@
+
 $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
 	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
 
 $(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage --output=$@ $(TEXI2HTML_INIT) $<
-	cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
+	$(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage --output=$@ $<
 
 $(outdir)/%.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $<
-	cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
+	$(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@ $<
 
 $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi $(outdir)/%.html.omf
 	mkdir -p $(dir $@)
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
-	cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
-
+	$(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output=$(dir $@) $<
+	cp $(top-src-dir)/Documentation/css/*.css $(dir $@)
 
-$(outdir)/%.html.omf: %.texi
-	$(call GENERATE_OMF,html)
+$(XREF_MAPS_DIR)/%.xref-map: $(outdir)/%.texi
+	$(buildscript-dir)/extract_texi_filenames $(XREF_MAP_FLAGS) -o $(XREF_MAPS_DIR) $<
 
-$(outdir)/%.pdf.omf: %.texi
-	$(call GENERATE_OMF,pdf)
+$(outdir)/%.info: %.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
+	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
 
 $(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.itexi $(outdir)/%.pdf.omf
 	cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) -I $(abs-src-dir) --batch $(TEXINFO_PAPERSIZE_OPTION) $(<F)
@@ -52,16 +52,24 @@ $(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.itexi $(outdir)/%.pdf.omf
 $(outdir)/%.txt: $(outdir)/%.texi $(outdir)/version.itexi
 	$(MAKEINFO) -I$(src-dir) -I$(outdir) --no-split --no-headers --output $@ $<
 
-$(XREF_MAPS_DIR)/%.xref-map: $(outdir)/%.texi
-	$(buildscript-dir)/extract_texi_filenames $(XREF_MAP_FLAGS) -o $(XREF_MAPS_DIR) $<
+$(outdir)/%.html.omf: %.texi
+	$(call GENERATE_OMF,html)
 
-$(outdir)/%.texi: %.texi
-	cp -f $< $@
+$(outdir)/%.pdf.omf: %.texi
+	$(call GENERATE_OMF,pdf)
 
 $(outdir)/version.%: $(top-src-dir)/VERSION
 	echo '@macro version'> $@
 	echo $(TOPLEVEL_VERSION)>> $@
 	echo '@end macro'>> $@
+	echo ''>> $@
+	echo '@macro versionStable'>> $@
+	echo $(TOPLEVEL_VERSION_STABLE)>> $@
+	echo '@end macro'>> $@
+	echo ''>> $@
+	echo '@macro versionDevel'>> $@
+	echo $(TOPLEVEL_VERSION_DEVEL)>> $@
+	echo '@end macro'>> $@
 
 .SECONDARY: $(outdir)/version.itexi $(outdir)/version.texi \
   $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep \