X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2FGNUmakefile;h=1dc1853f4434e519246e1d10a5a669ab5b08ecff;hb=56803f159f4a7bcf205835b781531c7db9c10958;hp=32f8816323cc52c653378d18920b1c498b9c0851;hpb=9a99014bb1c199f187553fa8284521505c569031;p=lilypond.git

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 32f8816323..1dc1853f44 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -3,10 +3,8 @@
 depth=../..
 
 
-
 LATEX_FILES =$(wildcard *.latex)
 
-
 # todo: add latex.
 DVI_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.dvi))
 
@@ -23,8 +21,18 @@ INFO_FILES = $(addprefix $(outdir)/, lilypond.info lilypond-internals.info)
 STEPMAKE_TEMPLATES=tex texinfo documentation
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 
+# Hmm, what about?
+# local-dist: check-info
+
+info: check-info
+
 include $(depth)/make/stepmake.make 
 
+# Ugh,ugh.
+# emacs cannot fix the menu structure when @mbinclude is used
+# lilypond.tely uses mbinclude
+TEXINFO_SOURCES := $(filter-out lilypond.tely, $(TEXINFO_SOURCES))
+
 dvi: $(DVI_FILES)
 
 ps: $(PS_FILES)
@@ -42,28 +50,25 @@ default:
 info: $(INFO_FILES)
 
 
-# The next version of makeinfo should split html files into their own
-# directory.  For now available only as patches from
-# http://appel.lilypond.org/software
-SPLITTING_MAKEINFO = $(shell makeinfo --version | grep 4.0.jcn2)
+# The new pretest version of makeinfo, 4.0a splits html files into their own
+# directory.  Available from
+# ftp://texinfo.org/texinfo/pretests/texinfo-4.0a.tar.gz
+SPLITTING_MAKEINFO = $(shell makeinfo --version | egrep '4.0((.jcn[2,3])|a)')
 
 
 # Generic rule using % twice not possible?
 # $(outdir)/%/%.html: $(outdir)/%.texi
 $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi
-	-$(MAKEINFO) --force --output=$@ --html $<
-	-mv -f $(outdir)/*.png $(outdir)/lilypond
-	$(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
+	$(MAKEINFO) --output=$@ --html $<
+	-cp -f $(outdir)/*.png $(outdir)/lilypond
+	-cp -f $(outdir)/lilypond/index.html $@
+	$(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
 $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
-	-$(MAKEINFO) --force --output=$@ --html $<
-	-mv -f $(outdir)/*.png $(outdir)/lilypond-internals
-	$(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
-
-$(outdir)/features/features.html: $(outdir)/features.texi
-	-$(MAKEINFO) --force --output=$@ --html $<
-	-mv -f $(outdir)/*.png $(outdir)/features
-	$(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
+	$(MAKEINFO) --output=$@ --html $<
+	-cp -f $(outdir)/*.png $(outdir)/lilypond-internals
+	-cp -f $(outdir)/lilypond-internals/index.html $@
+	$(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
 ifneq ($(SPLITTING_MAKEINFO),)
 
@@ -73,40 +78,64 @@ else
 
 DEEP_HTML_FILES = $(outdir)/lilypond.html $(outdir)/lilypond-internals.html
 
+local-WWW: deep-symlinks
+
+
+
+# Links referred to by Documentation index
+LILYPOND_LINKS=Reference-Manual.html Features.html Ly2dvi.html Midi2ly.html
+
+deep-symlinks:
+	cd $(outdir) && rm -f lilypond && ln -s . lilypond
+	cd $(outdir) && rm -f lilypond-internals && ln -s . lilypond-internals
+	cd $(outdir) && $(foreach i, $(LILYPOND_LINKS),\
+		rm -f $(i) && ln -s lilypond.html $(i) &&) true
 endif
 
 
-local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES)
+local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES) info-dir
+
+local-WWW-clean: deep-WWW-clean
+
+deep-WWW-clean:
+	rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
+
+info-dir:
 	$(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
 	$(MAKE) footify
 	$(MAKE) deep-footify
 
-#	$(PYTHON) $(step-bindir)/ls-latex.py --title 'User documentation' \
-#	   $(DOC_FILES) $(TEX_FILES) $(TELY_FILES) \
-#	  | sed "s!$(outdir)/!!g" > $(outdir)/index.html
-
-
 
 $(outdir)/%.bib: %.bib
 	ln -f $< $@
 # we want footers even if website builds (or is built) partly
 	$(MAKE) footify
 
-localclean:
+local-clean:
 	rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
+	rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
 
-backdoc-WWW: $(outdir)/lilypond-internals/lilypond-internals.html
-	$(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
+#$(outdir)/lilypond.nexi: $(outdir)/interfaces.itexi
+#$(outdir)/lilypond.texi: $(outdir)/interfaces.itexi
 
-#ugh. lily/OUT/lilypond hardcoded.
-# when cross-compiling, we don't have lilypond
+# Rules for the automatically generated documentation
+# When cross-compiling, we don't have lilypond, so we fake
 ifneq ($(CROSS),yes)
-$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi:
-	cd $(outdir) && ../$(depth)/$(builddir)/lily/out/lilypond ../$(src-depth)/ly/generate-documentation
+dummy:
+$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: dummy
+	cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-documentation
 	-ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
+
+$(outdir)/interfaces.itexi: dummy
+	cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-interface-doc
+
 else
+
 $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi:
 	touch $@
 	touch $(outdir)/$(*F).nexi
+
+$(outdir)/interfaces.itexi:
+	cp dummy-interfaces.itexi $@
 endif