Merge branch 'master' into dev/texi2html

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 92f33fb18ada3db9a4d24f7bf156a26536709b29..a26a8695efeb27a7df26b07b4cf754ba0300918a 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -82,7 +82,7 @@ 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/
@@ -108,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
 
@@ -219,6 +217,8 @@ test-baseline:
        $(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)
@@ -234,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