release: 0.1.64

[lilypond.git] / Documentation / Makefile

diff --git a/Documentation/Makefile b/Documentation/Makefile
index c3cf69814f6c12d3f9c274a0a0a39a4b640fd894..e8fe751ce96a2fdd846bbc78e8319634991afac6 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -22,10 +22,10 @@ include ./$(depth)/make/Docrules.make
 
 
 #
+DATAFILES = $(wildcard *.data)
 TEXTFILES = $(OUTPODFILES:.pod=$(DOTTEXT))
 GROFFFILES = $(OUTPODFILES:.pod=.1)
-HTMLFILES = $(OUTPODFILES:.pod=.html)
-
+HTMLFILES = $(OUTPODFILES:.pod=.html) $(datafiles)
 
 default: do-doc
 
@@ -37,24 +37,21 @@ giffiles = $(addprefix $(outdir)/,$(XPMS:.xpm=.gif))
 
 gifs: $(giffiles)
 
-EXTRA_DISTFILES = $(XPMS)   vocabulary-data vocabulary-forms.el  automake.urgh\
+datafiles = $(addprefix $(outdir)/,$(DATAFILES:.data=.html))
+
+EXTRA_DISTFILES = $(XPMS) vocabulary.data vocabulary-forms.el  automake.urgh\
        gnu-music-history
 
 # don't do DVI files. They can only be made if lily is installed
-do-doc: ugh-mutopia $(TEXTFILES)
+do-doc: $(TEXTFILES)
 
 readme-topfiles:
        cd $(depth); for i in $(README_TOPFILES); do \
-       ln -f $$i Documentation/$(outdir); done
-
-$(outdir)/%$(DOTTEXT): $(depth)/%$(DOTTEXT)
-       rm -f $@
-       ln $< $@
+       ln -f $$i Documentation/$(outdir)/$$i$(DOTTEXT); done
 
 README_TOPFILES=NEWS DEDICATION TODO ANNOUNCE-0.1
 README_TXTFILES=$(addprefix $(outdir)/,$(addsuffix $(DOTTEXT), $(README_TOPFILES)))
 
-#local-WWW: $(HTMLFILES) $(README_TXTFILES)  $(giffiles)
 local-WWW: $(HTMLFILES) readme-topfiles $(README_TXTFILES) $(giffiles)
 
 # generic targets and rules:
@@ -63,10 +60,8 @@ include $(depth)/make/Targets.make
 include $(depth)/make/Rules.make
 
 # ugh
-check-doc-deps:
-       @echo hi
+check-doc-deps: do-doc
+       @echo # hi
 
 doc: do-doc
 
-ugh-mutopia: $(outdir)/mutopia.1
-       troff -man -Tascii $< | grotty -b -u -o > $(outdir)/mutopia$(DOTTEXT)