X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=c84bf3fa4cebe5a83c66438e224bee4bce2360eb;hb=d6c6392807de389455742f23d70ab62fb3e6ac4f;hp=1e90808c4b2884ff753b68538737f584ffc49d76;hpb=3bca582c97181b5936c639ff87e1caffdc78c1bd;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 1e90808c4b..c84bf3fa4c 100644 --- 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 @@ -35,9 +36,9 @@ 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 @@ -64,7 +65,7 @@ footifymail = MAILADDRESS=bug-lilypond@gnu.org 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 '' > $(outdir)/index.html echo 'Redirecting to the documentation index...' >> $(outdir)/index.html @@ -75,13 +76,13 @@ 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 \ + for a in `find . -name out-www`; do \ mv $$a/* $$a/.. ; \ rmdir $$a ; \ done @@ -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