X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=75c4ed68dc7bca73327761b317554308fad901fd;hb=16f86be3db31bcf062a33fdd79c37c168e4883d4;hp=8f23ce20a6af9df1e60ec0009b1e46b3e7d16399;hpb=09568eb7a6733f3ec81be9d3014fef3db331f2b6;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8f23ce20a6..75c4ed68dc 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -12,15 +12,14 @@ SUBDIRS = buildscripts scripts flower lily \
 	mf ly tex ps scm \
 	python po make intl \
 	debian $(builddir)/stepmake \
-	Documentation input \
-	mutopia ports
+	Documentation input
 #
 
-SCRIPTS = configure aclocal.m4
-README_FILES =  CHANGES COPYING DEDICATION NEWS README.mandrake ROADMAP
+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
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el lilypond-init.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch mktexnam.patch lexer-gcc-3.0.patch
+EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch darwin.patch .cvsignore
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(datadir)
 INSTALLATION_FILES=$(configuration) VERSION
@@ -38,62 +37,66 @@ footify:
 fonts:
 	$(MAKE) -C $(depth)/mf
 
-doc: lily fonts
+run-reqs: builddir-setup fonts lily
+web-reqs: run-reqs pfa-fonts
+
+doc: run-reqs
 	$(MAKE) -C Documentation
 
-web-doc: 
+web-doc: web-reqs
 	$(MAKE) out=www -C Documentation WWW
 	$(MAKE) footify
 
+pfa-fonts:
+	$(MAKE) MAKE_PFA_FILES=1 -C mf
+
+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
+
 # KPATHSEA=0: Hack for compiling without kpathsea -- not recommended
 my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp 
 
 
 local-install:
-	mkdir -p $(datadir)
+	$(INSTALL) -d $(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) ; )
 endif
 
 
-TOP_HTMLS = index.html short-examples.html long-examples.html
+TOP_HTMLS = index.html examples.html
 
-index: web-doc
-
-short-examples:
+examples: web-reqs
 	$(MAKE) out=www -C input WWW
-	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html input/
-
-
-long-examples:
-	$(MAKE) out=www -C mutopia WWW
-	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html mutopia/
+	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html input/
 
 lily: lily/$(outdir)/lilypond
 
 lily/$(outdir)/lilypond:
 	$(MAKE) -C lily
 
-local-web: fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
+local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
+web-ext = gz html midi pdf png txt
 top-web:
-	rm -f `find . -name \*.html~ -print`
-	find `find Documentation input mutopia *.png index.html -type d -name 'out-www'` \
-		-not -name '*.dvi' -not -name '*ly' -not -name '*.tex' \
-		-not -name '*.ps' -not -name '*.eps' -not -name '*pk' \
-		-not -name '*.aux' -not -name '*.cp' -not -name '*.fn' \
-		-not -name '*.vr' -not -name '*.yp' -not -name '*.ky' \
-		-not -name '*.pg' -not -name '*.tmp' -not -name '*.toc' \
-		-not -name '*.fns' -not -name '*.cps' -not -name '*.nexi' \
-		-not -name '*.texi' -not -name '*.texidoc' -not -name '*.tp' \
-		-not -name '*.log' -not -name 'out-www' -not -name '*.dep' \
-	    > $(outdir)/weblist
-	ls *.png *.html >> $(outdir)/weblist
-	cat $(outdir)/weblist | GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -
-
-#WWW: local-WWW
+	cd $(builddir) && rm -f `find . -name \*.html~ -print`
+	cd $(builddir) && find Documentation input \
+		$(web-ext:%=-path '*/out-www/*.%' -or) -false \
+		> $(outdir)/weblist
+	cd $(builddir) && ls *.png *.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')
+
+local-WWW:
 
 web: local-web
+html-doc: web
+index: web
 
 local-WWW-clean: top-WWW-clean
 
@@ -103,9 +106,42 @@ WWW-clean:
 	$(MAKE) -C mutopia WWW-clean
 
 top-WWW-clean:
-	rm -f $(TOP_HTMLS) lily-[0-9]*.png
+	cd $(depth)/$(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 && \
+		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
+
+local-clean: builddir-setup-clean
+builddir-setup-clean:
+	@cd $(depth)/$(builddir) && rm -rf share