*** empty log message ***

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index fe136d323939991f7c234e529a2bcce1eba7bf22..c84bf3fa4cebe5a83c66438e224bee4bce2360eb 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -9,11 +9,12 @@ SUBDIRS = buildscripts python scripts \
        po make \
        elisp vim \
        input \
-       cygwin stepmake
+       cygwin stepmake $(documentation-dir)
 
-ifneq ($(strip $(DOCUMENTATION)),no)
-SUBDIRS += Documentation
-endif
+
+## this convoluted construction is necessary, since we don't know the
+## value of DOCUMENTATION here.
+documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile
 README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING
@@ -93,6 +94,10 @@ tree-share = $(tree-prefix)/share
 tree-share-prefix = $(tree-share)/lilypond/$(TOPLEVEL_VERSION)
 tree-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION)
 
+C_DIRS = flower lily
+c-clean:
+       $(foreach i, $(C_DIRS), $(MAKE) -C $(i) clean &&) true
+
 src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
 
 web-clean:
@@ -146,14 +151,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
                ln -s $(top-src-dir)/tex source && \
                ln -s ../../../../../tex/$(outconfbase) tex-out && \
                ln -s ../../../../../mf/$(outconfbase) mf-out
-       -cd $(tree-share-prefix)/fonts/otf && \
-               ln -s ../../../../../../mf/$(outconfbase)/*.otf .
-       -cd $(tree-share-prefix)/fonts/svg && \
-               ln -s ../../../../../../mf/$(outconfbase)/*.svg .
-       -cd $(tree-share-prefix)/fonts/tfm && \
-               ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
-       -cd $(tree-share-prefix)/fonts/type1 && \
-               ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
+
        cd $(tree-share-prefix)/fonts && \
                ln -s $(top-src-dir)/mf source && \
                true
@@ -164,9 +162,20 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
                (mkdir -p $(tree-share)/locale/$i/LC_MESSAGES && \
                cd $(tree-share)/locale/$i/LC_MESSAGES && \
                ln -sf ../../../../../po/$(outconfbase)/$i.mo lilypond.mo) &&) true
-#      touch $@
        touch $(tree-share-prefix)/lilypond-force
 
+$(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force
+       -rm -f $(tree-share-prefix)/fonts/{otf,svg,tfm,type1}/* &&  \
+               cd $(tree-share-prefix)/fonts/otf && \
+               ln -s ../../../../../../mf/$(outconfbase)/*.{otf,ttf} .
+       -cd $(tree-share-prefix)/fonts/svg && \
+               ln -s ../../../../../../mf/$(outconfbase)/*.svg .
+       -cd $(tree-share-prefix)/fonts/tfm && \
+               ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
+       -cd $(tree-share-prefix)/fonts/type1 && \
+               ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
+
+
 local-clean: build-dir-setup-clean
 build-dir-setup-clean:
        cd $(top-build-dir) && rm -rf share