X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=36527e2f42fa3ebd4b36312d1c79065ac23f4359;hb=4d045a8fb3a95cad8f85ee43965e5ba61ad81414;hp=f05ed3fe4d3ee51d0d48c15046aa8cd4973218bb;hpb=8ecb76de70d0ef58d899de0c3a5a65c4d874af43;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f05ed3fe4d..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
 
@@ -99,6 +92,7 @@ local-WWW-post:
 	rm -rf $(outdir)/online-root
 	rm -rf $(outdir)/offline-root
 	$(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
 
 
 tree-prefix = $(outdir)
@@ -161,13 +155,12 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION
 	cd $(tree-share-prefix)/tex && \
 		ln -s $(top-src-dir)/tex source && \
 		ln -s ../../../../../tex/$(outconfbase) tex-out && \
-		ln -s ../../../../../mf/$(outconfbase) mf-out
-
+		true
 	cd $(tree-share-prefix)/fonts && \
 		ln -s $(top-src-dir)/mf source && \
 		true
 	-cd $(tree-share-prefix)/elisp && \
-		ln -sf ../../../../../../elisp/$(outconfbase)/lilypond-words.el . && \
+		ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \
 		ln -s $(top-src-dir)/elisp/*.el .
 	$(foreach i,$(CATALOGS), \
 		(mkdir -p $(tree-share)/locale/$i/LC_MESSAGES && \
@@ -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' 
-
+	$(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