X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=4137959534f98211ae5cdd1b32c7e3666258e999;hb=36079063504b59027cdd84e36a1fc9e2bfc4fc76;hp=b467fed74720c90717ba7efcc74d0b4249414ca8;hpb=e07e0fdc12f46770b361b68520e96080481017c6;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index b467fed747..4137959534 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -16,7 +16,7 @@ SUBDIRS = buildscripts scripts flower lily \
 	mutopia 
 #
 
-SCRIPTS = configure aclocal.m4
+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)
@@ -35,23 +35,33 @@ footify:
 	$(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
 	$(footify-all-command)
 
-
 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:  pfa-fonts
+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
@@ -59,30 +69,24 @@ endif
 
 TOP_HTMLS = index.html short-examples.html long-examples.html
 
-index: web-doc
-
-short-examples: pfa-fonts
+short-examples: web-reqs
 	$(MAKE) out=www -C input WWW
-	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html input/
+	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html input/
 
-
-long-examples: pfa-fonts
+long-examples: web-reqs
 	$(MAKE) out=www -C mutopia WWW
-	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html mutopia/
-
-pfa-fonts:
-	$(MAKE) MAKE_PFA_FILES=1 -C mf
+	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html mutopia/
 
 lily: lily/$(outdir)/lilypond
 
 lily/$(outdir)/lilypond:
 	$(MAKE) -C lily
 
-local-web: fontpaths fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
+local-web: web-doc $(TOP_HTMLS:%=%) footify do-top-doc top-web
 
 top-web:
-	rm -f `find . -name \*.html~ -print`
-	find `find Documentation input mutopia *.png index.html -type d -name 'out-www'` \
+	cd $(builddir) && rm -f `find . -name \*.html~ -print`
+	cd $(builddir) && find `find Documentation input mutopia -type d -name 'out-www' -print` \
 		-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' \
@@ -90,14 +94,18 @@ top-web:
 		-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 '*.pdfps' -not -name '*.eps.bbox' \
 		-not -name '*.log' -not -name 'out-www' -not -name '*.dep' \
+		-print \
 	    > $(outdir)/weblist
-	ls *.png *.html >> $(outdir)/weblist
-	cat $(outdir)/weblist | GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -
+	cd $(builddir) && ls *.png *.html >> $(outdir)/weblist
+	cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -)
 
 #WWW: local-WWW
 
 web: local-web
+html-doc: web
+index: web
 
 local-WWW-clean: top-WWW-clean
 
@@ -107,18 +115,33 @@ 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:
 
-fontpaths:
-	-ln -s $(depth)/mf/out dvips
-	-mkdir -p fonts
-	-rm fonts/source
-	-ln -s ../$(depth)/mf fonts/source
-	-ln -s ../$(depth)/mf/out fonts/afm
-	-ln -s ../$(depth)/mf/out fonts/tfm
-	-ln -s ../$(depth)/mf/out fonts/type1
+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
+	@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 && \
+		ln -s ../../../$(srcdir)/tex
+	@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