Merged revisions 1738-1754,1756 via svnmerge from

http://scons.tigris.org/svn/scons/branches/core

........
  r1741 | stevenknight | 2006-12-16 22:51:07 -0600 (Sat, 16 Dec 2006) | 1 line

  0.96.D527 - Give the f90 and f95 Tool modules knowledge of how to build source files of earlier Fortran versions.
........
  r1742 | stevenknight | 2006-12-16 23:22:54 -0600 (Sat, 16 Dec 2006) | 1 line

  0.96.D528 - Better handling of timestamp fallback if there's no md5 module.
........
  r1743 | stevenknight | 2006-12-17 00:21:31 -0600 (Sun, 17 Dec 2006) | 1 line

  0.96.D529 - Fix portability of new tests on systems that don't have TeX installed.
........
  r1744 | stevenknight | 2006-12-19 15:30:16 -0600 (Tue, 19 Dec 2006) | 1 line

  0.96.D530 - Eliminate the ListBuilder subclass in favor of using the Executor's target lists.
........
  r1745 | stevenknight | 2006-12-19 18:54:26 -0600 (Tue, 19 Dec 2006) | 1 line

  0.96.D531 - Eliminate of MultiStepBuilder as a separate Builder subclass.
........
  r1746 | garyo | 2006-12-21 13:21:08 -0600 (Thu, 21 Dec 2006) | 1 line

  Minor doc fix, thanks to Douglas Landgraf.
........
  r1747 | stevenknight | 2006-12-21 17:13:55 -0600 (Thu, 21 Dec 2006) | 1 line

  0.96.D533 - Add CFLAGS for options common to C/C++. (Gary Oberbrunner)
........
  r1748 | stevenknight | 2007-01-03 19:48:05 -0600 (Wed, 03 Jan 2007) | 1 line

  0.96.D534 - Fix signature storage when targets are retrieved from CacheDir().
........
  r1749 | stevenknight | 2007-01-04 16:48:47 -0600 (Thu, 04 Jan 2007) | 1 line

  0.96.D535 - Teach the lex and yacc tools about target files generated by different flex/bison options, and about Objective C suffixes. (Pupeno)
........
  r1750 | stevenknight | 2007-01-04 17:14:38 -0600 (Thu, 04 Jan 2007) | 1 line

  0.96.D536 - Refactor duplicate disambiguation logic in Entry.get_contents().
........
  r1751 | stevenknight | 2007-01-05 13:00:54 -0600 (Fri, 05 Jan 2007) | 1 line

  0.96.D537 - Fix lprof regression from 0.96.92.
........
  r1752 | stevenknight | 2007-01-05 20:43:48 -0600 (Fri, 05 Jan 2007) | 1 line

  0.96.D538 - Fix caching of Builder suffix matching (to fix lprof regression).
........
  r1753 | stevenknight | 2007-01-06 00:03:16 -0600 (Sat, 06 Jan 2007) | 1 line

  0.96.D539 - Fix --include-dir when using MinGW. (Paul)
........
  r1754 | stevenknight | 2007-01-06 00:24:53 -0600 (Sat, 06 Jan 2007) | 1 line

  0.96.D540 - Make bootstrap.py something useful to execute SCons out of a source directory.
........
  r1756 | stevenknight | 2007-01-06 21:32:11 -0600 (Sat, 06 Jan 2007) | 1 line

  0.96.D541 - Update the Copyright year string to include 2007. Automate updating the month+year string in man page title headers. Fix hard-coded __revision__ strings that crept into some older tests.
........

9 files changed, 14 insertions, 13 deletions

diff --git a/doc/man/scons-time.1 b/doc/man/scons-time.1
index 50f490f..b2de002 100644
--- a/doc/man/scons-time.1
+++ b/doc/man/scons-time.1
@@ -19,7 +19,7 @@
 .\" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 .\" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 .\"
-.\" doc/man/scons-time.1 0.96.C629 2006/11/18 11:50:43 knight
+.\" __FILE__ __REVISION__ __DATE__ __DEVELOPER__
 .\"
 .\" ES - Example Start - indents and turns off line fill
 .de ES
@@ -98,7 +98,7 @@
 [\fB--which=\fIWHICH\fR]
 [\fIARGUMENTS\fR]
 ..
-.TH SCONS-TIME 1 "November 2006"
+.TH SCONS-TIME 1 "__MONTH_YEAR__"
 .SH NAME
 scons-time \- generate and display SCons timing information
 '\"==========================================================================
diff --git a/doc/man/scons.1 b/doc/man/scons.1
index d45333b..f4bef97 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -31,7 +31,7 @@
 .fi
 .RE
 ..
-.TH SCONS 1 "December 2006"
+.TH SCONS 1 "__MONTH_YEAR__"
 .SH NAME
 scons \- a software construction tool
 .SH SYNOPSIS
@@ -639,7 +639,7 @@ Output looks something like this:
 .ES
 $ scons --debug=presub
 Building myprog.o with action(s):
-  $SHCC $SHCCFLAGS $CPPFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES
+  $SHCC $SHCFLAGS $SHCCFLAGS $CPPFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES
 ...
 .EE
 
@@ -3149,6 +3149,7 @@ and added to the following construction variables:
 -mno-cygwin         CCFLAGS, LINKFLAGS
 -mwindows           LINKFLAGS
 -pthread            CCFLAGS, LINKFLAGS
+-std=               CFLAGS
 -Wa,                ASFLAGS, CCFLAGS
 -Wl,-rpath=         RPATH
 -Wl,-R,             RPATH
diff --git a/doc/man/sconsign.1 b/doc/man/sconsign.1
index 7fc32ec..3d01cf4 100644
--- a/doc/man/sconsign.1
+++ b/doc/man/sconsign.1
@@ -31,7 +31,7 @@
 .RE
 .fi
 ..
-.TH SCONSIGN 1 "August 2004"
+.TH SCONSIGN 1 "__MONTH_YEAR__"
 .SH NAME
 sconsign \- print SCons .sconsign file information
 .SH SYNOPSIS
diff --git a/doc/user/copyright.in b/doc/user/copyright.in
index 119f749..76e3e50 100644
--- a/doc/user/copyright.in
+++ b/doc/user/copyright.in
@@ -26,7 +26,7 @@
 <blockquote>
  <para>
 
-  SCons User's Guide Copyright (c) 2004 Steven Knight
+  SCons User's Guide Copyright (c) 2004, 2005, 2006, 2007 Steven Knight
 
  </para>
 </blockquote>
diff --git a/doc/user/copyright.sgml b/doc/user/copyright.sgml
index 119f749..76e3e50 100644
--- a/doc/user/copyright.sgml
+++ b/doc/user/copyright.sgml
@@ -26,7 +26,7 @@
 <blockquote>
  <para>
 
-  SCons User's Guide Copyright (c) 2004 Steven Knight
+  SCons User's Guide Copyright (c) 2004, 2005, 2006, 2007 Steven Knight
 
  </para>
 </blockquote>
diff --git a/doc/user/main.in b/doc/user/main.in
index af3b0ee..be302d7 100644
--- a/doc/user/main.in
+++ b/doc/user/main.in
@@ -101,10 +101,10 @@
 
     <edition>Revision &buildrevision; (&builddate;)</edition>
 
-    <pubdate>2004</pubdate>
+    <pubdate>2004, 2005, 2006, 2007</pubdate>
 
     <copyright>
-      <year>2004</year>
+      <year>2004, 2005, 2006, 2007</year>
       <holder>Steven Knight</holder>
     </copyright>
 
diff --git a/doc/user/main.sgml b/doc/user/main.sgml
index af3b0ee..be302d7 100644
--- a/doc/user/main.sgml
+++ b/doc/user/main.sgml
@@ -101,10 +101,10 @@
 
     <edition>Revision &buildrevision; (&builddate;)</edition>
 
-    <pubdate>2004</pubdate>
+    <pubdate>2004, 2005, 2006, 2007</pubdate>
 
     <copyright>
-      <year>2004</year>
+      <year>2004, 2005, 2006, 2007</year>
       <holder>Steven Knight</holder>
     </copyright>
 
diff --git a/doc/user/nodes.in b/doc/user/nodes.in
index a5d05dc..f5faf5a 100644
--- a/doc/user/nodes.in
+++ b/doc/user/nodes.in
@@ -296,7 +296,7 @@
       import os.path
       program_list = Program('hello.c')
       program_name = str(program_list[0])
-      if not os.path.exists(program_name)
+      if not os.path.exists(program_name):
           print program_name, "does not exist!"
       </file>
       <file name="hello.c">
diff --git a/doc/user/nodes.sgml b/doc/user/nodes.sgml
index b6bcb89..114e9e0 100644
--- a/doc/user/nodes.sgml
+++ b/doc/user/nodes.sgml
@@ -300,7 +300,7 @@
       import os.path
       program_list = Program('hello.c')
       program_name = str(program_list[0])
-      if not os.path.exists(program_name)
+      if not os.path.exists(program_name):
           print program_name, "does not exist!"
     </programlisting>