X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fbibliography%2FGNUmakefile;h=4a7bab0111c2d95cbecf46a17422039dce875ece;hb=f803853f05557ed5ce4e5931d968cc8188d88006;hp=6e8a382f62553dc68ae33750f89030f4f331f294;hpb=d960ed4a0412af65d03a876152dce51fa35d766c;p=lilypond.git

diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile
index 6e8a382f62..4a7bab0111 100644
--- a/Documentation/bibliography/GNUmakefile
+++ b/Documentation/bibliography/GNUmakefile
@@ -2,36 +2,16 @@
 
 depth=../..
 
-DATA_FILES = $(wildcard *.data)
-datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html))
-TEX_FILES = $(wildcard *.tex)
-DOC_FILES = $(wildcard *.doc)
-DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi))
 OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
-
-# just include me
-YO_URG_FILES = $(wildcard *.yo-urg)
-
-OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES))
-OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES))
-EL_FILES = $(wildcard *.el)
-BIB_FILES= $(wildcard *.bib)
-EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) $(wildcard *.sty) 
-HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html))
-PS_FILES = $(DVI_FILES:.dvi=.ps)
+EXTRA_DIST_FILES= $(BIB_FILES) $(call src-wildcard,*.bst) 
+BIB_FILES= $(call src-wildcard,*.bib)
 
 STEPMAKE_TEMPLATES=tex documentation
-LOCALSTEPMAKE_TEMPLATES=lilypond mudela
-
-export BIBINPUTS:=$(shell pwd)//$(PATHSEP)$(BIBINPUTS)
-include $(depth)/make/stepmake.make 
-
-
-
-
+LOCALSTEPMAKE_TEMPLATES=lilypond ly
 
+include $(depth)/make/stepmake.make
 
-dvi: $(OUT_BIB_FILES) $(DVI_FILES)
+dvi: $(DVI_FILES) $(OUT_BIB_FILES)
 
 ps: $(PS_FILES)
 
@@ -41,35 +21,13 @@ default:
 GENHTMLS = engraving colorado  computer-notation
 OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
 
-#urg should generalise and move Lilypond -> StepMake
-# URG.  Lilypond specific. Move out. 
-$(outdir)/%.html: %.data $(depth)/VERSION
-	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
' --package=$(topdir) -o $@ $<
-	$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@
-
-$(outdir)/%.tex: %.data $(depth)/VERSION
-	$(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='
' --package=$(topdir) -o $@ --latex $<
-
-
-
-local-WWW: $(HTML_FILES) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles)
-	$(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about design and implementation of LilyPond' \
-	  $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) $(TEX_FILES)\
-	  | sed "s!$(outdir)/!!g" > $(outdir)/index.html
-	  $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html
+local-WWW: $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html) index.html)
 
 $(outdir)/%.bib: %.bib
 	ln -f $< $@
 
-# ignore result since bib2html is nonstandard. Errors would halt the RPM build.j  
 $(outdir)/%.html: %.bib
-	-bib2html $< $@
-
-# Yeah right: 
-# make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi
-
-#out/%: $(outdir)/%
-#	cp -f $< $@
+	BSTINPUTS=$(src-dir) $(PYTHON) $(buildscript-dir)/bib2html.py -o $@ $<
 
-locamlclean:
+local-clean:
 	rm -f fonts.aux fonts.log feta*.tfm feta*.*pk