X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2FGNUmakefile;h=19ae57769883b1d8f3667373d426ed2c1bc98544;hb=4bd29f98794235cbe90875a6d73ad6cf4ffeaf5b;hp=48415e1625cffa10dab253d876b547a9914e9034;hpb=a8190046c7951de97dccff54a00098366cbb2869;p=lilypond.git

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 48415e1625..19ae577698 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -9,7 +9,7 @@ depth = ..
 
 NAME = documentation
 LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
-MANUALS_SUBDIRS = usage automated-engraving contributor essay \
+MANUALS_SUBDIRS = usage contributor essay \
   web learning notation extending
 SUBDIRS = $(MANUALS_SUBDIRS) snippets logo pictures misc po css topdocs \
   included $(LANGS)
@@ -32,7 +32,7 @@ README_TOP_FILES= DEDICATION THANKS
 IN_ITELY_FILES = $(call src-wildcard,snippets/*-intro.itely)
 SNIPPET_LY_FILES = $(call src-wildcard,snippets/*.ly)
 
-EXTRA_DIST_FILES = $(call src-wildcard,*.init)
+EXTRA_DIST_FILES = $(call src-wildcard,*.init) $(call src-wildcard,*.bst)
 
 ### Out files
 
@@ -84,16 +84,26 @@ INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 
 ifeq ($(out),www)
 INFO_IMAGES_DIR = lilypond
-DEST_INFO_IMAGES_SUBDIR = Documentation/
+DEST_INFO_IMAGES_SUBDIR = Documentation
 endif
 
 include $(depth)/make/stepmake.make
 
 OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 
-### Web site idiosyncrases
+
+### Web site idiosyncrasies
 $(XREF_MAPS_DIR)/web.xref-map: XREF_MAP_FLAGS += --split=node
 
+### AJAX scripts
+JS_FILES = $(call src-wildcard,*.js)
+PHP_FILES = $(call src-wildcard,*.php)
+EXTRA_DIST_FILES += $(JS_FILES) $(PHP_FILES)
+
+OUT_JS_FILES = $(JS_FILES:%.js=$(outdir)/%.js)
+OUT_PHP_FILES = $(PHP_FILES:%.php=$(outdir)/%.php)
+
+
 
 ### bad hack for badly-integrated roadmap.
 $(outdir)/ROADMAP:
@@ -101,24 +111,40 @@ $(outdir)/ROADMAP:
 $(outdir)/contributor.texi: $(outdir)/ROADMAP
 
 ### bad hack for badly-integrated bibliography
-$(outdir)/engravingbib.itexi:
-	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2html \
-		-o $(outdir)/colorado.html \
+$(outdir)/colorado.itexi:
+	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
+		-s $(top-src-dir)/Documentation/lily-bib \
+		-o $(outdir)/colorado.itexi \
 		$(src-dir)/essay/colorado.bib
-	$(buildscript-dir)/html-to-texi \
-		< $(outdir)/colorado.html > $(outdir)/colorado.itexi
-	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2html \
-		-o $(outdir)/computer-notation.html \
+
+$(outdir)/computer-notation.itexi:
+	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
+		-s $(top-src-dir)/Documentation/lily-bib \
+		-o $(outdir)/computer-notation.itexi \
 		$(src-dir)/essay/computer-notation.bib
-	$(buildscript-dir)/html-to-texi \
-		< $(outdir)/computer-notation.html > $(outdir)/computer-notation.itexi
-	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2html \
-		-o $(outdir)/engravingbib.html \
+
+$(outdir)/engravingbib.itexi:
+	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
+		-s $(top-src-dir)/Documentation/lily-bib \
+		-o $(outdir)/engravingbib.itexi \
 		$(src-dir)/essay/engravingbib.bib
-	$(buildscript-dir)/html-to-texi \
-		< $(outdir)/engravingbib.html > $(outdir)/engravingbib.itexi
 
-$(outdir)/essay.texi: $(outdir)/engravingbib.itexi
+$(outdir)/essay.texi: \
+  $(outdir)/colorado.itexi \
+  $(outdir)/computer-notation.itexi \
+  $(outdir)/engravingbib.itexi
+
+$(outdir)/others-did.itexi:
+	BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \
+		-s $(top-src-dir)/Documentation/lily-bib \
+		-o $(outdir)/others-did.itexi \
+		$(src-dir)/web/others-did.bib
+
+$(outdir)/we-wrote.itexi:
+	BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \
+		-s $(top-src-dir)/Documentation/lily-bib \
+		-o $(outdir)/we-wrote.itexi \
+		$(src-dir)/web/we-wrote.bib
 
 
 ###########
@@ -168,9 +194,14 @@ local-clean:
 ifeq ($(out),www)
 local-WWW-1: $(OUT_TEXINFO_MANUALS) $(PDF_FILES) info
 
+ifeq ($(AJAX_SEARCH),1)
+local-WWW-2: txt-to-html $(OUT_HTML_FILES) $(DEEP_HTML_FILES) $(OUT_JS_FILES) $(OUT_PHP_FILES) $(source-links) $(OMF_FILES)
+else
 local-WWW-2: txt-to-html $(OUT_HTML_FILES) $(DEEP_HTML_FILES) $(source-links) $(OMF_FILES)
 endif
 
+endif
+
 
 #########
 ### Rules
@@ -191,13 +222,19 @@ $(outdir)/pictures:
 	$(MAKE) -C pictures WWW-1
 	ln -sf ../pictures/$(outdir) $@
 
-$(outdir)/web.texi: $(outdir)/ly-examples
-
 $(outdir)/ly-examples:
 	$(MAKE) -C web/ly-examples
 	ln -sf ../web/ly-examples/$(outdir) $@
 endif
 
+ifeq ($(out),www)
+$(outdir)/web.texi: $(outdir)/ly-examples $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi
+else
+# duplicate (without ly-examples)
+$(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi
+endif
+
+
 # Ugh, using '%' twice not possible
 $(outdir)/notation/notation.xml: $(outdir)/notation.texi
 	mkdir -p $(dir $@)
@@ -224,7 +261,7 @@ $(outdir)/%/source:
 	ln -sf $(depth)/.. $(@)
 
 
-## Snippets rules idiosyncrases
+## Snippets rules idiosyncrasies
 $(outdir)/%.itely: snippets/%-intro.itely snippets/%.snippet-list
 	xargs $(LYS_TO_TELY) -f doctitle,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)
 
@@ -233,6 +270,12 @@ $(outdir)/snippets.texi: $(GENERATED_ITELY_FILES) $(SNIPPET_LY_FILES)
 $(outdir)/%.bib: %.bib
 	ln -f $< $@
 
+$(outdir)/%.js: %.js
+	ln -f $< $@
+
+$(outdir)/%.php: %.php
+	ln -f $< $@
+
 ## notation.texi deps
 $(top-build-dir)/mf/$(outconfbase)/feta16list.ly:
 	$(MAKE) -C $(top-src-dir)/mf
@@ -339,6 +382,6 @@ update-translation:
 
 # what's it gonna be, boy...tranlationS-/translation-
 translation-status:
-	PYTHONPATH=$(top-src-dir)/python:$(top-src-dir)/python/auxiliar $(PYTHON) $(top-src-dir)/scripts/auxiliar/translations-status.py 
+	PYTHONPATH=$(top-src-dir)/python:$(top-src-dir)/python/auxiliar $(PYTHON) $(top-src-dir)/scripts/auxiliar/translations-status.py
 
 .SECONDARY: