X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Flsr%2FGNUmakefile;h=8afa862bb217cfa1666e9099027c2b5e18e50392;hb=1423508c355989fa26a8cfe5985b0d6e1ab0a538;hp=16946ea380e995a088f23360793a473d12894e03;hpb=b0984ac0eae12ef21adcdbc4922354e731e8f22d;p=lilypond.git

diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile
index 16946ea380..8afa862bb2 100644
--- a/input/lsr/GNUmakefile
+++ b/input/lsr/GNUmakefile
@@ -2,10 +2,12 @@ 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)
 
+default:
+
 ifneq ($(out),)
 MAIN_INFO_DOC = lilypond-snippets
 INFO_DOCS = lilypond-snippets
@@ -14,17 +16,28 @@ INFO_IMAGES_DIR = lilypond-snippets
 DEST_INFO_IMAGES_SUBDIR = input/lsr
 endif
 
-default:
-
 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 -f printfilename,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)
+	xargs $(LYS_TO_TELY) -f doctitle,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)
+
+$(outdir)/lilypond-snippets.texi: $(GENERATED_ITELY_FILES) $(LY_FILES)
+
+source-links = $(outdir)/source $(outdir)/lilypond-snippets/source
+
+$(outdir)/source:
+	@rm -f $(@)
+	ln -sf $(depth) $(@)
 
-$(outdir)/lilypond-snippets.texi: $(GENERATED_ITELY_FILES)
+$(outdir)/%/source:
+	@rm -f $(@)
+	mkdir -p $(dir $@)
+	ln -sf $(depth)/.. $(@)
 
 info: $(INFO_FILES)
 
@@ -37,14 +50,21 @@ $(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-clean:
-	rm -f $(INFO_IMAGES_DIR)
+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: info $(outdir)/lilypond-snippets.pdf \
-  $(outdir)/lilypond-snippets/index.html \
-  $(outdir)/lilypond-snippets-big-page.html
+.SECONDARY: