X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=710db8f04c5dd3270da7f122f7e518c7d318ee0a;hb=cba77bbf342a93cb022af9546146620c34be4eb5;hp=5ecb4bbfcfa8f57763c0a5f7a5871263256f9260;hpb=2050c94d7f75471ef8d1ef466453b2d266dfc8c5;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 5ecb4bbfcf..710db8f04c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -8,21 +8,21 @@ depth = . # descent order into subdirectories # -SUBDIRS = buildscripts scripts flower lily \ +SUBDIRS = buildscripts python scripts \ + flower lily \ mf ly tex ps scm \ - python po make intl \ - debian $(builddir)/stepmake \ - Documentation input \ - mutopia + po make \ + cygwin debian $(builddir)/stepmake \ + Documentation input # SCRIPTS = configure aclocal.m4 autogen.sh -README_FILES = ChangeLog CHANGES COPYING DEDICATION NEWS README.mandrake ROADMAP -README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt +README_FILES = ChangeLog COPYING DEDICATION NEWS README.mandrake ROADMAP THANKS +README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt IN_FILES := $(wildcard *.in) -EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch lexer-gcc-3.0.patch darwin.patch .cvsignore +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 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) -INSTALLATION_DIR=$(datadir) +INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(configuration) VERSION # bootstrap stepmake: @@ -45,38 +45,44 @@ doc: run-reqs $(MAKE) -C Documentation web-doc: web-reqs - $(MAKE) out=www -C Documentation WWW + $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/regression/ WWW + $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/template/ WWW + $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/test/ WWW + $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C Documentation WWW $(MAKE) footify 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.* ) -docdir = $(prefix)/share/doc/lilypond-$(TOPLEVEL_VERSION) -install-html-doc: html-doc - $(INSTALL) -d $(docdir)/html - tar -C $(docdir)/html -zxf $(outdir)/web.tar.gz +install-html-doc: web-doc top-web + $(INSTALL) -m 755 -d $(local_package_docdir) + tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz # KPATHSEA=0: Hack for compiling without kpathsea -- not recommended my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp - local-install: - $(INSTALL) -d $(datadir) + $(INSTALL) -d $(local_lilypond_datadir) ifeq ($(KPATHSEA),0) - $(foreach i, 1 2 3 4 5, rm -f $(datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(datadir)/tfm.$(i) ; ) + $(foreach i, 1 2 3 4 5, rm -f $(local_lilypond_datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(local_lilypond_datadir)/tfm.$(i) ; ) endif -TOP_HTMLS = index.html short-examples.html long-examples.html +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 + +TOP_HTMLS = index.html examples.html -short-examples: web-reqs +examples: web-reqs $(MAKE) out=www -C input WWW $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html input/ -long-examples: web-reqs - $(MAKE) out=www -C mutopia WWW - $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html mutopia/ - lily: lily/$(outdir)/lilypond lily/$(outdir)/lilypond: @@ -84,12 +90,14 @@ lily/$(outdir)/lilypond: local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web -web-ext = gz html midi pdf png txt + +web-ext = gz html midi pdf png txt ly top-web: cd $(builddir) && rm -f `find . -name \*.html~ -print` - cd $(builddir) && find Documentation input mutopia \ + cd $(builddir) && find Documentation input \ $(web-ext:%=-path '*/out-www/*.%' -or) -false \ > $(outdir)/weblist + $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html input/ cd $(builddir) && ls *.png *.html >> $(outdir)/weblist cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz -T -) @@ -108,45 +116,66 @@ local-WWW-clean: top-WWW-clean WWW-clean: $(MAKE) -C Documentation WWW-clean $(MAKE) -C input WWW-clean - $(MAKE) -C mutopia WWW-clean top-WWW-clean: - cd $(depth)/$(builddir) && rm -f $(TOP_HTMLS) lily-[0-9]*.png + cd $(builddir) && rm -f $(TOP_HTMLS) lily-[0-9]*.png $(SHELL) $(buildscript-dir)/clean-fonts.sh WWW: -default: builddir-setup - -builddir-setup: $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force - -$(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force: - # Preparing LilyPond tree for builddir exec - @echo Making $(depth)/$(builddir)/share - @cd $(depth)/$(builddir) && rm -rf share - @cd $(depth)/$(builddir) && mkdir -p share/lilypond - @cd $(depth)/$(builddir)/share/lilypond && mkdir -p $(TOPLEVEL_VERSION) - @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \ - ln -s ../../../$(srcdir)/ly ly && \ - ln -s ../../../mf/$(outconfbase) dvips && \ +default: $(config_h) builddir-setup + +builddir-setup: $(builddir)/share/lilypond-force + +PO_FILES = $(wildcard $(srcdir)/po/*.po) +HELP_CATALOGS = $(PO_FILES:$(srcdir)/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 ../../../$(srcdir)/mf && \ - ln -s ../../../$(srcdir)/ps && \ - ln -s ../../../$(srcdir)/scm - @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \ - mkdir tex - @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)/tex && \ - ln -s ../../../../$(srcdir)/tex source && \ - ln -s ../../../../mf/$(outconfbase) generate - @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \ - mkdir fonts - @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)/fonts && \ - ln -s ../../../../$(srcdir)/mf source && \ - ln -s ../../../../mf/$(outconfbase) afm && \ - ln -s ../../../../mf/$(outconfbase) tfm && \ - ln -s ../../../../mf/$(outconfbase) type1 + ln -s ../../../mf/$(outconfbase) type1 + $(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 $@ local-clean: builddir-setup-clean builddir-setup-clean: - @cd $(depth)/$(builddir) && rm -rf share + cd $(builddir) && rm -rf share + +$(config_h): configure.in aclocal.m4 +# +# this is to prevent people from getting +# undefined symbols when we add them to config.h.in, +# and they blindly run "cvs update; make". +# + @echo + @echo ' *** $(config_h) is out of date' + @echo ' *** Remove it and rerun autogen:' + @echo ' rm $(config_h); ./autogen.sh' + @echo + @false