From ef8e3962f85e013abeac6e6ad9a7c09200b78eb3 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 01:03:20 +0000 Subject: [PATCH] lilypond-1.3.151 --- Documentation/topdocs/GNUmakefile | 1 + Documentation/user/GNUmakefile | 10 ++++++++-- stepmake/stepmake/documentation-targets.make | 1 + stepmake/stepmake/topdocs-targets.make | 2 -- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile index 10f82f091d..d607526ace 100644 --- a/Documentation/topdocs/GNUmakefile +++ b/Documentation/topdocs/GNUmakefile @@ -6,3 +6,4 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly HTML_FILES=$(addprefix $(outdir)/, $(TEXI_FILES:.texi=.html) $(TELY_FILES:.tely=.html)) include $(depth)/make/stepmake.make + diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 1dc1853f44..89789e350b 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -121,11 +121,17 @@ local-clean: # Rules for the automatically generated documentation # When cross-compiling, we don't have lilypond, so we fake ifneq ($(CROSS),yes) -dummy: -$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: dummy + + +# there used to be a dependency on a dummy target, to force a rebuild of lilypond-internals every time. +# however, this triggers compilation during install, which is a bad thing (tm). + +$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(depth)/$(builddir)/lily/$(outconfbase)/lilypond cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-documentation -ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi + +## unused $(outdir)/interfaces.itexi: dummy cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-interface-doc diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make index f1ab422668..c9d4e5c5f5 100644 --- a/stepmake/stepmake/documentation-targets.make +++ b/stepmake/stepmake/documentation-targets.make @@ -1,6 +1,7 @@ default: +# UGH. include $(stepdir)/www-targets.make local-WWW: $(OUTHTML_FILES) footify diff --git a/stepmake/stepmake/topdocs-targets.make b/stepmake/stepmake/topdocs-targets.make index f820c182a4..fd64b837c6 100644 --- a/stepmake/stepmake/topdocs-targets.make +++ b/stepmake/stepmake/topdocs-targets.make @@ -6,8 +6,6 @@ copy-to-top: $(TO_TOP_FILES) cp $(i) $(depth)/ && ) true -cp $(outdir)/*png $(outdir)/index.html $(depth) # don't fail if not making website -###local-WWW: copy-to-top - local-WWW: $(HTML_FILES) copy-to-top # we want footers even if website builds (or is built) partly $(MAKE) footify -- 2.39.5