X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=aa74dd6bd570c9b62fb43a686f4b1de13493a3d9;hb=df3c00e1afb413ce60b37b0ad9e35ab9637a4b62;hp=ca3d09938459cb80cd72e8b851ef6ca8dfbda97d;hpb=235de94b7408e9badc7b82c8e0dae8f05009adc3;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ca3d099384..aa74dd6bd5 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -38,6 +38,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 
 include $(depth)/make/stepmake.make
 
+.PHONY: test info website
 
 local-dist: refresh-release-files dist-toplevel-txt-files
 
@@ -70,8 +71,8 @@ local-clean-ChangeLog:
 
 dist-toplevel-txt-files: top-doc
 	-mkdir -p $(distdir)
-	ln $(TOPDOC_TXT_FILES) $(distdir)/
-	ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/
+	ln $(TOPDOC_TXT_FILES) $(distdir)
+	ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)
 
 info:
 	$(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) out=www info && ) true
@@ -101,7 +102,7 @@ ifeq ($(out),www)
 # installed in non-recursing target from TOP-SRC-DIR
 install-WWW:
 	-$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
-	rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir)
+	rsync -rl --exclude='*.signature' $(outdir)/offline-root $(DESTDIR)$(webdir)
 	$(MAKE) -C Documentation omf-local-install
 
 install-info-WWW:
@@ -210,7 +211,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 	rm -f $(tree-share-prefix)/fonts/type1/* &&  \
 		cd $(tree-share-prefix)/fonts/otf && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.otf .
-	-cd $(tree-share-prefix)/fonts/ && \
+	-cd $(tree-share-prefix)/fonts && \
 		ln -s ../../../../../mf/$(outconfbase)/fonts.conf .
 	-cd $(tree-share-prefix)/fonts/svg && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.svg .
@@ -253,7 +254,8 @@ test:
 	@echo
 	@echo '        grep sourcefilename `grep -L systems.texi out/lybook-testdb/*/*log|sed s/log/ly/g`'
 	@echo
-	$(MAKE) -C input/regression/ out=test local-test
+	$(MAKE) -C input/regression out=test local-test
+	$(MAKE) -C input/regression/midi out=test local-test
 	$(MAKE) -C input/regression/musicxml out=test local-test
 	$(MAKE) -C input/regression/abc2ly out=test local-test
 	$(MAKE) -C input/regression/lilypond-book out=test local-test
@@ -264,7 +266,8 @@ test-baseline:
 	fi
 	$(MAKE)
 	$(MAKE) test
-	$(MAKE) out=test -C input/regression/ local-test-baseline
+	$(MAKE) out=test -C input/regression local-test-baseline
+	$(MAKE) out=test -C input/regression/midi local-test-baseline
 	$(MAKE) out=test -C input/regression/musicxml local-test-baseline
 	$(MAKE) out=test -C input/regression/abc2ly local-test-baseline
 	$(MAKE) out=test -C input/regression/lilypond-book local-test-baseline
@@ -274,7 +277,9 @@ test-baseline:
 local-check: test
 	rm -rf $(RESULT_DIR)
 	mkdir -p $(RESULT_DIR)
-	$(buildscript-dir)/output-distance --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test/
+	$(buildscript-dir)/output-distance --create-images --output-dir $(RESULT_DIR) \
+		input/regression/out-test-baseline input/regression/out-test \
+		input/regression/midi/out-test-baseline input/regression/midi/out-test 
 	@find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g'
 
 
@@ -286,7 +291,7 @@ test-redo:
 	$(MAKE) check
 
 test-clean: test-snippets-clean
-	$(MAKE) -C input/regression/ out=test clean
+	$(MAKE) -C input/regression out=test clean
 
 snippets-clean:
 	rm -rf out/lybook-db