X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=36527e2f42fa3ebd4b36312d1c79065ac23f4359;hb=d1fcdcc12338625ba4bbedc5abeef7d66d8c2284;hp=00345e39dc760f509f46524d42e724aed8d9697f;hpb=eb2d142eadbda419637d62e2ef5877b203dc5534;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 00345e39dc..36527e2f42 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -18,7 +18,7 @@ documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh 
 README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING
-TOPDOC_FILES = AUTHORS README INSTALL NEWS
+TOPDOC_FILES = AUTHORS INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
 
@@ -39,14 +39,7 @@ include $(depth)/make/stepmake.make
 # 
 include local.make
 
-local-dist: dist-toplevel-txt-files dist-changelog
-
-dist-changelog:
-	if  test -d $(top-src-dir)/.git ; then \
-		cd $(top-src-dir) && git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \
-	else \
-		cp $(top-src-dir)/ChangeLog $(distdir) ; \
-	fi
+local-dist: dist-toplevel-txt-files 
 
 all: $(outdir)/VERSION
 
@@ -213,23 +206,14 @@ $(config_h): config.hh.in
 # testing
 
 RESULT_DIR=$(top-build-dir)/out/test-results
-OUT_TEST=test
 
 
 test:
-	rm -f input/regression/out-$(OUT_TEST)/collated-files.html
 	@echo -en 'For tracking crashes: use\n\n\t'
 	@echo 'grep sourcefilename `grep -L systems.texi input/regression/out-test/*log|sed s/log/ly/g`'
 	@echo
-	if test -d .git  ; then \
-		echo -e 'HEAD is:\n\n\t' ; \
-		git log --max-count=1 --pretty=oneline ;\
-		echo -e '\n\n\n' ; \
-		git diff ; \
-	fi > input/regression/out-test/tree.gittxt
-	$(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-$(OUT_TEST)/collated-files.html
-	@find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' 
-	rsync -L -a --exclude 'out-*' --exclude 'out' --exclude mf --exclude source --exclude mf $(outdir)/share input/regression/out-test/
+	$(MAKE) -C input/regression/ out=test local-test
+	$(MAKE) -C input/regression/musicxml out=test local-test
 
 test-baseline: 
 	@if  test -d .git ; then \
@@ -237,13 +221,14 @@ test-baseline:
 	fi
 	$(MAKE) 
 	$(MAKE) test
-	rm -rf input/regression/out-test-baseline
-	mv input/regression/out-test input/regression/out-test-baseline
+	$(MAKE) -C input/regression/ local-test-baseline
+	$(MAKE) -C input/regression/musicxml local-test-baseline
 
 local-check: test
 	rm -rf $(RESULT_DIR)
 	mkdir -p $(RESULT_DIR)
 	$(PYTHON) $(buildscript-dir)/output-distance.py --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test/
+	@find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' 
 
 
 test-redo:
@@ -254,4 +239,4 @@ test-redo:
 	$(MAKE) check
 
 test-clean:
-	$(MAKE) -C input/regression/ out=$(OUT_TEST) clean
+	$(MAKE) -C input/regression/ out=test clean