summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-01-16 16:02:52 +0000
committerSteven Knight <knight@baldmt.com>2010-01-16 16:02:52 +0000
commit5c309a5426802f78b14ade9bb8adb9766f75c6ab (patch)
treec0c2f67bdbfa3fb16d2c958d5712df057e1c1a33 /doc
parent604638f98ea09ab2a388c522b6cbe99d9aad5a3e (diff)
downloadscons-5c309a5426802f78b14ade9bb8adb9766f75c6ab.tar.gz
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.
Diffstat (limited to 'doc')
-rw-r--r--doc/user/depends.in14
-rw-r--r--doc/user/depends.xml18
2 files changed, 14 insertions, 18 deletions
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>