]> git.donarmstrong.com Git - lilypond.git/blobdiff - GNUmakefile.in
projects / lilypond.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
(option_parser): update to 2.7.40
[lilypond.git] / GNUmakefile.in
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 1e90808c4b2884ff753b68538737f584ffc49d76..5f28601d9f6205c54fac9ef0bcbade0cbab1b348 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -3,17 +3,18 @@
 depth = .
 
 SUBDIRS = buildscripts python scripts \
-       flower kpath-guile lily \
+       flower lily \
        mf ly \
        tex ps scm \
        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,15 +30,15 @@ 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
 
 install-WWW:
-       -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir) 
-       tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
-# install-WWW does not recurse; fake it visiting Documentation/user manually
+       -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
+       cp -a $(outdir)/web-root/ $(DESTDIR)$(webdir)/
+
        $(MAKE) -C Documentation/user local-install-WWW
        $(MAKE) -C Documentation/user install-info
 
@@ -59,12 +60,14 @@ final-install:
 web-ext = html midi pdf png txt ly
 
 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. 
        echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
-       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html ./
+       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
        echo '<META HTTP-EQUIV="refresh" content="0;URL=Documentation/index.html">' > $(outdir)/index.html
        echo '<html><body>Redirecting to the documentation index...</body></html>' >> $(outdir)/index.html
 
@@ -75,23 +78,27 @@ 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/
        cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf-  -T- ) | \
                tar -C $(outdir)/web-root/ -xf -  
        cd $(outdir)/web-root/ &&  \
-               for a in `find -name out-www`; do \
-                       mv $$a/* $$a/.. ; \
-                       rmdir $$a ; \
+               for a in `find . -name out-www`; do \
+                       rsync -a  --link-dest $$a/ $$a/ $$a/.. ; \
+                       rm -rf $$a ; \
                done
 
 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 +120,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
@@ -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,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,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 .
+
+
+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
Debian packaging of lilypond