X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Flsr%2FGNUmakefile;h=ec25f7310d5bda726fa87686ea9c1eba92bbd6b5;hb=91708b30fba67f8fd589980e03ff420c26473a5a;hp=df45b7322251c9787f0644a178f6701c80e3c748;hpb=e0ab7a37fa31290d42c9e5534ac5480c7d9f4a8f;p=lilypond.git

diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile
index df45b73222..ec25f7310d 100644
--- a/input/lsr/GNUmakefile
+++ b/input/lsr/GNUmakefile
@@ -4,7 +4,13 @@ depth = ../..
 
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
-EXTRA_DIST_FILES=README
+EXTRA_DIST_FILES += README $(call src-wildcard,*.snippet-list)
+
+MAIN_INFO_DOC = lilypond-snippets
+INFO_DOCS = lilypond-snippets
+INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
+INFO_IMAGES_DIR = lilypond-snippets
+DEST_INFO_IMAGES_SUBDIR = input/lsr
 
 include $(depth)/make/stepmake.make
 
@@ -12,17 +18,27 @@ IN_ITELY_FILES = $(call src-wildcard,*-intro.itely)
 GENERATED_ITELY_FILES = $(IN_ITELY_FILES:%-intro.itely=$(outdir)/%.itely)
 
 $(outdir)/%.itely: %-intro.itely %.snippet-list
-	xargs $(PYTHON) $(buildscript-dir)/lys-to-tely.py -f printfilename,texidoc,verbatim --name=$@ --template=$< < $*.snippet-list
+	xargs $(PYTHON) $(buildscript-dir)/lys-to-tely.py -f printfilename,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)
+
+$(outdir)/lilypond-snippets.texi: $(GENERATED_ITELY_FILES)
 
-$(outdir)/snippets.texi: snippets.tely $(GENERATED_ITELY_FILES)
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<
+info: $(INFO_FILES)
 
-$(outdir)/snippets-big-page.html: $(outdir)/snippets.texi $(OUT_PNG_IMAGES)
-	$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
+ifneq ($(out),www)
+# cancel install-info target
+# (there is no lilypond-snippets.info without images)
+local-install-info:
+	true
+endif
 
+# All web targets, except info image symlinks and info docs are
+# installed in non-recursing target from TOP-SRC-DIR
+local-install-WWW: local-install-info
+local-uninstall-WWW: local-uninstall-info
 
-$(outdir)/snippets/index.html: $(outdir)/snippets.texi $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES)
-	mkdir -p $(dir $@)
-	$(MAKEINFO) -I$(outdir) --output=$(dir $@) --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
+local-clean:
+	rm -f $(INFO_IMAGES_DIR)
 
-local-WWW: $(outdir)/snippets.pdf $(outdir)/snippets/index.html $(outdir)/snippets-big-page.html
+local-WWW: info $(outdir)/lilypond-snippets.pdf \
+  $(outdir)/lilypond-snippets/index.html \
+  $(outdir)/lilypond-snippets-big-page.html