Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3548dc04a5b30ddd89d29b6e6812a7896945f18e..3a7d3a80e812c70d5cc890d61c5a21245cc2ad43 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
@@ -29,7 +30,7 @@ INSTALLATION_FILES=$(config_make) VERSION
 # bootstrap stepmake:
 #
 STEPMAKE_TEMPLATES=toplevel po install
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 doc: 
        $(MAKE) -C Documentation
@@ -56,10 +57,12 @@ local-install:
 final-install:
        @true
 
-web-ext = html midi pdf png txt ly
+web-ext = html midi pdf png txt ly signature
 
 footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
-footifymail = MAILADDRESS=bug-lilypond@gnu.org
+footifymail = MAILADDRESS='http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs'
+
+
 
 local-WWW-post:
 # need UTF8 setting in case this is hosted on a website. 
@@ -75,23 +78,30 @@ local-WWW-post:
                > $(outdir)/weblist
        ls $(outdir)/*.html >> $(outdir)/weblist
 
-## rewrite paths so we lose out-www
+## rewrite file names so we lose out-www
        rm -rf $(outdir)/web-root/
-       mkdir $(outdir)/web-root/
+       mkdir $(outdir)/web-root/  
        cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf-  -T- ) | \
                tar -C $(outdir)/web-root/ -xf -  
-       cd $(outdir)/web-root/ &&  \
+       for dir in $(outdir)/web-root/ ; do  \
+               cd $$dir && \
                for a in `find . -name out-www`; do \
-                       mv $$a/* $$a/.. ; \
-                       rmdir $$a ; \
-               done
+                       rsync -a  --link-dest $$a/ $$a/ $$a/.. ; \
+                       rm -rf $$a ; \
+               done \
+       done
+       echo $(TOPLEVEL_VERSION) > $(outdir)/web-root/VERSION
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
 tree-lib = $(tree-prefix)/lib
 tree-share = $(tree-prefix)/share
-tree-share-prefix = $(tree-share)/lilypond/$(TOPLEVEL_VERSION)
-tree-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION)
+tree-share-prefix = $(tree-share)/lilypond/current
+tree-lib-prefix = $(tree-lib)/lilypond/current
+
+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
 
@@ -113,8 +123,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
        mkdir -p $(tree-bin)
        mkdir -p $(tree-share-prefix)
        mkdir -p $(tree-lib-prefix)
-       (cd $(tree-lib)/lilypond/ && ln -sf $(TOPLEVEL_VERSION) current)
-       (cd $(tree-share)/lilypond/ && ln -sf $(TOPLEVEL_VERSION) current)
        mkdir -p $(tree-share-prefix)/dvips
        mkdir -p $(tree-share-prefix)/elisp
        mkdir -p $(tree-share-prefix)/fonts
@@ -127,9 +135,8 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
        mkdir -p $(tree-share-prefix)/tex
        cd $(tree-bin) && \
                ln -sf ../../lily/$(outconfbase)/lilypond . && \
-               ln -sf ../../scripts/$(outconfbase)/convert-ly . && \
-               ln -sf ../../scripts/$(outconfbase)/lilypond-book . && \
-               ln -sf ../../scripts/$(outconfbase)/*.ly .
+               for i in abc2ly convert-ly etf2ly lilypond-book lilypond-invoke-editor midi2ly musicxml2ly; \
+                       do ln -sf ../../scripts/$(outconfbase)/$$i . ; done
        cd $(tree-lib-prefix) && \
                ln -s ../../../../python/$(outconfbase) python
        cd $(tree-share-prefix) && \
@@ -146,14 +153,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 +164,23 @@ $(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 .
+       -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 .
+
+
+TAGS.make: dummy
+       etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make')
+
 local-clean: build-dir-setup-clean
 build-dir-setup-clean:
        cd $(top-build-dir) && rm -rf share