Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond

[lilypond.git] / input / lsr / GNUmakefile

diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile
index f79adc52914c73282b477dcb18129f6640fab7ab..e479c09c0eebc7d26f615b4a816641c434e20639 100644 (file)
--- 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,18 +16,27 @@ INFO_IMAGES_DIR = lilypond-snippets
 DEST_INFO_IMAGES_SUBDIR = input/lsr
 endif
 
-default:
-
 include $(depth)/make/stepmake.make
 
 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)/%/source:
+       @rm -f $(@)
+       mkdir -p $(dir $@)
+       ln -sf $(depth)/.. $(@)
+
 info: $(INFO_FILES)
 
 ifneq ($(out),www)
@@ -45,6 +56,11 @@ local-uninstall-WWW: local-uninstall-info
 local-clean:
        rm -f $(INFO_IMAGES_DIR)
 
-local-WWW: info $(outdir)/lilypond-snippets.pdf \
-  $(outdir)/lilypond-snippets/index.html \
-  $(outdir)/lilypond-snippets-big-page.html
+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)
+
+.SECONDARY: