X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Flsr%2FGNUmakefile;h=8afa862bb217cfa1666e9099027c2b5e18e50392;hb=cfc4cbf34569db6a6c8968694f86e36b206a9d05;hp=6ade80e6e577fb8f15ebbb5e4f854ee8111f2e84;hpb=10af86c3285db93cf559c3796f9deba981d0f27b;p=lilypond.git

diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile
index 6ade80e6e5..8afa862bb2 100644
--- a/input/lsr/GNUmakefile
+++ b/input/lsr/GNUmakefile
@@ -2,27 +2,69 @@ depth = ../..
 
 # urg, can't name itely templates foo.itely.in because of standard rule
 
-STEPMAKE_TEMPLATES=documentation texinfo tex
+STEPMAKE_TEMPLATES=documentation texinfo
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
-EXTRA_DIST_FILES=README $(call src-wildcard, *.snippet-list)
+EXTRA_DIST_FILES += README $(call src-wildcard,*.snippet-list)
+
+default:
+
+ifneq ($(out),)
+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
+endif
 
 include $(depth)/make/stepmake.make
 
+TEXI2HTML_FLAGS += -D short_toc
+
 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 --name=$@ --template=$< < $*.snippet-list
+	xargs $(LYS_TO_TELY) -f doctitle,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)
 
-$(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) $<
+$(outdir)/lilypond-snippets.texi: $(GENERATED_ITELY_FILES) $(LY_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 $<
+source-links = $(outdir)/source $(outdir)/lilypond-snippets/source
 
+$(outdir)/source:
+	@rm -f $(@)
+	ln -sf $(depth) $(@)
 
-$(outdir)/snippets/index.html: $(outdir)/snippets.texi $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES)
+$(outdir)/%/source:
+	@rm -f $(@)
 	mkdir -p $(dir $@)
-	$(MAKEINFO) -I$(outdir) --output=$(dir $@) --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
+	ln -sf $(depth)/.. $(@)
+
+info: $(INFO_FILES)
+
+ifneq ($(out),www)
+# cancel install-info target and $(INFO_FILES) 'default' target
+# (there is no lilypond-snippets.info without images)
+local-install-info:
+
+$(INFO_FILES):
+	true
+endif
+
+local-clean:
+	rm -f $(INFO_IMAGES_DIR)
+
+ifeq ($(out),www)
+# 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
+
+local-WWW-1: info $(outdir)/lilypond-snippets.pdf \
+  $(outdir)/lilypond-snippets.texi
+
+local-WWW-2: $(outdir)/lilypond-snippets/index.html \
+  $(outdir)/lilypond-snippets-big-page.html \
+  $(source-links)
+endif
 
-local-WWW: $(outdir)/snippets.pdf $(outdir)/snippets/index.html $(outdir)/snippets-big-page.html
+.SECONDARY: