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

diff --git a/docs/ChangeLog b/docs/ChangeLog
index 6670e71250ce650f396d8115147439811bc5d0a8..bb1a5b5537ad5abe26810bb1202c6cdb0bdbd8e1 100644 (file)
--- 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 b7a360ed0ff157f01c72c08777c6671fc9002c66..26aa4689b7ecd45a25a97fa43c62b3a5c7fc00c8 100644 (file)
--- 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 d649fa281ad1407a7abb673b976add76b0325621..50a001f5f29addfbd64ab8b9ffdb023a1bd56e66 100644 (file)
--- 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 $<