diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2008-11-20 06:45:37 +0300 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2008-11-20 06:45:37 +0300 |
| commit | f76dcea8839d771ec4b6dd6635982fbbf36ef4c1 (patch) | |
| tree | 12ed3541792962bdf8dd878797171726c546b653 /docs | |
| parent | b28c8ab4251326368b2b2d859d477df28d7b211f (diff) | |
Remove unnecessary rebuilds of the html directory
* docs.make (monoapi.zip): Make slightly more unforgiving, by
using '&&' instead of ';' to sequence commands.
(mono-tools.zip, mono-file-formats.zip): Likewise.
* Makefile.am (monoapi.zip, mono-tools.zip, mono-fileformats.zip):
Likewise.
(convert.exe): Don't depend on Makefile.am or docs.make.
svn path=/trunk/mono/; revision=119413
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ChangeLog | 10 | ||||
| -rw-r--r-- | docs/Makefile.am | 8 | ||||
| -rw-r--r-- | docs/docs.make | 6 |
3 files changed, 17 insertions, 7 deletions
diff --git a/docs/ChangeLog b/docs/ChangeLog index 6670e71250c..bb1a5b5537a 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,13 @@ +2008-11-20 Raja R Harinath <harinath@hurrynot.org> + + Remove unnecessary rebuilds of the html directory + * docs.make (monoapi.zip): Make slightly more unforgiving, by + using '&&' instead of ';' to sequence commands. + (mono-tools.zip, mono-file-formats.zip): Likewise. + * Makefile.am (monoapi.zip, mono-tools.zip, mono-fileformats.zip): + Likewise. + (convert.exe): Don't depend on Makefile.am or docs.make. + 2008-11-19 Raja R Harinath <harinath@hurrynot.org> Fix srcdir != builddir, and add idiom for multi-output commands diff --git a/docs/Makefile.am b/docs/Makefile.am index b7a360ed0ff..26aa4689b7e 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -80,18 +80,18 @@ clean-local: -cd $(srcdir) && rm -f $(ASSEMBLED_DOCS) monoapi.zip: monoapi.tree - @test -f $@ || { rm -f $(srcdir)/monoapi.tree; $(MAKE) 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 - @test -f $@ || { rm -f $(srcdir)/mono-tools.tree; $(MAKE) 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 - @test -f $@ || { rm -f $(srcdir)/mono-file-formats.tree; $(MAKE) 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) $@ @@ -103,6 +103,6 @@ $(srcdir)/deploy/.stamp: convert.exe Makefile.am extract: $(srcdir)/deploy/.stamp -convert.exe: docs.make convert.cs Makefile.am +convert.exe: convert.cs AgilityPack.dll cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe diff --git a/docs/docs.make b/docs/docs.make index d649fa281ad..50a001f5f29 100644 --- a/docs/docs.make +++ b/docs/docs.make @@ -11,17 +11,17 @@ convert.exe: convert.cs AgilityPack.dll $(CSCOMPILE) -out:$@ $< -r:AgilityPack.dll monoapi.zip: monoapi.tree - @test -f $@ || { rm -f $<; $(MAKE) $<; } + @test -f $@ || { rm -f $< && $(MAKE) $<; } monoapi.tree: toc.xml docs.make $(MDOC) assemble -o monoapi -f hb $< mono-tools.zip: mono-tools.tree - @test -f $@ || { rm -f $<; $(MAKE) $<; } + @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 - @test -f $@ || { rm -f $<; $(MAKE) $<; } + @test -f $@ || { rm -f $< && $(MAKE) $<; } mono-file-formats.tree: mono-file-formats.config docs.make $(MDOC) assemble -o mono-file-formats -f man $< |