X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=3d84a8363c2f0f237328dc37a46ee067f9cc8fd0;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=702f77b982b78a9b99d1e4321bf433dbd0f99f79;hpb=861d8976f8ad9f671a084148da7a84e886e111ce;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 702f77b982..3d84a8363c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -10,7 +10,7 @@ depth = . # SUBDIRS = buildscripts python scripts \ elisp \ - flower kpath-guile ttftool lily \ + flower kpath-guile lily \ mf ly tex ps scm \ po make \ cygwin debian stepmake \ @@ -18,13 +18,13 @@ SUBDIRS = buildscripts python scripts \ vim # -include VERSION -package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` +#include VERSION +#package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile -README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING +README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt -IN_FILES := $(wildcard *.in) +IN_FILES := $(call src-wildcard,*.in) PATCH_FILES = emacsclient.patch server.el.patch darwin.patch EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \ $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES) @@ -60,11 +60,7 @@ local-install: $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir) final-install: - @echo '*** Before using LilyPond, the contents of one of the login scripts' - @echo '*** buildscripts/out/lilypond-{profile,login} should be sourced.' - @echo '*** LilyPond should have been installed to do that automatically' - @echo '*** when you log in. So, please log out now and log in again.' - @echo '*** For more information see Invoking LilyPond in the manual.' + @true web-ext = html midi pdf png txt ly @@ -73,20 +69,20 @@ 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' > $(builddir)/.htaccess - $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./ - cd $(builddir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify) - cd $(builddir) && find . -name \*.html~ -print | xargs rm -f - cd $(builddir) && find Documentation input \ - $(web-ext:%=-path '*/out-www/*.%' -or) -false \ + 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 $(top-build-dir)/examples.html ./ + cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify) + cd $(top-build-dir) && find . -name \*.html~ -print | xargs rm -f + cd $(top-build-dir) && find Documentation input \ + $(web-ext:%=-path '*/out-www/*.%' -or) -type l \ > $(outdir)/weblist - echo '' > $(builddir)/index.html - echo 'Redirecting to the documentation index...' >> $(builddir)/index.html - cd $(builddir) && ls *.html >> $(outdir)/weblist - cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz -T -) + echo '' > $(top-build-dir)/index.html + echo 'Redirecting to the documentation index...' >> $(top-build-dir)/index.html + cd $(top-build-dir) && ls *.html >> $(outdir)/weblist + cat $(outdir)/weblist | (cd $(top-build-dir); GZIP=-9v tar -czf $(outdir)/web.tar.gz -T -) -share-prefix = $(builddir)/share -tree-prefix = $(builddir)/share/lilypond/$(TOPLEVEL_VERSION) +share-prefix = $(top-build-dir)/share +tree-prefix = $(top-build-dir)/share/lilypond/$(TOPLEVEL_VERSION) src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh @@ -94,64 +90,71 @@ web-clean: $(MAKE) out=www clean $(MAKE) $(tree-prefix)/lilypond-force -default: $(config_h) builddir-setup +default: $(config_h) build-dir-setup -builddir-setup: $(tree-prefix)/lilypond-force +build-dir-setup: $(tree-prefix)/lilypond-force -PO_FILES = $(wildcard $(srcdir)/po/*.po) -HELP_CATALOGS = $(PO_FILES:$(srcdir)/po/%.po=%) +PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po) +HELP_CATALOGS = $(PO_FILES:$(src-depth)/po/%.po=%) CATALOGS = $(HELP_CATALOGS:lilypond=) -$(tree-prefix)/lilypond-force: GNUmakefile -# Preparing LilyPond tree for builddir exec - cd $(builddir) && rm -rf lib share - mkdir -p $(builddir)/lib/$(package) +$(tree-prefix)/lilypond-force link-tree: GNUmakefile +# Preparing LilyPond tree for build-dir exec + cd $(top-build-dir) && rm -rf lib share + mkdir -p $(top-build-dir)/lib/$(package) mkdir -p $(tree-prefix) mkdir -p $(tree-prefix)/dvips mkdir -p $(tree-prefix)/elisp mkdir -p $(tree-prefix)/fonts + mkdir -p $(tree-prefix)/fonts/otf + mkdir -p $(tree-prefix)/fonts/tfm + mkdir -p $(tree-prefix)/fonts/type1 + mkdir -p $(tree-prefix)/fonts/svg + mkdir -p $(tree-prefix)/fonts/map + mkdir -p $(tree-prefix)/fonts/enc mkdir -p $(tree-prefix)/tex - cd $(builddir)/lib && \ + cd $(top-build-dir)/lib && \ ln -s ../../../python/$(outconfbase) python cd $(tree-prefix) && \ - ln -s $(abs-srcdir)/ly ly && \ - ln -s ../../../mf/$(outconfbase) otf && \ - ln -s ../../../mf/$(outconfbase) svg && \ - ln -s ../../../mf/$(outconfbase) tfm && \ - ln -s $(abs-srcdir)/mf && \ - ln -s $(abs-srcdir)/ps && \ + ln -s $(top-src-dir)/ly ly && \ + ln -s ../../../mf mf && \ + ln -s $(top-src-dir)/ps && \ ln -s ../../../python/$(outconfbase) python && \ - ln -s $(abs-srcdir)/scm && \ - ln -s $(abs-srcdir)/scripts scripts + ln -s $(top-src-dir)/scm && \ + ln -s $(top-src-dir)/scripts scripts cd $(tree-prefix)/dvips && \ ln -s ./../../mf/$(outconfbase) mf-out && \ - ln -s $(abs-srcdir)/ps + ln -s $(top-src-dir)/ps cd $(tree-prefix)/tex && \ - ln -s $(abs-srcdir)/tex source && \ + ln -s $(top-src-dir)/tex source && \ ln -s ../../../../tex/$(outconfbase) tex-out && \ ln -s ../../../../mf/$(outconfbase) mf-out + -cd $(tree-prefix)/fonts/otf && \ + ln -s ../../../../../mf/$(outconfbase)/*.otf . + -cd $(tree-prefix)/fonts/svg && \ + ln -s ../../../../../mf/$(outconfbase)/*.svg . + -cd $(tree-prefix)/fonts/tfm && \ + ln -s ../../../../../mf/$(outconfbase)/*.tfm . + -cd $(tree-prefix)/fonts/type1 && \ + ln -s ../../../../../mf/$(outconfbase)/*.pfa . cd $(tree-prefix)/fonts && \ - ln -s $(abs-srcdir)/mf source && \ - ln -s ../../../../tex/$(outconfbase) enc && \ - ln -s ../../../../mf/$(outconfbase) map && \ - ln -s ../../../../mf/$(outconfbase) otf && \ - ln -s ../../../../mf/$(outconfbase) tfm && \ - ln -s ../../../../mf/$(outconfbase) svg && \ - ln -s ../../../../mf/$(outconfbase) type1 - cd $(tree-prefix)/elisp && \ + ln -s $(top-src-dir)/mf source && \ + true + -cd $(tree-prefix)/elisp && \ ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \ - ln -s $(abs-srcdir)/elisp/*.el . + ln -s $(top-src-dir)/elisp/*.el . $(foreach i,$(CATALOGS), \ mkdir -p $(share-prefix)/locale/$i/LC_MESSAGES && \ cd $(share-prefix)/locale/$i/LC_MESSAGES && \ ln -sf ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true - touch $@ +# touch $@ + touch $(tree-prefix)/lilypond-force -local-clean: builddir-setup-clean -builddir-setup-clean: - cd $(builddir) && rm -rf share +local-clean: build-dir-setup-clean +build-dir-setup-clean: + cd $(top-build-dir) && rm -rf share -$(config_h): config.hh.in +$(config_h): config.hh.in # # this is to prevent people from getting # undefined symbols when we add them to config.h.in,