Web-ja: update introduction

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ceeb410a618e67277c398da9827b4d051d0aa6a0..76f4515be93f6034c4fd0966788a8ff512afb9b3 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -253,12 +253,20 @@ $(tree-share-prefix)/mf-link-tree: $(tree-share-prefix)/lilypond-force
        -rm -f $(tree-share-prefix)/fonts/otf/* &&  \
        rm -f $(tree-share-prefix)/fonts/svg/* &&  \
        rm -f $(tree-share-prefix)/fonts/fonts.conf &&  \
+       rm -f $(tree-share-prefix)/fonts/00-lilypond-fonts.conf &&  \
+       rm -f $(tree-share-prefix)/fonts/99-lilypond-fonts.conf &&  \
        rm -f $(tree-share-prefix)/fonts/tfm/* &&  \
        rm -f $(tree-share-prefix)/fonts/type1/* &&  \
                cd $(tree-share-prefix)/fonts/otf && \
-               ln -s ../../../../../../mf/$(outconfbase)/*.otf .
+               ln -s ../../../../../../mf/$(outconfbase)/*.otf . && \
+               $(foreach i,$(addprefix $(TEXGYRE_DIR)/,$(TEXGYRE_FILES)), \
+                       ln -s $i . && ) true && \
+               $(foreach i,$(addprefix $(URWOTF_DIR)/,$(URWOTF_FILES)), \
+                       ln -s $i . && ) true
        -cd $(tree-share-prefix)/fonts && \
-               ln -s ../../../../../mf/$(outconfbase)/fonts.conf .
+               ln -s ../../../../../mf/$(outconfbase)/fonts.conf . && \
+               ln -s ../../../../../mf/$(outconfbase)/00-lilypond-fonts.conf . && \
+               ln -s ../../../../../mf/$(outconfbase)/99-lilypond-fonts.conf .
        -cd $(tree-share-prefix)/fonts/svg && \
                ln -s ../../../../../../mf/$(outconfbase)/*.svg .
        -cd $(tree-share-prefix)/fonts/svg && \
@@ -307,32 +315,9 @@ test:
        $(MAKE) -C input/regression/abc2ly out=test local-test
        $(MAKE) -C input/regression/lilypond-book out=test local-test
 
-ifndef BASELINE_COMMIT
-BASELINE_COMMIT:=HEAD
-endif
-
-ifdef LILYPOND_BASELINES
-BASELINE_ARCHIVE:=$(LILYPOND_BASELINES)/baseline-$(shell git rev-list -1 $(BASELINE_COMMIT)).tar.gz
-
-test-baseline: $(BASELINE_ARCHIVE)
-       tar xzf $(BASELINE_ARCHIVE)
-       $(MAKE) test-snippets-clean
-
-$(BASELINE_ARCHIVE):
-       $(MAKE) test-baseline-create
-       tar czf $(BASELINE_ARCHIVE) input/regression/out-test-baseline \
-               input/regression/midi/out-test-baseline \
-               input/regression/musicxml/out-test-baseline \
-               input/regression/abc2ly/out-test-baseline \
-               input/regression/lilypond-book/out-test-baseline
-else
-test-baseline: test-baseline-create
-       $(MAKE) test-snippets-clean
-endif
-
-test-baseline-create:
+test-baseline:
        @if test -d .git ; then \
-               $(if $(shell git diff $(BASELINE_COMMIT)), echo "commit before base lining" && false,true) ; \
+               $(if $(shell git diff), echo "commit before base lining" && false,true) ; \
        fi
        $(MAKE)
        $(MAKE) test
@@ -341,6 +326,8 @@ test-baseline-create:
        $(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
+
 
 local-check: test
        rm -rf $(RESULT_DIR)