X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=3d84a8363c2f0f237328dc37a46ee067f9cc8fd0;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=128e1c4d62fa73eb797f208479b1785bc7c4d6c0;hpb=7f0f1eb021b932f04de74ae41499e18f5d570e7c;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 128e1c4d62..3d84a8363c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -9,18 +9,25 @@ depth = . # descent order into subdirectories # SUBDIRS = buildscripts python scripts \ - flower lily \ + elisp \ + flower kpath-guile lily \ mf ly tex ps scm \ po make \ - cygwin debian $(builddir)/stepmake \ - Documentation input + cygwin debian stepmake \ + Documentation input \ + vim # -SCRIPTS = configure aclocal.m4 autogen.sh -README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS +#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_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt -IN_FILES := $(wildcard *.in) -EXTRA_DIST_FILES = $(wildcard *.el) VERSION lilypond.vim vimrc $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch server.el.patch darwin.patch .cvsignore lexer-gcc-3.1.sh +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) NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION @@ -33,125 +40,121 @@ include $(depth)/make/stepmake.make doc: $(MAKE) -C Documentation -pfa-fonts: - $(MAKE) MAKE_PFA_FILES=1 -C mf -# don't make fontball - we have binary packages for that. - -install-pfa-fonts: - $(MAKE) MAKE_PFA_FILES=1 -C mf install - -fontball=type1-$(TOPLEVEL_VERSION).tar.gz -deb=lilypond_$(TOPLEVEL_VERSION)-1_i386.deb -debian-mirror=http://ftp.$(LANG).debian.org - -$(outdir)/$(deb): - wget -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(deb) +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 + $(MAKE) -C Documentation/user local-install-WWW + $(MAKE) -C Documentation/user install-info -#lld=.$(local_lilypond_datadir) -lld=./usr/share/lilypond/$(TOPLEVEL_VERSION) -$(outdir)/$(fontball): $(outdir)/$(deb) - rm -rf $(outdir)/./usr - ar p $< data.tar.gz | \ - tar -C $(outdir) -zxf - $(lld)/dvips $(lld)/fonts/type1 -# strip the $(lld) part? - tar -C $(outdir) -czf $@ ./usr +web-install: + $(MAKE) out=www install-WWW -get-pfa-fonts: $(outdir)/$(fontball) - # install by hand from $< +uninstall-WWW: + #TODO -lilypond.words: - cd $(builddir) && $(PYTHON) $(buildscript-dir)/lilypond.words.py $(outdir)/lilypond.words - -web-install: - -$(INSTALL) -m 755 -d $(webdir) - tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz +web-uninstall: + $(MAKE) out=www uninstall-WWW= local-install: - $(INSTALL) -d $(local_lilypond_datadir) + $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir) final-install: - @echo - @echo " *** Before running, buildscripts/out/lilypond-{profile,login}" - @echo " *** must be run. You're advised to source these scripts from your " - @echo " *** login scripts. For more information, see Invoking LilyPond in the manual." - @echo - -web-ext = gz html midi pdf png txt ly + @true -footify = MAILADDRESS=bug-lilypond@gnu.org $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) +web-ext = html midi pdf png txt ly -bla: - cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print` +footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) +footifymail = MAILADDRESS=bug-lilypond@gnu.org -local-WWW-post: - $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./ - cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print` - cd $(builddir) && rm -f `find . -name \*.html~ -print` - cd $(builddir) && find Documentation input \ - $(web-ext:%=-path '*/out-www/*.%' -or) -false \ +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 $(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 = $(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 -ALL-TAGS: - etags $(shell find . $(src-ext:%=-name '*.%' -or) -false | grep -v '/out') - web-clean: - $(SHELL) $(buildscript-dir)/clean-fonts.sh $(MAKE) out=www clean - $(MAKE) $(builddir)/share/lilypond-force - + $(MAKE) $(tree-prefix)/lilypond-force -default: $(config_h) builddir-setup $(outdir)/VERSION +default: $(config_h) build-dir-setup -builddir-setup: $(builddir)/share/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=) -$(builddir)/share/lilypond-force: -# Preparing LilyPond tree for builddir exec - cd $(builddir) && rm -rf lib share - mkdir -p $(builddir)/lib/lilypond - mkdir -p $(builddir)/share/lilypond - mkdir -p $(builddir)/share/lilypond/fonts - mkdir -p $(builddir)/share/lilypond/tex - cd $(builddir)/lib/lilypond && \ - ln -s ../../python/$(outconfbase) python - cd $(builddir)/share/lilypond && \ - ln -s $(abs-srcdir)/ly ly && \ - ln -s ../../mf/$(outconfbase) dvips && \ - ln -s ../../mf/$(outconfbase) afm && \ - ln -s ../../mf/$(outconfbase) tfm && \ - ln -s $(abs-srcdir)/mf && \ - ln -s $(abs-srcdir)/ps && \ - ln -s ../../python/$(outconfbase) python && \ - ln -s $(abs-srcdir)/scm - cd $(builddir)/share/lilypond/tex && \ - ln -s $(abs-srcdir)/tex source && \ - ln -s ../../../mf/$(outconfbase) generate - cd $(builddir)/share/lilypond/fonts && \ - ln -s $(abs-srcdir)/mf source && \ - ln -s ../../../mf/$(outconfbase) afm && \ - ln -s ../../../mf/$(outconfbase) tfm && \ - ln -s ../../../mf/$(outconfbase) type1 +$(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 $(top-build-dir)/lib && \ + ln -s ../../../python/$(outconfbase) python + cd $(tree-prefix) && \ + ln -s $(top-src-dir)/ly ly && \ + ln -s ../../../mf mf && \ + ln -s $(top-src-dir)/ps && \ + ln -s ../../../python/$(outconfbase) python && \ + 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 $(top-src-dir)/ps + cd $(tree-prefix)/tex && \ + 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 $(top-src-dir)/mf source && \ + true + -cd $(tree-prefix)/elisp && \ + ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \ + ln -s $(top-src-dir)/elisp/*.el . $(foreach i,$(CATALOGS), \ - mkdir -p $(builddir)/share/locale/$i/LC_MESSAGES && \ - cd $(builddir)/share/locale/$i/LC_MESSAGES && \ - ln -fs ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true - touch $@ + 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 $(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): configure.in aclocal.m4 +$(config_h): config.hh.in # # this is to prevent people from getting # undefined symbols when we add them to config.h.in, @@ -165,8 +168,3 @@ $(config_h): configure.in aclocal.m4 @false -# maybe move into private script? -rsync-web: - cd out-www && mkdir web && tar -xzf web.tar.gz -C web - cd out-www/web && rsync --delete --stats --progress -rltvu -e ssh . x:/var/www/lilypond/doc/v1.9/ - cd out-www && rm -rf web/