X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=e3198a352f09030460b5f280038089cbddc5eca7;hb=24ac85edabed266d1de42c12971f4e81b4475d7d;hp=82dba9d4339fa5356e39dd56119b7169a4e9e5d1;hpb=f1729e18310c8c7e45ca8d36cb3ed3907bf943ca;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 82dba9d433..e3198a352f 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -9,18 +9,25 @@ depth = . # descent order into subdirectories # SUBDIRS = buildscripts python scripts \ + elisp \ flower 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 README.mandrake ROADMAP THANKS +include VERSION +package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` + +SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh +README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt IN_FILES := $(wildcard *.in) -EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch lexer-gcc-3.0.patch server.el.patch darwin.patch .cvsignore lexer-gcc-3.1.sh lilypond.words +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,52 +40,57 @@ include $(depth)/make/stepmake.make doc: $(MAKE) -C Documentation -pfa-fonts: - $(MAKE) MAKE_PFA_FILES=1 -C mf - (cd $(builddir)/share/lilypond/fonts && \ - tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* ) - -web-install: - $(INSTALL) -m 755 -d $(webdir) +install-WWW: + -$(INSTALL) -m 755 -d $(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 + +web-install: + $(MAKE) out=www install-WWW + +uninstall-WWW: + #TODO + +web-uninstall: + $(MAKE) out=www uninstall-WWW= local-install: $(INSTALL) -d $(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 + @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.' web-ext = gz html midi pdf png txt ly -footify=$(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) +footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) +footifymail = MAILADDRESS=bug-lilypond@gnu.org -local-web-post: - $(footify) `$(FIND) . -name '*.html' -print` - cd $(builddir) && rm -f `find . -name \*.html~ -print` +local-WWW-post: + $(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 \ > $(outdir)/weblist - echo '' > $(builddir)/index.html + 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 -) -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') +src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh web-clean: - $(SHELL) $(buildscript-dir)/clean-fonts.sh $(MAKE) out=www clean + $(MAKE) $(builddir)/share/lilypond-force - - -default: $(config_h) builddir-setup +default: $(config_h) builddir-setup builddir-setup: $(builddir)/share/lilypond-force @@ -89,29 +101,36 @@ 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 && \ + mkdir -p $(builddir)/lib/$(package) + mkdir -p $(builddir)/share/$(package) + mkdir -p $(builddir)/share/$(package)/elisp + mkdir -p $(builddir)/share/$(package)/fonts + mkdir -p $(builddir)/share/$(package)/tex + cd $(builddir)/lib/$(package) && \ ln -s ../../python/$(outconfbase) python - cd $(builddir)/share/lilypond && \ + cd $(builddir)/share/$(package) && \ ln -s $(abs-srcdir)/ly ly && \ ln -s ../../mf/$(outconfbase) dvips && \ - ln -s ../../mf/$(outconfbase) afm && \ + 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 ../../python/$(outconfbase) python && \ ln -s $(abs-srcdir)/scm - cd $(builddir)/share/lilypond/tex && \ + cd $(builddir)/share/$(package)/tex && \ ln -s $(abs-srcdir)/tex source && \ - ln -s ../../../mf/$(outconfbase) generate - cd $(builddir)/share/lilypond/fonts && \ + ln -s ../../../tex/$(outconfbase) tex-out && \ + ln -s ../../../mf/$(outconfbase) mf-out + cd $(builddir)/share/$(package)/fonts && \ ln -s $(abs-srcdir)/mf source && \ - ln -s ../../../mf/$(outconfbase) afm && \ + ln -s ../../../mf/$(outconfbase) otf && \ ln -s ../../../mf/$(outconfbase) tfm && \ + ln -s ../../../mf/$(outconfbase) svg && \ ln -s ../../../mf/$(outconfbase) type1 + cd $(builddir)/share/$(package)/elisp && \ + ln -sf ../../../elisp/$(outconfbase)/lilypond-words.el . && \ + ln -s $(abs-srcdir)/elisp/*.el . $(foreach i,$(CATALOGS), \ mkdir -p $(builddir)/share/locale/$i/LC_MESSAGES && \ cd $(builddir)/share/locale/$i/LC_MESSAGES && \ @@ -122,7 +141,7 @@ local-clean: builddir-setup-clean builddir-setup-clean: cd $(builddir) && 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, @@ -134,3 +153,5 @@ $(config_h): configure.in aclocal.m4 @echo ' rm $(config_h); ./autogen.sh' @echo @false + +