X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2FGNUmakefile;h=e8b8d0dbe5b53b2b13ec0c32bbe182b23a2eed16;hb=2ff0a47772ff208caa5694127ecf522e9feb26af;hp=3d6452e5b5f8e8b54be2f2dadc51a191bf7a9431;hpb=6d209ea6b403aa10956379d50a4f46a7e5fe37c9;p=lilypond.git

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 3d6452e5b5..e8b8d0dbe5 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -3,15 +3,16 @@ depth=../..
 LATEX_FILES =$(wildcard *.latex)
 
 # todo: add latex.
-DVI_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.dvi))
+DVI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.dvi)
 
 EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES)
 IMAGES=$(wildcard *.png)
 
-OUT_EPS_IMAGES=$(addprefix $(outdir)/,$(IMAGES:.png=.eps))
-OUT_PNG_IMAGES=$(addprefix $(outdir)/,$(IMAGES))
-OUT_ITEXI_FILES=$(addprefix $(outdir)/,$(ITELY_FILES:.itely=.itexi) 
-HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html))\
+OUT_EPS_IMAGES=$(IMAGES:%.png=$(outdir)/%.eps)
+OUT_PNG_IMAGES=$(IMAGES:%=$(outdir)/%)
+OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
+ $(ITELY_FILES:%.itely=$(outdir)/%.texi)
+HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%.html)\
  $(outdir)/lilypond-internals.html
 
 PS_FILES = $(DVI_FILES:.dvi=.ps)
@@ -28,6 +29,10 @@ OMF_FILES += $(outdir)/lilypond-internals.html.omf
 
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 
+
+TEXINPUTS=$(topdir)/tex::
+export TEXINPUTS
+
 include $(depth)/make/stepmake.make 
 
 dvi: $(DVI_FILES)
@@ -36,6 +41,11 @@ ps: $(PS_FILES)
 
 info: $(INFO_FILES)
 
+pathsettings:
+	@echo export PATH=$(PATH)
+	@echo export LILYPONDPREFIX=$(LILYPONDPREFIX)
+	@echo export PYTHONPATH=$(PYTHONPATH)
+
 xml: $(outdir)/lilypond/lilypond.xml $(outdir)/lilypond-internals/lilypond-internals.xml
 
 # There are two modes for info: with and without images.
@@ -68,7 +78,7 @@ else
 	-$(INSTALL) -d $(DESTDIR)$(package_infodir)
 	-install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info
 	install-info --info-dir=$(infodir) $(outdir)/lilypond.info
-	(cd $(package_infodir) && ln -sf $(local_package_docdir)/Documentation/user/out-www/*png .)
+	(cd $(lilypond_infodir) && ln -sf $(webdir)/Documentation/user/out-www/*png .)
 endif
 
 local-uninstall-WWW:
@@ -138,7 +148,7 @@ $(outdir)/lilypond.nexi: $(outdir)/lilypond-internals.texi
 #
 # The split user manual
 #
-$(outdir)/lilypond/index.html: $(outdir)/lilypond.texi
+$(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES)
 	mkdir -p $(dir $@)
 	$(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
 	find $(outdir)/lilypond/ -name '*'.png -o -name '*'.ly | xargs rm -f
@@ -164,6 +174,15 @@ $(outdir)/lilypond-internals/index.html: $(outdir)/lilypond-internals.texi
 $(outdir)/lilypond-internals.html: $(outdir)/lilypond-internals.texi
 	$(MAKEINFO) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
 
+#
+# The split glossary
+#
+$(outdir)/music-glossary/index.html: $(outdir)/music-glossary.texi
+	mkdir -p $(dir $@)
+	$(MAKEINFO) --output=$(outdir)/music-glossary --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
+	find $(outdir)/music-glossary/ -name '*'.png -o -name '*'.ly | xargs rm -f
+# symbolic links to save space 
+	(cd $(outdir)/music-glossary/ ; ln -sf ../*.png ../*.ly . )
 
 $(outdir)/lilypond.xml: $(outdir)/lilypond.texi 
 	mkdir -p $(dir $@)
@@ -183,10 +202,26 @@ $(outdir)/%.eps: %.png
 
 DEEP_HTML_FILES =\
  $(outdir)/lilypond/index.html\
- $(outdir)/lilypond-internals/index.html
+ $(outdir)/lilypond-internals/index.html\
+ $(outdir)/music-glossary/index.html
+
+# Symlinks to refer to external source documents from split and non-split HTML
+source-links = $(outdir)/source $(outdir)/lilypond/source $(outdir)/music-glossary/source
+
+$(outdir)/source:
+	@rm -f $(@)
+	ln -sf ../../../ $(@)
+
+$(outdir)/lilypond/source:
+	@rm -f $(@)
+	ln -sf ../../../../ $(@)
+
+$(outdir)/music-glossary/source:
+	@rm -f $(@)
+	ln -sf ../../../../ $(@)
 
 local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\
- $(datafiles) $(PDF_FILES) $(PS_GZ_FILES) info info-dir
+ $(datafiles) $(PDF_FILES) $(source-links) info info-dir
 
 local-WWW-clean: deep-WWW-clean
 
@@ -194,7 +229,7 @@ deep-WWW-clean:
 	rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
 
 info-dir:
-	$(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
+	$(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals music-glossary
 
 
 $(outdir)/%.bib: %.bib
@@ -202,7 +237,7 @@ $(outdir)/%.bib: %.bib
 
 local-clean:
 	rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
-	rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
+	rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals $(outdir)/music-glossary
 
 # lilypond.texi deps
 $(builddir)/mf/$(outconfbase)/feta16list.ly:
@@ -211,6 +246,9 @@ $(builddir)/mf/$(outconfbase)/feta16list.ly:
 $(outdir)/lilypond.texi: $(ITELY_FILES) $(ITEXI_FILES) 
 $(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
 
+# Prevent building music-glossary.texi from default target
+$(outdir)/music-glossary.nexi:
+
 # Rules for the automatically generated documentation
 # When cross-compiling, we don't have lilypond, so we fake
 ifneq ($(CROSS),yes)
@@ -236,11 +274,10 @@ $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi:
 	touch $@
 	touch $(outdir)/$(*F).nexi
 
-$(outdir)/interfaces.itexi:
+$(outdir)/programming-interface.texi:
 	cp dummy-interfaces.itexi $@
 endif
 
-
 local-clean: local-delete
 
 local-delete: