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

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index fb07d87eaa6add56fb36cc71e14ff84569ae7b53..3b1a2bca20e27bb4de9269e27f604a109bdc6ed6 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -32,12 +32,6 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
-#
-# suggested settings
-#
-# LILYPOND_JOBS= -djob-count=X   ## for SMP/Multicore machine
-# 
-include local.make
 
 local-dist: dist-toplevel-txt-files 
 
@@ -89,10 +83,9 @@ local-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/
-       rm -rf $(outdir)/online-root
-       rm -rf $(outdir)/offline-root
+       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 $(outdir)/offline-root -type l -delete
+       find $(foreach t, $(WEB_TARGETS), $(outdir)/$(t)-root) -type l -delete
 
 
 tree-prefix = $(outdir)
@@ -221,8 +214,8 @@ test-baseline:
        fi
        $(MAKE) 
        $(MAKE) test
-       $(MAKE) -C input/regression/ local-test-baseline
-       $(MAKE) -C input/regression/musicxml local-test-baseline
+       $(MAKE) out=test -C input/regression/ local-test-baseline
+       $(MAKE) out=test -C input/regression/musicxml local-test-baseline
 
 local-check: test
        rm -rf $(RESULT_DIR)
@@ -240,3 +233,4 @@ test-redo:
 
 test-clean:
        $(MAKE) -C input/regression/ out=test clean
+