X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2FGNUmakefile;h=5d7affd551c9cf067a1dd543d99449cc6ec63adc;hb=b3d101abf89f881f82ce6b15005888c064c24b7d;hp=0247f74b1e69445027cc2221f9ceb155cd7c4f10;hpb=9079cd048c47b4119b6a19e19667e75e1f323269;p=lilypond.git

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 0247f74b1e..5d7affd551 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -16,11 +16,16 @@ OUT_PNG_IMAGES=$(OUT_PDF_IMAGES:%.pdf=%.png)
 
 OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
  $(ITELY_FILES:%.itely=$(outdir)/%.texi)
+
+MASTER_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi)\
+ $(outdir)/lilypond-internals.texi
+
 HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%-big-page.html)\
  $(outdir)/lilypond-internals-big-page.html
 
 # todo: add latex.
-PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)
+PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)\
+ $(outdir)/lilypond-internals.pdf
 
 MAIN_INFO_DOC = lilypond
 INFO_DOCS = lilypond lilypond-internals music-glossary lilypond-program lilypond-learning
@@ -38,6 +43,8 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly
 
 include $(depth)/make/stepmake.make
 
+default:
+
 info: $(INFO_FILES)
 	@echo export LILYPOND_DATADIR=$(LILYPOND_DATADIR)
 	@echo export PYTHONPATH=$(PYTHONPATH)
@@ -50,8 +57,6 @@ xml: $(outdir)/lilypond/lilypond.xml $(outdir)/lilypond-internals/lilypond-inter
 local-install-WWW: local-install-info
 local-uninstall-WWW: local-uninstall-info
 
-default:
-
 local-clean:
 	rm -f $(INFO_IMAGES_DIR)
 
@@ -60,12 +65,9 @@ local-help: extra-local-help
 extra-local-help:
 	@echo -e "\
   info        update info pages\n\
-  ps          update PostScript documents\n\
   xml	      update Docbook xml documentation\n\
 "
 
-# Generic rule using % twice not possible?
-# $(outdir)/%/%.html: $(outdir)/%.texi
 $(outdir)/lilypond.texi: $(outdir)/lilypond-internals.texi
 
 #
@@ -113,7 +115,7 @@ DEEP_HTML_FILES =\
 
 # 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)/lilypond-program/source $(outdir)/lilypond-learning/source
+ $(outdir)/lilypond-program/source $(outdir)/lilypond-learning/source $(outdir)/lilypond-internals/source
 
 $(outdir)/source:
 	@rm -f $(@)
@@ -124,13 +126,13 @@ $(outdir)/%/source:
 	mkdir -p $(dir $@)
 	ln -sf $(depth)/.. $(@)
 
-local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\
- $(datafiles) $(PDF_FILES) $(source-links) info
+local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES) info
+
+local-WWW-2: $(HTML_FILES) $(DEEP_HTML_FILES) $(source-links)
 
 $(outdir)/%.bib: %.bib
 	ln -f $< $@
 
-
 # lilypond.texi deps
 $(top-build-dir)/mf/$(outconfbase)/feta16list.ly:
 	$(MAKE) -C $(top-src-dir)/mf
@@ -147,9 +149,4 @@ $(outdir)/lilypond.texi $(outdir)/lilypond-program.texi $(outdir)/lilypond-learn
 $(outdir)/lilypond-internals.texi: $(LILYPOND_BINARY)
 	cd $(outdir) && $(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation
 
-
-## unused
-$(outdir)/interfaces.itexi: dummy
-	cd $(outdir) && lilypond $(top-src-dir)/ly/generate-interface-doc
-
 .SECONDARY: