X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2FGNUmakefile;h=f7020493837ef4544d605548e999d0543dbfdda7;hb=544f40d5591b39298881953d1de235aa405c540b;hp=ca93cec69bccbc6853f1366245ddd9c1b666dfd4;hpb=4e1b421ace356547dbc0c4d4a3b611b88a0c92fd;p=lilypond.git

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index ca93cec69b..f702049383 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -33,7 +33,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly
 TEXINPUTS=$(top-src-dir)/tex::
 export TEXINPUTS
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 dvi: $(DVI_FILES)
 
@@ -127,7 +127,7 @@ endif
 local-install-WWW: local-install-info
 local-uninstall-WWW: local-uninstall-info
 
-default: 
+default:
 
 
 local-help: extra-local-help
@@ -152,13 +152,13 @@ $(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES)
 	mkdir -p $(dir $@)
 	$(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
 	find $(outdir)/lilypond/ -name '*'.png -o -name '*'.ly | xargs rm -f
-# symbolic links to save space 
+# symbolic links to save space
 	(cd $(outdir)/lilypond/ ; ln -sf ../*.png ../*.ly . )
 
 #
 # One big page manual
 #
-$(outdir)/lilypond.html: $(outdir)/lilypond.texi
+$(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 $<
 
 #
@@ -181,10 +181,10 @@ $(outdir)/music-glossary/index.html: $(outdir)/music-glossary.texi
 	mkdir -p $(dir $@)
 	$(MAKEINFO) --output=$(outdir)/music-glossary --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
 	find $(outdir)/music-glossary/ -name '*'.png -o -name '*'.ly | xargs rm -f
-# symbolic links to save space 
+# symbolic links to save space
 	(cd $(outdir)/music-glossary/ ; ln -sf ../*.png ../*.ly . )
 
-$(outdir)/lilypond.xml: $(outdir)/lilypond.texi 
+$(outdir)/lilypond.xml: $(outdir)/lilypond.texi
 	mkdir -p $(dir $@)
 	$(MAKEINFO) -I$(outdir) --output=$@ --docbook $<
 
@@ -236,23 +236,20 @@ $(outdir)/%.bib: %.bib
 	ln -f $< $@
 
 local-clean:
-	rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
+	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:
 	$(MAKE) -C $(top-src-dir)/mf
 
-$(outdir)/lilypond.texi: $(ITELY_FILES) $(ITEXI_FILES) 
+$(outdir)/lilypond.texi: $(ITELY_FILES) $(ITEXI_FILES)
 $(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
 
 # Prevent building music-glossary.texi from default target
 $(outdir)/music-glossary.nexi:
 
 # Rules for the automatically generated documentation
-# When cross-compiling, we don't have lilypond, so we fake
-ifneq ($(CROSS),yes)
-
 
 # There used to be a dependency on a dummy target, to force a rebuild
 # of lilypond-internals every time.  however, this triggers
@@ -268,15 +265,6 @@ $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(LILYPOND_
 $(outdir)/interfaces.itexi: dummy
 	cd $(outdir) && lilypond $(top-src-dir)/ly/generate-interface-doc
 
-else
-
-$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi:
-	touch $@
-	touch $(outdir)/$(*F).nexi
-
-$(outdir)/programming-interface.texi:
-	cp dummy-interfaces.itexi $@
-endif
 
 local-clean: local-delete