diff options
author | Raja R Harinath <harinath@hurrynot.org> | 2008-11-19 21:37:59 +0300 |
---|---|---|
committer | Raja R Harinath <harinath@hurrynot.org> | 2008-11-19 21:37:59 +0300 |
commit | 149e984c8275429d2055ae5a98f5d82e1c7b03a6 (patch) | |
tree | 363ad3e6c3a59c2b04493199619250d457a7753d /docs | |
parent | 45ecca53d6491ad08475b1b7185871bc021d24a0 (diff) |
Fix srcdir != builddir, and add idiom for multi-output commands
* docs.make (monoapi.zip): Handle the case where 'monoapi.tree'
exists but 'monoapi.zip' doesn't. IOW, we should rebuild
monoapi.zip with 'rm monoapi.zip; make'.
(mono-tools.zip, mono-file-formats.zip): Likewise.
* Makefile.am (monoapi.zip, mono-tools.zip, mono-fileformats.zip): Likewise.
(monoapi.tree): Don't use $< in an explicit rule.
(mono-tools.tree, mono-file-formats.tree): Likewise.
svn path=/trunk/mono/; revision=119361
Diffstat (limited to 'docs')
-rw-r--r-- | docs/ChangeLog | 12 | ||||
-rw-r--r-- | docs/Makefile.am | 23 | ||||
-rw-r--r-- | docs/docs.make | 11 |
3 files changed, 32 insertions, 14 deletions
diff --git a/docs/ChangeLog b/docs/ChangeLog index 30ab1b726bc..6670e71250c 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,15 @@ +2008-11-19 Raja R Harinath <harinath@hurrynot.org> + + Fix srcdir != builddir, and add idiom for multi-output commands + * docs.make (monoapi.zip): Handle the case where 'monoapi.tree' + exists but 'monoapi.zip' doesn't. IOW, we should rebuild + monoapi.zip with 'rm monoapi.zip; make'. + (mono-tools.zip, mono-file-formats.zip): Likewise. + * Makefile.am (monoapi.zip, mono-tools.zip, mono-fileformats.zip): + Likewise. + (monoapi.tree): Don't use $< in an explicit rule. + (mono-tools.tree, mono-file-formats.tree): Likewise. + 2008-11-18 Jonathan Pryor <jpryor@novell.com> * Makefile.am (EXTRA_DIST): Add mono-file-formats{.config,.source} and diff --git a/docs/Makefile.am b/docs/Makefile.am index dc8c44341c0..b7a360ed0ff 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -79,18 +79,21 @@ clean-local: -rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe* -cd $(srcdir) && rm -f $(ASSEMBLED_DOCS) -monoapi.zip : monoapi.tree -monoapi.tree: docs.make Makefile.am toc.xml deploy/.stamp - cp api-style.css deploy - cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@ +monoapi.zip: monoapi.tree + @test -f $@ || { rm -f $(srcdir)/monoapi.tree; $(MAKE) monoapi.tree; } +monoapi.tree: docs.make Makefile.am toc.xml $(srcdir)/deploy/.stamp + cd $(srcdir) && cp api-style.css deploy + cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@ -mono-tools.zip : mono-tools.tree -mono-tools.tree: docs.make Makefile.am deploy/.stamp - cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@ +mono-tools.zip: mono-tools.tree + @test -f $@ || { rm -f $(srcdir)/mono-tools.tree; $(MAKE) mono-tools.tree; } +mono-tools.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp + cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@ -mono-file-formats.zip : mono-file-formats.tree -mono-file-formats.tree: docs.make Makefile.am deploy/.stamp - cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@ +mono-file-formats.zip: mono-file-formats.tree + @test -f $@ || { rm -f $(srcdir)/mono-file-formats.tree; $(MAKE) mono-file-formats.tree; } +mono-file-formats.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp + cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@ $(srcdir)/deploy/.stamp: convert.exe Makefile.am $(mkdir_p) $(srcdir)/html diff --git a/docs/docs.make b/docs/docs.make index 7977ff6fa61..d649fa281ad 100644 --- a/docs/docs.make +++ b/docs/docs.make @@ -10,17 +10,20 @@ ASSEMBLED_DOCS = \ convert.exe: convert.cs AgilityPack.dll $(CSCOMPILE) -out:$@ $< -r:AgilityPack.dll -monoapi.zip : monoapi.tree +monoapi.zip: monoapi.tree + @test -f $@ || { rm -f $<; $(MAKE) $<; } monoapi.tree: toc.xml docs.make $(MDOC) assemble -o monoapi -f hb $< -mono-tools.zip : mono-tools.tree +mono-tools.zip: mono-tools.tree + @test -f $@ || { rm -f $<; $(MAKE) $<; } mono-tools.tree: mono-tools.config docs.make $(MDOC) assemble -o mono-tools -f man $< -mono-file-formats.zip : mono-file-formats.tree +mono-file-formats.zip: mono-file-formats.tree + @test -f $@ || { rm -f $<; $(MAKE) $<; } mono-file-formats.tree: mono-file-formats.config docs.make $(MDOC) assemble -o mono-file-formats -f man $< .doc-stamp: - + |