X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=be6377078a850ea33b6c38d2201528c058140364;hb=9a63326816f586dd79d326776583697f95203330;hp=ad94e6a1f30eb8a96ccbc2c8966e565a27506bd4;hpb=17bbb6c41ea42252d7eacc1d2be2da8fdf6d9d37;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ad94e6a1f3..be6377078a 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -39,7 +39,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 include $(depth)/make/stepmake.make
 
 
-local-dist: refresh-release-files dist-toplevel-txt-files 
+local-dist: refresh-release-files dist-toplevel-txt-files
 
 all: $(outdir)/VERSION
 
@@ -123,7 +123,7 @@ WWW-post:
 	$(buildscript-dir)/mutopia-index -o $(outdir)/examples.html input/
 	find $(outdir) -name '*-root' | xargs rm -rf
 	$(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) "$(WEB_TARGETS)"
-	find $(outdir)/offline-root -type l -delete
+	find $(outdir)/offline-root -type l | xargs rm -f
 endif # ifeq ($(out),www)
 
 # For those who cannot for the life in them remember to type
@@ -156,9 +156,9 @@ build-dir-setup: $(tree-share-prefix)/lilypond-force
 
 PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:po/%.po=%)
-CATALOGS = $(HELP_CATALOGS:lilypond=) 
+CATALOGS = $(HELP_CATALOGS:lilypond=)
 
-$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION 
+$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION
 # Preparing LilyPond tree for build-dir exec
 	cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
 	mkdir -p $(tree-bin)
@@ -214,6 +214,8 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 		ln -s ../../../../../mf/$(outconfbase)/fonts.conf .
 	-cd $(tree-share-prefix)/fonts/svg && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.svg .
+	-cd $(tree-share-prefix)/fonts/svg && \
+		ln -s ../../../../../../mf/$(outconfbase)/*.woff .
 	-cd $(tree-share-prefix)/fonts/tfm && \
 		ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
 	-cd $(tree-share-prefix)/fonts/type1 && \
@@ -240,13 +242,6 @@ grand-replace:
 	PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace
 
 
-################################################################
-# website (without the rest of the docs)
-web-version:
-	touch $(top-src-dir)/Documentation/web.texi
-	cd $(top-build-dir)/Documentation && make out=www WEB_VERSION=yes out-www/web/index.html
-
-
 ################################################################
 # testing
 
@@ -254,22 +249,25 @@ RESULT_DIR=$(top-build-dir)/out/test-results
 
 
 test:
-	@echo -en 'For tracking crashes: use\n\n\t'
-	@echo 'grep sourcefilename `grep -L systems.texi out/lybook-db/*/*log|sed s/log/ly/g`'
+	@echo 'For tracking crashes: use'
+	@echo
+	@echo '        grep sourcefilename `grep -L systems.texi out/lybook-db/*/*log|sed s/log/ly/g`'
 	@echo
 	$(MAKE) -C input/regression/ 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
 
-test-baseline: 
+test-baseline:
 	@if test -d .git ; then \
 		$(if $(shell git diff), echo "commit before base lining" && false,true) ; \
 	fi
-	$(MAKE) 
+	$(MAKE)
 	$(MAKE) test
 	$(MAKE) out=test -C input/regression/ 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
 	$(MAKE) test-snippets-clean
 
 
@@ -277,7 +275,7 @@ 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/
-	@find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' 
+	@find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g'
 
 
 test-redo:
@@ -295,3 +293,11 @@ snippets-clean:
 
 test-snippets-clean:
 	rm -rf out/lybook-testdb
+
+# we want this separate for security; see CG 4.2.  -gp
+website:
+	$(MAKE) config_make=$(config_make) \
+		top-src-dir=$(top-src-dir) \
+		-f $(top-src-dir)/make/website.make \
+		website
+