X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=93609bb70186335086c1da9b34e240f88a8833cf;hb=9a7a808b7c7abcacd08f4c992f75394cc4543d2e;hp=97db8f7136a0adc61d498994a1b7e4db192a834b;hpb=74e5cda3dbc4d6305fad7607de0a6a7d494155bc;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 97db8f7136..93609bb701 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -8,18 +8,19 @@ depth = .
 
 # descent order into subdirectories
 # 
-SUBDIRS = buildscripts scripts flower lily \
+SUBDIRS = buildscripts python scripts \
+	flower lily \
 	mf ly tex ps scm \
-	python po make \
+	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  lexer-gcc-3.1.sh 
+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=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(configuration) VERSION
@@ -44,21 +45,22 @@ 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
 
-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 $(local_lilypond_datadir)
 ifeq ($(KPATHSEA),0)
@@ -86,12 +88,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 \
 		$(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 -)
 
@@ -121,42 +125,55 @@ 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
-	@echo Making $(builddir)/share 
-	@cd $(builddir) && rm -rf share
-	@mkdir -p $(builddir)/share/lilypond
-	@mkdir -p $(builddir)/share/lilypond/fonts
-	@mkdir -p $(builddir)/share/lilypond/tex
-	@cd $(builddir)/share/lilypond && \
+# 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 && \
+	cd $(builddir)/share/lilypond/tex && \
 		ln -s $(abs-srcdir)/tex source && \
 		ln -s ../../../mf/$(outconfbase) generate
-	@cd $(builddir)/share/lilypond/fonts && \
+	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
+	$(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 $(builddir) && rm -rf share
+	cd $(builddir) && rm -rf share
 
-$(config_h): configure
+$(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 file is out of date'
-	@echo ' *** Rerun configure or autogen.sh'
+	@echo ' *** $(config_h) is out of date'
+	@echo ' *** Remove it and rerun autogen:'
+	@echo '         rm $(config_h); ./autogen.sh'
 	@echo
 	@false