From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Sat, 16 Jan 2010 16:02:52 +0000 (+0000)
Subject: Fix timestamp-related Decider() examples by using Object() instead of
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0be0ec900303dd88351e7bd511d55a6a70de2c59;p=scons.git

Fix timestamp-related Decider() examples by using Object() instead of
Program(), to avoid the downstream "hello" executable sometimes not
getting re-linked if the example re-ran within a single second and
didn't change the hello.o timestamp.


git-svn-id: http://scons.tigris.org/svn/scons/trunk@4625 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---

diff --git a/doc/user/depends.in b/doc/user/depends.in
index 8ba05048..9a57055e 100644
--- a/doc/user/depends.in
+++ b/doc/user/depends.in
@@ -248,7 +248,7 @@
 
       <scons_example name="newer">
         <file name="SConstruct" printme="1">
-        Program('hello.c')
+        Object('hello.c')
         Decider('timestamp-newer')
         </file>
         <file name="hello.c">
@@ -265,9 +265,9 @@
       </para>
 
       <scons_output example="newer" os="posix">
-         <scons_output_command>scons -Q hello</scons_output_command>
+         <scons_output_command>scons -Q hello.o</scons_output_command>
          <scons_output_command>touch hello.c</scons_output_command>
-         <scons_output_command>scons -Q hello</scons_output_command>
+         <scons_output_command>scons -Q hello.o</scons_output_command>
       </scons_output>
 
       <para>
@@ -281,7 +281,7 @@
       </para>
 
       <sconstruct>
-        Program('hello.c')
+        Object('hello.c')
         Decider('make')
       </sconstruct>
 
@@ -317,7 +317,7 @@
 
       <scons_example name="match">
         <file name="SConstruct" printme="1">
-        Program('hello.c')
+        Object('hello.c')
         Decider('timestamp-match')
         </file>
         <file name="hello.c">
@@ -338,9 +338,9 @@
       </para>
 
       <scons_output example="match" os="posix">
-         <scons_output_command>scons -Q hello</scons_output_command>
+         <scons_output_command>scons -Q hello.o</scons_output_command>
          <scons_output_command>touch -t 198901010000 hello.c</scons_output_command>
-         <scons_output_command>scons -Q hello</scons_output_command>
+         <scons_output_command>scons -Q hello.o</scons_output_command>
       </scons_output>
 
       <para>
diff --git a/doc/user/depends.xml b/doc/user/depends.xml
index cfff07b6..c9207d56 100644
--- a/doc/user/depends.xml
+++ b/doc/user/depends.xml
@@ -259,7 +259,7 @@
       </para>
 
       <programlisting>
-        Program('hello.c')
+        Object('hello.c')
         Decider('timestamp-newer')
       </programlisting>
 
@@ -272,13 +272,11 @@
       </para>
 
       <screen>
-         % <userinput>scons -Q hello</userinput>
+         % <userinput>scons -Q hello.o</userinput>
          cc -o hello.o -c hello.c
-         cc -o hello hello.o
          % <userinput>touch hello.c</userinput>
-         % <userinput>scons -Q hello</userinput>
+         % <userinput>scons -Q hello.o</userinput>
          cc -o hello.o -c hello.c
-         cc -o hello hello.o
       </screen>
 
       <para>
@@ -292,7 +290,7 @@
       </para>
 
       <programlisting>
-        Program('hello.c')
+        Object('hello.c')
         Decider('make')
       </programlisting>
 
@@ -327,7 +325,7 @@
       </para>
 
       <programlisting>
-        Program('hello.c')
+        Object('hello.c')
         Decider('timestamp-match')
       </programlisting>
 
@@ -344,13 +342,11 @@
       </para>
 
       <screen>
-         % <userinput>scons -Q hello</userinput>
+         % <userinput>scons -Q hello.o</userinput>
          cc -o hello.o -c hello.c
-         cc -o hello hello.o
          % <userinput>touch -t 198901010000 hello.c</userinput>
-         % <userinput>scons -Q hello</userinput>
+         % <userinput>scons -Q hello.o</userinput>
          cc -o hello.o -c hello.c
-         cc -o hello hello.o
       </screen>
 
       <para>