Web-ja: update introduction

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 6f0e4f4a7b7cbcd7eb37404bbd0504b544d260ac..76f4515be93f6034c4fd0966788a8ff512afb9b3 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -9,7 +9,7 @@ SUBDIRS = python scripts \
        po \
        elisp vim \
        input \
-       stepmake $(documentation-dir)
+       $(documentation-dir)
 
 
 ## this convoluted construction is necessary, since we don't know the
@@ -17,7 +17,7 @@ SUBDIRS = python scripts \
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
-README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP THANKS HACKING \
+README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP HACKING \
   LICENSE LICENSE.DOCUMENTATION
 TOPDOC_FILES = AUTHORS INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
@@ -40,7 +40,8 @@ include $(depth)/make/stepmake.make
 
 dist: local-dist $(GENERATED_BUILD_FILES) top-doc refresh-release-files .gitfilelist
        @cd $(top-src-dir) && \
-         if [[ `find . -name .git` && (`git diff HEAD` || `git status | grep -i "untracked"`) ]]; \
+         if test -n "`find . -name .git`" -a '(' -n "`git diff HEAD | head -1`" \
+           -o -n "`git status | grep -i untracked`" ')'; \
          then echo "***   dist must been rolled on a clean git tree;"; \
          echo "uncommitted changes or untracked files detected, aborting."; \
          exit 1; fi
@@ -51,7 +52,7 @@ dist: local-dist $(GENERATED_BUILD_FILES) top-doc refresh-release-files .gitfile
        $(LN) $(TOPDOC_TXT_FILES) $(distdir)
        $(LN) $(GENERATED_BUILD_FILES:%=$(src-dir)/%) .gitfilelist $(distdir)
        cd $(top-src-dir) && xargs $(buildscript-dir)/mass-link hard . $(distdir) <$(top-build-dir)/.gitfilelist
-       if [[ `find $(top-src-dir) -name .git` ]]; then \
+       if test -n "`find $(top-src-dir) -name .git`"; then \
          COMMIT_DATE=`git --git-dir=$(top-src-dir)/.git log -1 --format=%cD`; \
          find $(distdir) | xargs touch -d "$$COMMIT_DATE"; fi
        (cd ./$(depth)/$(outdir); $(TAR) -cf -  --owner=0 --group=0 $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
@@ -252,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 && \
@@ -306,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
@@ -340,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)