X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2FGNUmakefile;h=278061df3958f124cececaac1dd5893ff64d11c3;hb=d3893f0e1ba5d8cf85b73b9a59fab58d8f675e5b;hp=5c250827922291ab87dbbc4e860bc5567a370b04;hpb=e124074c9a8f1ee0782713db07bbfdd15ea8a9e8;p=lilypond.git

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 5c25082792..278061df39 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -3,7 +3,7 @@ depth=../..
 LATEX_FILES =$(call src-wildcard,*.latex)
 
 
-EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt $(EPS_ILLUSTRATIONS)
+EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt convert-ly.txt $(EPS_ILLUSTRATIONS)
 
 IMAGES=$(call src-wildcard,*.png)
 EPS_ILLUSTRATIONS=context-example.eps
@@ -15,13 +15,13 @@ OUT_PNG_IMAGES=$(OUT_PDF_IMAGES:%.pdf=%.png)
 
 OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
  $(ITELY_FILES:%.itely=$(outdir)/%.texi)
-HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%.html)\
- $(outdir)/lilypond-internals.html
+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)
 
-INFO_DOCS = lilypond lilypond-internals music-glossary
+INFO_DOCS = lilypond lilypond-internals music-glossary lilypond-program
 INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 
 STEPMAKE_TEMPLATES=tex texinfo omf documentation
@@ -40,7 +40,7 @@ info: $(INFO_FILES)
 
 pathsettings:
 	@echo export PATH=$(PATH)
-	@echo export LILYPONDPREFIX=$(LILYPONDPREFIX)
+	@echo export LILYPOND_DATADIR=$(LILYPOND_DATADIR)
 	@echo export PYTHONPATH=$(PYTHONPATH)
 
 xml: $(outdir)/lilypond/lilypond.xml $(outdir)/lilypond-internals/lilypond-internals.xml
@@ -74,6 +74,7 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 else
 	-$(INSTALL) -d $(DESTDIR)$(package_infodir)
 	-install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info
+	-install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-program.info
 	install-info --info-dir=$(infodir) $(outdir)/lilypond.info
 	(cd $(package_infodir) && ln -sf $(webdir)/Documentation/user/*png .)
 endif
@@ -153,10 +154,27 @@ $(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES) $(OUT_E
 	(cd $(outdir)/lilypond/ ; ln -sf ../*.png ../*.ly . )
 
 #
-# One big page manual
+# One big page user manual
 #
-$(outdir)/lilypond.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES)
-	$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
+$(outdir)/lilypond-big-page.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES)
+	$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
+
+#
+# The split program usage
+#
+$(outdir)/lilypond-program/index.html: $(outdir)/lilypond-program.texi $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES)
+	mkdir -p $(dir $@)
+	$(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond-program --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
+	find $(outdir)/lilypond-program/ -name '*'.png -o -name '*'.ly | xargs rm -f
+# symbolic links to save space
+	(cd $(outdir)/lilypond-program/ ; ln -sf ../*.png ../*.ly . )
+
+#
+# One big page program usage
+#
+$(outdir)/lilypond-program-big-page.html: $(outdir)/lilypond-program.texi $(OUT_PNG_IMAGES)
+	$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
+
 
 #
 # The split internals reference
@@ -168,8 +186,8 @@ $(outdir)/lilypond-internals/index.html: $(outdir)/lilypond-internals.texi
 #
 # One big page internals reference
 #
-$(outdir)/lilypond-internals.html: $(outdir)/lilypond-internals.texi
-	$(MAKEINFO) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
+$(outdir)/lilypond-internals-big-page.html: $(outdir)/lilypond-internals.texi
+	$(MAKEINFO) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
 
 #
 # The split glossary
@@ -191,20 +209,16 @@ $(outdir)/lilypond-internals/lilypond-internals.xml: $(outdir)/lilypond-internal
 
 $(outdir)/lilypond.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES)
 
+$(outdir)/lilypond-program.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES)
+
 $(outdir)/%.png: %.png
-	convert -geometry 50x50% $< $@
+	convert -depth 8 -geometry 50x50% $< $@
 
 $(outdir)/%.png: %.eps
-	convert $< $@
-
-$(outdir)/%.eps: %.png
-	convert $< $@
-
-$(outdir)/%.eps: %.eps
-	cp $< $@
+	gs -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit
 
 $(outdir)/%.pdf: %.png
-	convert $< $@
+	convert -depth 8 $< $@
 
 $(outdir)/%.pdf: %.eps
 	gs -dAutoRotatePages=/None -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $<
@@ -213,10 +227,11 @@ $(outdir)/%.pdf: %.eps
 DEEP_HTML_FILES =\
  $(outdir)/lilypond/index.html\
  $(outdir)/lilypond-internals/index.html\
- $(outdir)/music-glossary/index.html
+ $(outdir)/music-glossary/index.html\
+ $(outdir)/lilypond-program/index.html
 
 # Symlinks to refer to external source documents from split and non-split HTML
-source-links = $(outdir)/source $(outdir)/lilypond/source $(outdir)/music-glossary/source
+source-links = $(outdir)/source $(outdir)/lilypond/source $(outdir)/music-glossary/source $(outdir)/lilypond-program/source
 
 $(outdir)/source:
 	@rm -f $(@)
@@ -224,30 +239,30 @@ $(outdir)/source:
 
 $(outdir)/lilypond/source:
 	@rm -f $(@)
+	mkdir -p $(outdir)/lilypond
 	ln -sf ../../../ $(@)
 
 $(outdir)/music-glossary/source:
 	@rm -f $(@)
+	mkdir -p $(outdir)/music-glossary
 	ln -sf ../../../ $(@)
 
-local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\
- $(datafiles) $(PDF_FILES) $(source-links) info info-dir
+$(outdir)/lilypond-program/source:
+	@rm -f $(@)
+	mkdir -p $(outdir)/lilypond-program
+	ln -sf ../../../ $(@)
 
-local-WWW-clean: deep-WWW-clean
 
-deep-WWW-clean:
-	rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
+local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\
+ $(datafiles) $(PDF_FILES) $(source-links) info info-dir
 
 info-dir:
-	$(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals music-glossary
+	$(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals music-glossary lilypond-program
 
 
 $(outdir)/%.bib: %.bib
 	ln -f $< $@
 
-local-clean:
-	rm -f fonts.aux fonts.log feta*.tfm feta*.*pk
-	rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals $(outdir)/music-glossary
 
 # lilypond.texi deps
 $(top-build-dir)/mf/$(outconfbase)/feta16list.ly:
@@ -274,10 +289,3 @@ $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(LILYPOND_
 ## unused
 $(outdir)/interfaces.itexi: dummy
 	cd $(outdir) && lilypond $(top-src-dir)/ly/generate-interface-doc
-
-
-local-clean: local-delete
-
-local-delete:
-	find $(outdir)/ -name 'lily-[0-9]*' | xargs rm -f
-	-rm -f $(outdir)/*