Merge branch 'master' into dev/texi2html

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 34576093d6873bd14a7a57ff2284cd4dcfe7907b..a26a8695efeb27a7df26b07b4cf754ba0300918a 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -30,6 +30,8 @@ INSTALLATION_FILES=$(config_make) VERSION
 # bootstrap stepmake:
 #
 STEPMAKE_TEMPLATES=toplevel po install
+LOCALSTEPMAKE_TEMPLATES=lilypond
+
 include $(depth)/make/stepmake.make
 
 
@@ -54,6 +56,7 @@ install-WWW:
        rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir)
        $(MAKE) -C Documentation/user local-install-WWW
        $(MAKE) -C Documentation/user install-info
+       $(MAKE) -C input/lsr install-info
 
 install-help2man:
        $(MAKE) -C scripts man install-help2man
@@ -79,13 +82,13 @@ final-install:
 # For both online and offline docs, issue `make web WEB_TARGETS="offline online"'
 WEB_TARGETS = offline
 
-local-WWW-post:
+WWW-post:
 # need UTF8 setting in case this is hosted on a website. 
        echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
        find $(outdir) -name '*-root' | xargs rm -rf
-       $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)"
-       find $(foreach t, $(WEB_TARGETS), $(outdir)/$(t)-root) -type l -delete
+       $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)"
+       find $(outdir)/offline-root -type l -delete
 
 
 tree-prefix = $(outdir)
@@ -105,11 +108,9 @@ c-clean:
 
 src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
 
-web-clean:
-       $(MAKE) out=www clean
-       $(MAKE) $(tree-share-prefix)/lilypond-force
+web-clean: snippets-clean $(tree-share-prefix)/lilypond-force
 
-default: $(config_h) build-dir-setup 
+default: $(config_h) build-dir-setup
 
 build-dir-setup: $(tree-share-prefix)/lilypond-force
 
@@ -209,13 +210,15 @@ test:
        $(MAKE) -C input/regression/musicxml out=test local-test
 
 test-baseline: 
-       @if  test -d .git ; then \
+       @if test -d .git ; then \
                $(if $(shell git diff), echo "commit before base lining" && false,true) ; \
        fi
        $(MAKE) 
        $(MAKE) test
        $(MAKE) out=test -C input/regression/ local-test-baseline
        $(MAKE) out=test -C input/regression/musicxml local-test-baseline
+       $(MAKE) test-snippets-clean
+
 
 local-check: test
        rm -rf $(RESULT_DIR)
@@ -231,6 +234,11 @@ test-redo:
        done
        $(MAKE) check
 
-test-clean:
+test-clean: test-snippets-clean
        $(MAKE) -C input/regression/ out=test clean
 
+snippets-clean:
+       rm -rf out/lybook-db
+
+test-snippets-clean:
+       rm -rf out/lybook-testdb