Commits

dirkbaechle  committed fe2748d

- added filename prefix to all scons_example names
- added unique suffixes to each scons_output_command
- extended SCons Docbook XSD by the new suffix attribute

  • Participants
  • Parent commits 70b6dcd

Comments (0)

Files changed (34)

File doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd

     <xs:attribute name="edit" type="xs:string" use="optional" />
     <xs:attribute name="environment" type="xs:string" use="optional" />
     <xs:attribute name="output" type="xs:string" use="optional" />
+    <xs:attribute name="suffix" type="xs:string" use="required" />
   </xs:attributeGroup>
   <!-- end of scons_output_command.attlist -->
   <!-- end of scons_output_command.module -->

File doc/user/add-method.xml

 
   </para>
 
-  <scons_example name="ex1">
+  <scons_example name="addmethod_ex1">
      <file name="SConstruct" printme="1">
      def install_in_bin_dirs(env, source):
          """Install source in both bin dirs"""
   This produces the following:
   </para>
 
-  <scons_output example="ex1">
-    <scons_output_command>scons -Q /</scons_output_command>
+  <scons_output example="addmethod_ex1">
+    <scons_output_command suffix="1">scons -Q /</scons_output_command>
   </scons_output>
 
   <para>
   </para>
 
   <scons_output example="ex2">
-    <scons_output_command>scons -Q</scons_output_command>
+    <scons_output_command suffix="1">scons -Q</scons_output_command>
   </scons_output>
 
   <para>
   </para>
 
   <scons_output example="ex2" os="win32">
-    <scons_output_command>scons -Q</scons_output_command>
+    <scons_output_command suffix="2">scons -Q</scons_output_command>
   </scons_output>
 
   <para>

File doc/user/alias.xml

 
   </para>
 
-  <scons_example name="ex1">
+  <scons_example name="alias_ex1">
      <file name="SConstruct" printme="1">
      env = Environment()
      hello = env.Program('hello.c')
 
   </para>
 
-  <scons_output example="ex1" os="posix">
-     <scons_output_command>scons -Q install</scons_output_command>
+  <scons_output example="alias_ex1" os="posix">
+     <scons_output_command suffix="1">scons -Q install</scons_output_command>
   </scons_output>
 
   <para>
 
   </para>
 
-  <scons_example name="ex2">
+  <scons_example name="alias_ex2">
      <file name="SConstruct" printme="1">
      env = Environment()
      p = env.Program('foo.c')
 
   </para>
 
-  <scons_output example="ex2" os="posix">
-     <scons_output_command>scons -Q install-bin</scons_output_command>
-     <scons_output_command>scons -Q install-lib</scons_output_command>
-     <scons_output_command>scons -Q -c __ROOT__/</scons_output_command>
-     <scons_output_command>scons -Q install</scons_output_command>
+  <scons_output example="alias_ex2" os="posix">
+     <scons_output_command suffix="1">scons -Q install-bin</scons_output_command>
+     <scons_output_command suffix="2">scons -Q install-lib</scons_output_command>
+     <scons_output_command suffix="3">scons -Q -c __ROOT__/</scons_output_command>
+     <scons_output_command suffix="4">scons -Q install</scons_output_command>
   </scons_output>
 
 </chapter>

File doc/user/builders-built-in.xml

 
     </para>
 
-    <scons_example name="libs">
+    <scons_example name="buildersbuiltin_libs">
       <file name="SConstruct" printme="1">
       env = Environment(LIBS = ['foo1', 'foo2'],
                         LIBPATH = ['/usr/dir1', 'dir2'])
 
     </para>
 
-    <scons_output example="libs" os="posix">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="buildersbuiltin_libs" os="posix">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_output example="libs" os="win32">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="buildersbuiltin_libs" os="win32">
+      <scons_output_command suffix="2">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
 
       </para>
 
-      <scons_example name="ex1">
+      <scons_example name="buildersbuiltin_ex1">
         <file name="SConstruct" printme="1">
         env = Environment()
         env.Tar('out1.tar', ['file1', 'file2'])
         </file>
       </scons_example>
 
-      <scons_output example="ex1" os="posix">
-        <scons_output_command>scons -Q .</scons_output_command>
+      <scons_output example="buildersbuiltin_ex1" os="posix">
+        <scons_output_command suffix="1">scons -Q .</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="ex2">
+      <scons_example name="buildersbuiltin_ex2">
         <file name="SConstruct" printme="1">
         env = Environment(TARFLAGS = '-c -z')
         env.Tar('out.tar.gz', 'directory')
         </file>
       </scons_example>
 
-      <scons_output example="ex2" os="posix">
-        <scons_output_command>scons -Q .</scons_output_command>
+      <scons_output example="buildersbuiltin_ex2" os="posix">
+        <scons_output_command suffix="1">scons -Q .</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="ex3">
+      <scons_example name="buildersbuiltin_ex3">
         <file name="SConstruct" printme="1">
         env = Environment(TARFLAGS = '-c -z',
                           TARSUFFIX = '.tgz')
         </file>
       </scons_example>
 
-      <scons_output example="ex3" os="posix">
-        <scons_output_command>scons -Q .</scons_output_command>
+      <scons_output example="buildersbuiltin_ex3" os="posix">
+        <scons_output_command suffix="1">scons -Q .</scons_output_command>
       </scons_output>
 
     </section>
 
       </para>
 
-      <scons_example name="ex4">
+      <scons_example name="buildersbuiltin_ex4">
         <file name="SConstruct" printme="1">
         env = Environment()
         env.Zip('out', ['file1', 'file2'])
 
       </para>
 
-      <scons_output example="ex4" os="posix">
-        <scons_output_command>scons -Q .</scons_output_command>
+      <scons_output example="buildersbuiltin_ex4" os="posix">
+        <scons_output_command suffix="1">scons -Q .</scons_output_command>
       </scons_output>
 
     </section>

File doc/user/builders-commands.xml

 
   </para>
 
-  <scons_example name="ex1">
+  <scons_example name="builderscommands_ex1">
      <file name="SConstruct" printme="1">
      env = Environment()
      env.Command('foo.out', 'foo.in', "sed 's/x/y/' &lt; $SOURCE > $TARGET")
 
   </para>
 
-  <scons_output example="ex1">
-    <scons_output_command>scons -Q</scons_output_command>
+  <scons_output example="builderscommands_ex1">
+    <scons_output_command suffix="1">scons -Q</scons_output_command>
   </scons_output>
 
   <para>
 
   </para>
 
-  <scons_example name="ex2">
+  <scons_example name="builderscommands_ex2">
      <file name="SConstruct" printme="1">
      env = Environment()
      def build(target, source, env):
 
   </para>
 
-  <scons_output example="ex2">
-    <scons_output_command>scons -Q</scons_output_command>
+  <scons_output example="builderscommands_ex2">
+    <scons_output_command suffix="1">scons -Q</scons_output_command>
   </scons_output>
 
   <para>
 
   </para>
 
-  <scons_example name="ex3">
+  <scons_example name="builderscommands_ex3">
      <file name="SConstruct" printme="1">
      env.Command('${SOURCE.basename}.out', 'foo.in', build)
      </file>

File doc/user/builders-writing.xml

 
     </para>
 
-    <scons_example name="ex1">
+    <scons_example name="builderswriting_ex1">
        <file name="SConstruct">
        bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env = Environment(BUILDERS = {'Foo' : bld})
 
     </para>
 
-    <scons_output example="ex1">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="builderswriting_ex1">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
    in the generated error consistent with what the user will see in the
    User's Guide.
    -->
-    <scons_example name="ex2">
+    <scons_example name="builderswriting_ex2">
        <file name="SConstruct">
        import SCons.Defaults; SCons.Defaults.ConstructionEnvironment['TOOLS'] = {}; bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env = Environment(BUILDERS = {'Foo' : bld})
        </file>
     </scons_example>
 
-    <scons_output example="ex2">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="builderswriting_ex2">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_example name="ex3">
+    <scons_example name="builderswriting_ex3">
        <file name="SConstruct">
        env = Environment()
        import os
 
     </para>
 
-    <scons_output example="ex3">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="builderswriting_ex3">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
 
   </section>
 
     </para>
 
-    <scons_example name="ex4">
+    <scons_example name="builderswriting_ex4">
        <file name="SConstruct">
        bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET',
                      suffix = '.foo',
        env.Foo('file2')
     </sconstruct>
 
-    <scons_output example="ex4">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="builderswriting_ex4">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_example name="ex5">
+    <scons_example name="builderswriting_ex5">
        <file name="SConstruct" printme="1">
        def build_function(target, source, env):
            # Code to build "target" from "source"
 
     </para>
 
-    <scons_output example="ex5">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="builderswriting_ex5">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
 
   </section>
 
     </para>
 
-    <scons_example name="ex6">
+    <scons_example name="builderswriting_ex6">
        <file name="SConstruct">
        def generate_actions(source, target, env, for_signature):
            return 'foobuild &lt; %s &gt; %s' % (source[0], target[0])
        env.Foo('file')
     </sconstruct>
 
-    <scons_output example="ex6">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="builderswriting_ex6">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_example name="ex7">
+    <scons_example name="builderswriting_ex7">
        <file name="SConstruct">
        def modify_targets(target, source, env):
            target.append('new_target')
 
     </para>
 
-    <scons_output example="ex7">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="builderswriting_ex7">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_example name="MY_EMITTER">
+    <scons_example name="builderswriting_MY_EMITTER">
 
       <file name="SConstruct" printme="1">
         bld = Builder(action = 'my_command $SOURCES &gt; $TARGET',
 
     </para>
 
-    <scons_output example="MY_EMITTER">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="builderswriting_MY_EMITTER">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
 
   </section>
 
     </para>
 
-    <scons_example name="site1">
+    <scons_example name="builderswriting_site1">
       <file name="site_scons/site_init.py" printme="1">
         def TOOL_ADD_HEADER(env):
            """A Tool to add a header from $HEADER to the source file"""
     </para>
 
     <!-- 
-    <scons_output example="site1" os="posix">
-       <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="builderswriting_site1" os="posix">
+       <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
     -->
 
       functions:
     </para>
       
-    <scons_example name="site2">
+    <scons_example name="builderswriting_site2">
       <file name="site_scons/my_utils.py" printme="1">
         from SCons.Script import *   # for Execute and Mkdir
         def build_id():
 
     </para>
 
-    <scons_example name="ex8">
+    <scons_example name="builderswriting_ex8">
        <file name="SConstruct" printme="1">
        env = Environment()
        #env.SourceCode('.', env.BitKeeper('my_command'))
        </file>
     </scons_example>
 
-    <scons_output example="ex8">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="builderswriting_ex8">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
 
   </section>

File doc/user/caching.xml

 
     </para>
 
-    <scons_example name="ex1">
+    <scons_example name="caching_ex1">
        <file name="SConstruct">
        env = Environment()
        env.Program('hello.c')
 
     </para>
 
-    <scons_output example="ex1">
-      <scons_output_command>scons -Q</scons_output_command>
-      <scons_output_command>scons -Q -c</scons_output_command>
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="caching_ex1">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
+      <scons_output_command suffix="2">scons -Q -c</scons_output_command>
+      <scons_output_command suffix="3">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_output example="ex1">
-      <scons_output_command>scons -Q</scons_output_command>
-      <scons_output_command>scons -Q -c</scons_output_command>
-      <scons_output_command>scons -Q --cache-show</scons_output_command>
+    <scons_output example="caching_ex1">
+      <scons_output_command suffix="4">scons -Q</scons_output_command>
+      <scons_output_command suffix="5">scons -Q -c</scons_output_command>
+      <scons_output_command suffix="6">scons -Q --cache-show</scons_output_command>
     </scons_output>
 
     <para>
 
     <!--
 
-    <scons_output example="ex1">
-      <scons_output_command>scons -Q</scons_output_command>
-      <scons_output_command>scons -Q -c</scons_output_command>
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="caching_ex1">
+      <scons_output_command suffix="7">scons -Q</scons_output_command>
+      <scons_output_command suffix="8">scons -Q -c</scons_output_command>
+      <scons_output_command suffix="9">scons -Q</scons_output_command>
     </scons_output>
 
     -->
 
     </para>
 
-    <scons_output example="ex1">
-      <scons_output_command>scons -Q</scons_output_command>
-      <scons_output_command>scons -Q -c</scons_output_command>
-      <scons_output_command>scons -Q</scons_output_command>
-      <scons_output_command>scons -Q -c</scons_output_command>
-      <scons_output_command>scons -Q --cache-disable</scons_output_command>
+    <scons_output example="caching_ex1">
+      <scons_output_command suffix="10">scons -Q</scons_output_command>
+      <scons_output_command suffix="11">scons -Q -c</scons_output_command>
+      <scons_output_command suffix="12">scons -Q</scons_output_command>
+      <scons_output_command suffix="13">scons -Q -c</scons_output_command>
+      <scons_output_command suffix="14">scons -Q --cache-disable</scons_output_command>
     </scons_output>
 
   </section>
 
     </para>
 
-    <scons_output example="ex1">
-      <scons_output_command>scons -Q --cache-disable</scons_output_command>
-      <scons_output_command>scons -Q -c</scons_output_command>
-      <scons_output_command>scons -Q --cache-disable</scons_output_command>
-      <scons_output_command>scons -Q --cache-force</scons_output_command>
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="caching_ex1">
+      <scons_output_command suffix="15">scons -Q --cache-disable</scons_output_command>
+      <scons_output_command suffix="16">scons -Q -c</scons_output_command>
+      <scons_output_command suffix="17">scons -Q --cache-disable</scons_output_command>
+      <scons_output_command suffix="18">scons -Q --cache-force</scons_output_command>
+      <scons_output_command suffix="19">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_example name="ex-random">
+    <scons_example name="caching_ex-random">
        <file name="SConstruct" printme="1">
        Program('prog',
                ['f1.c', 'f2.c', 'f3.c', 'f4.c', 'f5.c'])
 
     </para>
 
-    <scons_output example="ex-random">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="caching_ex-random">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
 
     The following <screen> output was generated by this:
 
-    <scons_output example="ex-random">
-      <scons_output_command>scons -Q - -random</scons_output_command>
+    <scons_output example="caching_ex-random">
+      <scons_output_command suffix="2">scons -Q - -random</scons_output_command>
     </scons_output>
 
     We captured it directly here to guarantee a "random" order,
 
     </para>
 
-    <scons_example name="ex-random">
+    <scons_example name="caching_ex-random">
        <file name="SConstruct" printme="1">
        SetOption('random', 1)
        Program('prog',

File doc/user/command-line.xml

 
       </para>
 
-      <scons_example name="SCONSFLAGS">
+      <scons_example name="commandline_SCONSFLAGS">
         <file name="SConstruct">
         def b(target, source, env):
             pass
         </file>
       </scons_example>
 
-      <scons_output example="SCONSFLAGS">
-        <scons_output_command>scons</scons_output_command>
-        <scons_output_command>export SCONSFLAGS="-Q"</scons_output_command>
-        <scons_output_command environment="SCONSFLAGS=-Q">scons</scons_output_command>
+      <scons_output example="commandline_SCONSFLAGS">
+        <scons_output_command suffix="1">scons</scons_output_command>
+        <scons_output_command suffix="2">export SCONSFLAGS="-Q"</scons_output_command>
+        <scons_output_command environment="SCONSFLAGS=-Q" suffix="3">scons</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="SetOption">
+      <scons_example name="commandline_SetOption">
         <file name="SConstruct" printme="1">
         import os
         num_cpu = int(os.environ.get('NUM_CPU', 2))
 
       </para>
 
-      <scons_output example="SetOption">
-        <scons_output_command>scons -Q</scons_output_command>
+      <scons_output example="commandline_SetOption">
+        <scons_output_command suffix="1">scons -Q</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_output example="SetOption">
-        <scons_output_command>export NUM_CPU="4"</scons_output_command>
-        <scons_output_command environment="NUM_CPU=4">scons -Q</scons_output_command>
+      <scons_output example="commandline_SetOption">
+        <scons_output_command suffix="2">export NUM_CPU="4"</scons_output_command>
+        <scons_output_command environment="NUM_CPU=4" suffix="3">scons -Q</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_output example="SetOption">
-        <scons_output_command>scons -Q -j 7</scons_output_command>
-        <scons_output_command>export NUM_CPU="4"</scons_output_command>
-        <scons_output_command environment="NUM_CPU=4">scons -Q -j 3</scons_output_command>
+      <scons_output example="commandline_SetOption">
+        <scons_output_command suffix="4">scons -Q -j 7</scons_output_command>
+        <scons_output_command suffix="5">export NUM_CPU="4"</scons_output_command>
+        <scons_output_command environment="NUM_CPU=4" suffix="6">scons -Q -j 3</scons_output_command>
       </scons_output>
 
     </section>
 
       </para>
 
-      <scons_example name="AddOption">
+      <scons_example name="commandline_AddOption">
         <file name="SConstruct" printme="1">
         AddOption('--prefix',
                   dest='prefix',
 
       </para>
 
-      <scons_output example="AddOption">
-        <scons_output_command>scons -Q -n</scons_output_command>
+      <scons_output example="commandline_AddOption">
+        <scons_output_command suffix="1">scons -Q -n</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_output example="AddOption">
-        <scons_output_command>scons -Q -n --prefix=/tmp/install</scons_output_command>
+      <scons_output example="commandline_AddOption">
+        <scons_output_command suffix="2">scons -Q -n --prefix=/tmp/install</scons_output_command>
       </scons_output>
 
     </section>
 
     </para>
 
-    <scons_example name="ARGUMENTS">
+    <scons_example name="commandline_ARGUMENTS">
        <file name="SConstruct" printme="1">
        env = Environment()
        debug = ARGUMENTS.get('debug', 0)
 
     </para>
 
-    <scons_output example="ARGUMENTS">
-       <scons_output_command>scons -Q debug=0</scons_output_command>
-       <scons_output_command>scons -Q debug=0</scons_output_command>
-       <scons_output_command>scons -Q debug=1</scons_output_command>
-       <scons_output_command>scons -Q debug=1</scons_output_command>
+    <scons_output example="commandline_ARGUMENTS">
+       <scons_output_command suffix="1">scons -Q debug=0</scons_output_command>
+       <scons_output_command suffix="2">scons -Q debug=0</scons_output_command>
+       <scons_output_command suffix="3">scons -Q debug=1</scons_output_command>
+       <scons_output_command suffix="4">scons -Q debug=1</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_example name="ARGLIST">
+    <scons_example name="commandline_ARGLIST">
        <file name="SConstruct" printme="1">
        cppdefines = []
        for key, value in ARGLIST:
 
     </para>
 
-    <scons_output example="ARGLIST">
-       <scons_output_command>scons -Q define=FOO</scons_output_command>
-       <scons_output_command>scons -Q define=FOO define=BAR</scons_output_command>
+    <scons_output example="commandline_ARGLIST">
+       <scons_output_command suffix="1">scons -Q define=FOO</scons_output_command>
+       <scons_output_command suffix="2">scons -Q define=FOO define=BAR</scons_output_command>
     </scons_output>
 
     <para>
 
       </para>
 
-      <scons_example name="Variables1">
+      <scons_example name="commandline_Variables1">
         <file name="SConstruct" printme="1">
            vars = Variables(None, ARGUMENTS)
            vars.Add('RELEASE', 'Set to 1 to build for release', 0)
 
       </para>
 
-      <scons_output example="Variables1">
-        <scons_output_command>scons -Q RELEASE=1</scons_output_command>
+      <scons_output example="commandline_Variables1">
+        <scons_output_command suffix="1">scons -Q RELEASE=1</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="Variables_Help">
+      <scons_example name="commandline_Variables_Help">
         <file name="SConstruct" printme="1">
            vars = Variables(None, ARGUMENTS)
            vars.Add('RELEASE', 'Set to 1 to build for release', 0)
 
       </para>
 
-      <scons_output example="Variables_Help">
-        <scons_output_command>scons -Q -h</scons_output_command>
+      <scons_output example="commandline_Variables_Help">
+        <scons_output_command suffix="1">scons -Q -h</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="Variables_custom_py_1">
+      <scons_example name="commandline_Variables_custom_py_1">
         <file name="SConstruct" printme="1">
            vars = Variables('custom.py')
            vars.Add('RELEASE', 'Set to 1 to build for release', 0)
 
       </para>
 
-      <scons_example_file example="Variables_custom_py_1" name="custom.py"></scons_example_file>
+      <scons_example_file example="commandline_Variables_custom_py_1" name="custom.py"></scons_example_file>
 
       <para>
 
 
       </para>
 
-      <scons_output example="Variables_custom_py_1">
-        <scons_output_command>scons -Q</scons_output_command>
+      <scons_output example="commandline_Variables_custom_py_1">
+        <scons_output_command suffix="1">scons -Q</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="Variables_custom_py_2">
+      <scons_example name="commandline_Variables_custom_py_2">
         <file name="SConstruct">
            vars = Variables('custom.py')
            vars.Add('RELEASE', 'Set to 1 to build for release', 0)
 
       </para>
 
-      <scons_output example="Variables_custom_py_2">
-        <scons_output_command>scons -Q</scons_output_command>
+      <scons_output example="commandline_Variables_custom_py_2">
+        <scons_output_command suffix="1">scons -Q</scons_output_command>
       </scons_output>
 
       <para>
 
         </para>
 
-        <scons_example name="BoolVariable">
+        <scons_example name="commandline_BoolVariable">
           <file name="SConstruct" printme="1">
              vars = Variables('custom.py')
              vars.Add(BoolVariable('RELEASE', 'Set to build for release', 0))
 
         </para>
 
-        <scons_output example="BoolVariable">
-          <scons_output_command>scons -Q RELEASE=yes foo.o</scons_output_command>
+        <scons_output example="commandline_BoolVariable">
+          <scons_output_command suffix="1">scons -Q RELEASE=yes foo.o</scons_output_command>
         </scons_output>
 
-        <scons_output example="BoolVariable">
-          <scons_output_command>scons -Q RELEASE=t foo.o</scons_output_command>
+        <scons_output example="commandline_BoolVariable">
+          <scons_output_command suffix="2">scons -Q RELEASE=t foo.o</scons_output_command>
         </scons_output>
 
         <para>
 
         </para>
 
-        <scons_output example="BoolVariable">
-          <scons_output_command>scons -Q RELEASE=no foo.o</scons_output_command>
+        <scons_output example="commandline_BoolVariable">
+          <scons_output_command suffix="3">scons -Q RELEASE=no foo.o</scons_output_command>
         </scons_output>
 
-        <scons_output example="BoolVariable">
-          <scons_output_command>scons -Q RELEASE=f foo.o</scons_output_command>
+        <scons_output example="commandline_BoolVariable">
+          <scons_output_command suffix="4">scons -Q RELEASE=f foo.o</scons_output_command>
         </scons_output>
 
         <para>
 
         </para>
 
-        <scons_output example="BoolVariable">
-          <scons_output_command>scons -Q RELEASE=bad_value foo.o</scons_output_command>
+        <scons_output example="commandline_BoolVariable">
+          <scons_output_command suffix="5">scons -Q RELEASE=bad_value foo.o</scons_output_command>
         </scons_output>
 
       </section>
 
         </para>
 
-        <scons_example name="EnumVariable">
+        <scons_example name="commandline_EnumVariable">
           <file name="SConstruct" printme="1">
              vars = Variables('custom.py')
              vars.Add(EnumVariable('COLOR', 'Set background color', 'red',
 
         </para>
 
-        <scons_output example="EnumVariable">
-          <scons_output_command>scons -Q COLOR=red foo.o</scons_output_command>
-          <scons_output_command>scons -Q COLOR=blue foo.o</scons_output_command>
-          <scons_output_command>scons -Q COLOR=green foo.o</scons_output_command>
+        <scons_output example="commandline_EnumVariable">
+          <scons_output_command suffix="1">scons -Q COLOR=red foo.o</scons_output_command>
+          <scons_output_command suffix="2">scons -Q COLOR=blue foo.o</scons_output_command>
+          <scons_output_command suffix="3">scons -Q COLOR=green foo.o</scons_output_command>
         </scons_output>
 
         <para>
 
         </para>
 
-        <scons_output example="EnumVariable">
-          <scons_output_command>scons -Q COLOR=magenta foo.o</scons_output_command>
+        <scons_output example="commandline_EnumVariable">
+          <scons_output_command suffix="4">scons -Q COLOR=magenta foo.o</scons_output_command>
         </scons_output>
 
         <para>
         </para>
 
         <scons_output example="EnumVariable_map">
-          <scons_output_command>scons -Q COLOR=navy foo.o</scons_output_command>
+          <scons_output_command suffix="1">scons -Q COLOR=navy foo.o</scons_output_command>
         </scons_output>
 
         <para>
 
         </para>
 
-        <scons_output example="EnumVariable">
-          <scons_output_command>scons -Q COLOR=Red foo.o</scons_output_command>
-          <scons_output_command>scons -Q COLOR=BLUE foo.o</scons_output_command>
-          <scons_output_command>scons -Q COLOR=nAvY foo.o</scons_output_command>
+        <scons_output example="commandline_EnumVariable">
+          <scons_output_command suffix="5">scons -Q COLOR=Red foo.o</scons_output_command>
+          <scons_output_command suffix="6">scons -Q COLOR=BLUE foo.o</scons_output_command>
+          <scons_output_command suffix="7">scons -Q COLOR=nAvY foo.o</scons_output_command>
         </scons_output>
 
         <para>
 
         </para>
 
-        <scons_example name="EnumVariable_ic1">
+        <scons_example name="commandline_EnumVariable_ic1">
           <file name="SConstruct" printme="1">
              vars = Variables('custom.py')
              vars.Add(EnumVariable('COLOR', 'Set background color', 'red',
 
         </para>
 
-        <scons_output example="EnumVariable_ic1">
-          <scons_output_command>scons -Q COLOR=Red foo.o</scons_output_command>
-          <scons_output_command>scons -Q COLOR=BLUE foo.o</scons_output_command>
-          <scons_output_command>scons -Q COLOR=nAvY foo.o</scons_output_command>
-          <scons_output_command>scons -Q COLOR=green foo.o</scons_output_command>
+        <scons_output example="commandline_EnumVariable_ic1">
+          <scons_output_command suffix="1">scons -Q COLOR=Red foo.o</scons_output_command>
+          <scons_output_command suffix="2">scons -Q COLOR=BLUE foo.o</scons_output_command>
+          <scons_output_command suffix="3">scons -Q COLOR=nAvY foo.o</scons_output_command>
+          <scons_output_command suffix="4">scons -Q COLOR=green foo.o</scons_output_command>
         </scons_output>
 
         <para>
 
         </para>
 
-        <scons_example name="EnumVariable_ic2">
+        <scons_example name="commandline_EnumVariable_ic2">
           <file name="SConstruct" printme="1">
              vars = Variables('custom.py')
              vars.Add(EnumVariable('COLOR', 'Set background color', 'red',
 
         </para>
 
-        <scons_output example="EnumVariable_ic2">
-          <scons_output_command>scons -Q COLOR=Red foo.o</scons_output_command>
-          <scons_output_command>scons -Q COLOR=nAvY foo.o</scons_output_command>
-          <scons_output_command>scons -Q COLOR=GREEN foo.o</scons_output_command>
+        <scons_output example="commandline_EnumVariable_ic2">
+          <scons_output_command suffix="1">scons -Q COLOR=Red foo.o</scons_output_command>
+          <scons_output_command suffix="2">scons -Q COLOR=nAvY foo.o</scons_output_command>
+          <scons_output_command suffix="3">scons -Q COLOR=GREEN foo.o</scons_output_command>
         </scons_output>
 
       </section>
 
         </para>
 
-        <scons_example name="ListVariable">
+        <scons_example name="commandline_ListVariable">
           <file name="SConstruct" printme="1">
              vars = Variables('custom.py')
              vars.Add(ListVariable('COLORS', 'List of colors', 0,
 
         </para>
 
-        <scons_output example="ListVariable">
-          <scons_output_command>scons -Q COLORS=red,blue foo.o</scons_output_command>
-          <scons_output_command>scons -Q COLORS=blue,green,red foo.o</scons_output_command>
+        <scons_output example="commandline_ListVariable">
+          <scons_output_command suffix="1">scons -Q COLORS=red,blue foo.o</scons_output_command>
+          <scons_output_command suffix="2">scons -Q COLORS=blue,green,red foo.o</scons_output_command>
         </scons_output>
 
         <para>
 
         </para>
 
-        <scons_output example="ListVariable">
-          <scons_output_command>scons -Q COLORS=all foo.o</scons_output_command>
-          <scons_output_command>scons -Q COLORS=none foo.o</scons_output_command>
+        <scons_output example="commandline_ListVariable">
+          <scons_output_command suffix="3">scons -Q COLORS=all foo.o</scons_output_command>
+          <scons_output_command suffix="4">scons -Q COLORS=none foo.o</scons_output_command>
         </scons_output>
 
         <para>
 
         </para>
 
-        <scons_output example="ListVariable">
-          <scons_output_command>scons -Q COLORS=magenta foo.o</scons_output_command>
+        <scons_output example="commandline_ListVariable">
+          <scons_output_command suffix="5">scons -Q COLORS=magenta foo.o</scons_output_command>
         </scons_output>
 
       </section>
 
         </para>
 
-        <scons_example name="PathVariable">
+        <scons_example name="commandline_PathVariable">
           <file name="SConstruct" printme="1">
              vars = Variables('custom.py')
              vars.Add(PathVariable('CONFIG',
 
         </para>
 
-        <scons_output example="PathVariable">
-          <scons_output_command>scons -Q foo.o</scons_output_command>
-          <scons_output_command>scons -Q CONFIG=__ROOT__/usr/local/etc/other_config foo.o</scons_output_command>
+        <scons_output example="commandline_PathVariable">
+          <scons_output_command suffix="1">scons -Q foo.o</scons_output_command>
+          <scons_output_command suffix="2">scons -Q CONFIG=__ROOT__/usr/local/etc/other_config foo.o</scons_output_command>
         </scons_output>
 
         <para>
 
         </para>
 
-        <scons_output example="PathVariable">
-          <scons_output_command>scons -Q CONFIG=__ROOT__/does/not/exist foo.o</scons_output_command>
+        <scons_output example="commandline_PathVariable">
+          <scons_output_command suffix="3">scons -Q CONFIG=__ROOT__/does/not/exist foo.o</scons_output_command>
         </scons_output>
 
         <para>
 
         </para>
 
-        <scons_example name="PathIsFile">
+        <scons_example name="commandline_PathIsFile">
           <file name="SConstruct" printme="1">
              vars = Variables('custom.py')
              vars.Add(PathVariable('CONFIG',
 
         </para>
 
-        <scons_example name="PathIsDir">
+        <scons_example name="commandline_PathIsDir">
           <file name="SConstruct" printme="1">
              vars = Variables('custom.py')
              vars.Add(PathVariable('DBDIR',
 
         </para>
 
-        <scons_example name="PathIsDirCreate">
+        <scons_example name="commandline_PathIsDirCreate">
           <file name="SConstruct" printme="1">
              vars = Variables('custom.py')
              vars.Add(PathVariable('DBDIR',
 
         </para>
 
-        <scons_example name="PathAccept">
+        <scons_example name="commandline_PathAccept">
           <file name="SConstruct" printme="1">
              vars = Variables('custom.py')
              vars.Add(PathVariable('OUTPUT',
 
         </para>
 
-        <scons_example name="PackageVariable">
+        <scons_example name="commandline_PackageVariable">
           <file name="SConstruct" printme="1">
              vars = Variables('custom.py')
              vars.Add(PackageVariable('PACKAGE',
 
         </para>
 
-        <scons_output example="PackageVariable">
-          <scons_output_command>scons -Q foo.o</scons_output_command>
-          <scons_output_command>scons -Q PACKAGE=__ROOT__/usr/local/location foo.o</scons_output_command>
-          <scons_output_command>scons -Q PACKAGE=yes foo.o</scons_output_command>
-          <scons_output_command>scons -Q PACKAGE=no foo.o</scons_output_command>
+        <scons_output example="commandline_PackageVariable">
+          <scons_output_command suffix="1">scons -Q foo.o</scons_output_command>
+          <scons_output_command suffix="2">scons -Q PACKAGE=__ROOT__/usr/local/location foo.o</scons_output_command>
+          <scons_output_command suffix="3">scons -Q PACKAGE=yes foo.o</scons_output_command>
+          <scons_output_command suffix="4">scons -Q PACKAGE=no foo.o</scons_output_command>
         </scons_output>
 
       </section>
 
       </para>
 
-      <scons_example name="AddVariables_1">
+      <scons_example name="commandline_AddVariables_1">
         <file name="SConstruct" printme="1">
           vars = Variables()
           vars.AddVariables(
 
       </para>
 
-      <scons_example name="UnknownVariables">
+      <scons_example name="commandline_UnknownVariables">
         <file name="SConstruct" printme="1">
            vars = Variables(None)
            vars.Add('RELEASE', 'Set to 1 to build for release', 0)
 
       </para>
 
-      <scons_output example="UnknownVariables">
-        <scons_output_command>scons -Q NOT_KNOWN=foo</scons_output_command>
+      <scons_output example="commandline_UnknownVariables">
+        <scons_output_command suffix="1">scons -Q NOT_KNOWN=foo</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="COMMAND_LINE_TARGETS">
+      <scons_example name="commandline_COMMAND_LINE_TARGETS">
         <file name="SConstruct" printme="1">
         if 'bar' in COMMAND_LINE_TARGETS:
             print "Don't forget to copy `bar' to the archive!"
 
       </para>
 
-      <scons_output example="COMMAND_LINE_TARGETS">
-        <scons_output_command>scons -Q</scons_output_command>
-        <scons_output_command>scons -Q bar</scons_output_command>
+      <scons_output example="commandline_COMMAND_LINE_TARGETS">
+        <scons_output_command suffix="1">scons -Q</scons_output_command>
+        <scons_output_command suffix="2">scons -Q bar</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="Default1">
+      <scons_example name="commandline_Default1">
          <file name="SConstruct" printme="1">
          env = Environment()
          hello = env.Program('hello.c')
 
       </para>
 
-      <scons_output example="Default1">
-         <scons_output_command>scons -Q</scons_output_command>
-         <scons_output_command>scons -Q</scons_output_command>
-         <scons_output_command>scons -Q goodbye</scons_output_command>
+      <scons_output example="commandline_Default1">
+         <scons_output_command suffix="1">scons -Q</scons_output_command>
+         <scons_output_command suffix="2">scons -Q</scons_output_command>
+         <scons_output_command suffix="3">scons -Q goodbye</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_output example="Default1">
-         <scons_output_command>scons -Q .</scons_output_command>
+      <scons_output example="commandline_Default1">
+         <scons_output_command suffix="4">scons -Q .</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="Default2">
+      <scons_example name="commandline_Default2">
          <file name="SConstruct" printme="1">
          env = Environment()
          prog1 = env.Program('prog1.c')
 
       </para>
 
-      <scons_output example="Default2">
-         <scons_output_command>scons -Q</scons_output_command>
-         <scons_output_command>scons -Q .</scons_output_command>
+      <scons_output example="commandline_Default2">
+         <scons_output_command suffix="1">scons -Q</scons_output_command>
+         <scons_output_command suffix="2">scons -Q .</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="Default3">
+      <scons_example name="commandline_Default3">
          <file name="SConstruct" printme="1">
          env = Environment()
          env.Program(['prog1/main.c', 'prog1/foo.c'])
 
       </para>
 
-      <scons_output example="Default3">
-         <scons_output_command>scons -Q</scons_output_command>
-         <scons_output_command>scons -Q</scons_output_command>
-         <scons_output_command>scons -Q .</scons_output_command>
+      <scons_output example="commandline_Default3">
+         <scons_output_command suffix="1">scons -Q</scons_output_command>
+         <scons_output_command suffix="2">scons -Q</scons_output_command>
+         <scons_output_command suffix="3">scons -Q .</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="Default4">
+      <scons_example name="commandline_Default4">
          <file name="SConstruct" printme="1">
          env = Environment()
          prog1 = env.Program('prog1.c')
 
       </para>
 
-      <scons_output example="Default4">
-         <scons_output_command>scons -Q</scons_output_command>
-         <scons_output_command>scons -Q .</scons_output_command>
+      <scons_output example="commandline_Default4">
+         <scons_output_command suffix="1">scons -Q</scons_output_command>
+         <scons_output_command suffix="2">scons -Q .</scons_output_command>
       </scons_output>
 
       <section>
 
         </para>
 
-        <scons_example name="DEFAULT_TARGETS_1">
+        <scons_example name="commandline_DEFAULT_TARGETS_1">
            <file name="SConstruct" printme="1">
            prog1 = Program('prog1.c')
            Default(prog1)
 
         </para>
 
-        <scons_output example="DEFAULT_TARGETS_1">
-           <scons_output_command>scons</scons_output_command>
+        <scons_output example="commandline_DEFAULT_TARGETS_1">
+           <scons_output_command suffix="1">scons</scons_output_command>
         </scons_output>
 
         <para>
 
         </para>
 
-        <scons_example name="DEFAULT_TARGETS_2">
+        <scons_example name="commandline_DEFAULT_TARGETS_2">
            <file name="SConstruct" printme="1">
            prog1 = Program('prog1.c')
            Default(prog1)
 
         </para>
 
-        <scons_output example="DEFAULT_TARGETS_2">
-           <scons_output_command>scons</scons_output_command>
+        <scons_output example="commandline_DEFAULT_TARGETS_2">
+           <scons_output_command suffix="1">scons</scons_output_command>
         </scons_output>
 
         <para>
 
       </para>
 
-      <scons_example name="BUILD_TARGETS_1">
+      <scons_example name="commandline_BUILD_TARGETS_1">
         <file name="SConstruct" printme="1">
         prog1 = Program('prog1.c')
         Program('prog2.c')
 
       </para>
 
-      <scons_output example="BUILD_TARGETS_1">
-        <scons_output_command>scons -Q</scons_output_command>
-        <scons_output_command>scons -Q prog2</scons_output_command>
-        <scons_output_command>scons -Q -c .</scons_output_command>
+      <scons_output example="commandline_BUILD_TARGETS_1">
+        <scons_output_command suffix="1">scons -Q</scons_output_command>
+        <scons_output_command suffix="2">scons -Q prog2</scons_output_command>
+        <scons_output_command suffix="3">scons -Q -c .</scons_output_command>
       </scons_output>
 
     </section>

File doc/user/depends.xml

 
   </para>
 
-  <scons_example name="ex1">
+  <scons_example name="depends_ex1">
     <file name="SConstruct">
     Program('hello.c')
     </file>
     </file>
   </scons_example>
 
-  <scons_output example="ex1" os="posix">
-     <scons_output_command>scons -Q</scons_output_command>
-     <scons_output_command>scons -Q</scons_output_command>
+  <scons_output example="depends_ex1" os="posix">
+     <scons_output_command suffix="1">scons -Q</scons_output_command>
+     <scons_output_command suffix="2">scons -Q</scons_output_command>
   </scons_output>
 
   <para>
 
   </para>
 
-  <scons_output example="ex1" os="posix">
-     <scons_output_command>scons -Q hello</scons_output_command>
-     <scons_output_command>scons -Q hello</scons_output_command>
+  <scons_output example="depends_ex1" os="posix">
+     <scons_output_command suffix="3">scons -Q hello</scons_output_command>
+     <scons_output_command suffix="4">scons -Q hello</scons_output_command>
   </scons_output>
 
   <para>
 
       </para>
 
-      <scons_output example="ex1" os="posix">
-         <scons_output_command>scons -Q hello</scons_output_command>
-         <scons_output_command>touch hello.c</scons_output_command>
-         <scons_output_command>scons -Q hello</scons_output_command>
+      <scons_output example="depends_ex1" os="posix">
+         <scons_output_command suffix="5">scons -Q hello</scons_output_command>
+         <scons_output_command suffix="6">touch hello.c</scons_output_command>
+         <scons_output_command suffix="7">scons -Q hello</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_output example="ex1" os="posix">
-         <scons_output_command>scons -Q hello</scons_output_command>
-         <scons_output_command output="    [CHANGE THE CONTENTS OF hello.c]">edit hello.c</scons_output_command>
-         <scons_output_command>scons -Q hello</scons_output_command>
+      <scons_output example="depends_ex1" os="posix">
+         <scons_output_command suffix="8">scons -Q hello</scons_output_command>
+         <scons_output_command output="    [CHANGE THE CONTENTS OF hello.c]" suffix="9">edit hello.c</scons_output_command>
+         <scons_output_command suffix="10">scons -Q hello</scons_output_command>
       </scons_output>
 
       <para>
 
         </para>
 
-        <scons_output example="ex1" os="posix">
-           <scons_output_command>scons -Q hello</scons_output_command>
-           <scons_output_command output="  [CHANGE A COMMENT IN hello.c]" edit="STRIP CCCOM line">edit hello.c</scons_output_command>
-           <scons_output_command>scons -Q hello</scons_output_command>
+        <scons_output example="depends_ex1" os="posix">
+           <scons_output_command suffix="11">scons -Q hello</scons_output_command>
+           <scons_output_command output="  [CHANGE A COMMENT IN hello.c]" edit="STRIP CCCOM line" suffix="12">edit hello.c</scons_output_command>
+           <scons_output_command suffix="13">scons -Q hello</scons_output_command>
         </scons_output>
 
         <para>
 
       </para>
 
-      <scons_example name="newer">
+      <scons_example name="depends_newer">
         <file name="SConstruct" printme="1">
         Object('hello.c')
         Decider('timestamp-newer')
 
       </para>
 
-      <scons_output example="newer" os="posix">
-         <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.o</scons_output_command>
+      <scons_output example="depends_newer" os="posix">
+         <scons_output_command suffix="1">scons -Q hello.o</scons_output_command>
+         <scons_output_command suffix="2">touch hello.c</scons_output_command>
+         <scons_output_command suffix="3">scons -Q hello.o</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="match">
+      <scons_example name="depends_match">
         <file name="SConstruct" printme="1">
         Object('hello.c')
         Decider('timestamp-match')
 
       </para>
 
-      <scons_output example="match" os="posix">
-         <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.o</scons_output_command>
+      <scons_output example="depends_match" os="posix">
+         <scons_output_command suffix="1">scons -Q hello.o</scons_output_command>
+         <scons_output_command suffix="2">touch -t 198901010000 hello.c</scons_output_command>
+         <scons_output_command suffix="3">scons -Q hello.o</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="MD5-timestamp">
+      <scons_example name="depends_MD5-timestamp">
         <file name="SConstruct" printme="1">
         Program('hello.c')
         Decider('MD5-timestamp')
       output seems to get this wrong.
       Just in-line the output for now.
 
-      <scons_output example="MD5-timestamp" os="posix">
-         <scons_output_command>scons -Q hello</scons_output_command>
-         <scons_output_command>touch hello.c</scons_output_command>
-         <scons_output_command>scons -Q hello</scons_output_command>
-       <scons_output_command output="    [CHANGE THE CONTENTS OF hello.c]">edit hello.c</scons_output_command>
-         <scons_output_command>scons -Q hello</scons_output_command>
+      <scons_output example="depends_MD5-timestamp" os="posix">
+         <scons_output_command suffix="1">scons -Q hello</scons_output_command>
+         <scons_output_command suffix="2">touch hello.c</scons_output_command>
+         <scons_output_command suffix="3">scons -Q hello</scons_output_command>
+       <scons_output_command output="    [CHANGE THE CONTENTS OF hello.c]" suffix="4">edit hello.c</scons_output_command>
+         <scons_output_command suffix="5">scons -Q hello</scons_output_command>
       </scons_output>
 
       -->
 
       </para>
 
-      <scons_example name="function">
+      <scons_example name="depends_function">
         <file name="SConstruct" printme="1">
         Program('hello.c')
         def decide_if_changed(dependency, target, prev_ni):
 
       </para>
 
-      <scons_example name="mixing">
+      <scons_example name="depends_mixing">
         <file name="SConstruct" printme="1">
         env1 = Environment(CPPPATH = ['.'])
         env2 = env1.Clone()
 
       </para>
 
-      <scons_output example="mixing" os="posix">
-         <scons_output_command>scons -Q</scons_output_command>
-         <scons_output_command>touch inc.h</scons_output_command>
-         <scons_output_command>scons -Q</scons_output_command>
+      <scons_output example="depends_mixing" os="posix">
+         <scons_output_command suffix="1">scons -Q</scons_output_command>
+         <scons_output_command suffix="2">touch inc.h</scons_output_command>
+         <scons_output_command suffix="3">scons -Q</scons_output_command>
       </scons_output>
 
     </section>
 
     </para>
 
-    <scons_example name="include">
+    <scons_example name="depends_include">
       <file name="SConstruct">
        Program('hello.c', CPPPATH = '.')
       </file>
 
     </para>
 
-    <scons_example_file example="include"  name="hello.h">
+    <scons_example_file example="depends_include"  name="hello.h">
     </scons_example_file>
 
     <para>
 
     </para>
 
-    <scons_example_file example="include"  name="SConstruct">
+    <scons_example_file example="depends_include"  name="SConstruct">
     </scons_example_file>
 
     <para>
 
     </para>
 
-    <scons_output example="include" os="posix">
-       <scons_output_command>scons -Q hello</scons_output_command>
-       <scons_output_command>scons -Q hello</scons_output_command>
-       <scons_output_command output="    [CHANGE THE CONTENTS OF hello.h]">edit hello.h</scons_output_command>
-       <scons_output_command>scons -Q hello</scons_output_command>
+    <scons_output example="depends_include" os="posix">
+       <scons_output_command suffix="1">scons -Q hello</scons_output_command>
+       <scons_output_command suffix="2">scons -Q hello</scons_output_command>
+       <scons_output_command output="    [CHANGE THE CONTENTS OF hello.h]" suffix="3">edit hello.h</scons_output_command>
+       <scons_output_command suffix="4">scons -Q hello</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_example name="ex5">
+    <scons_example name="depends_ex5">
       <file name="SConstruct" printme="1">
        Program('hello.c', CPPPATH = ['include', '/home/project/inc'])
       </file>
 
     </para>
 
-    <scons_output example="ex5" os="posix">
-       <scons_output_command>scons -Q hello</scons_output_command>
+    <scons_output example="depends_ex5" os="posix">
+       <scons_output_command suffix="1">scons -Q hello</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_output example="ex5" os="win32">
-       <scons_output_command>scons -Q hello.exe</scons_output_command>
+    <scons_output example="depends_ex5" os="win32">
+       <scons_output_command suffix="2">scons -Q hello.exe</scons_output_command>
     </scons_output>
 
   </section>
 
     </para>
 
-    <scons_output example="ex1">
-       <scons_output_command>scons -Q --implicit-cache hello</scons_output_command>
-       <scons_output_command>scons -Q hello</scons_output_command>
+    <scons_output example="depends_ex1">
+       <scons_output_command suffix="14">scons -Q --implicit-cache hello</scons_output_command>
+       <scons_output_command suffix="15">scons -Q hello</scons_output_command>
     </scons_output>
 
     <para>
 
       </para>
 
-      <scons_output example="ex1">
-         <scons_output_command>scons -Q --implicit-deps-changed hello</scons_output_command>
-         <scons_output_command>scons -Q hello</scons_output_command>
+      <scons_output example="depends_ex1">
+         <scons_output_command suffix="16">scons -Q --implicit-deps-changed hello</scons_output_command>
+         <scons_output_command suffix="17">scons -Q hello</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_output example="ex1">
-         <scons_output_command>scons -Q --implicit-deps-unchanged hello</scons_output_command>
-         <scons_output_command>scons -Q hello</scons_output_command>
+      <scons_output example="depends_ex1">
+         <scons_output_command suffix="18">scons -Q --implicit-deps-unchanged hello</scons_output_command>
+         <scons_output_command suffix="19">scons -Q hello</scons_output_command>
       </scons_output>
 
       <para>
 
     </para>
 
-    <scons_example name="macroinc">
+    <scons_example name="depends_macroinc">
       <file name="hello.c" printme="1">
       #define FOO_HEADER &lt;foo.h&gt;
       #include FOO_HEADER
       </file>
     </scons_example>
 
-    <scons_output example="macroinc" os="posix">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="depends_macroinc" os="posix">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
       <scons_output_command output="   [CHANGE CONTENTS OF foo.h]"
-      >edit foo.h</scons_output_command>
-      <scons_output_command>scons -Q</scons_output_command>
+      suffix="2">edit foo.h</scons_output_command>
+      <scons_output_command suffix="3">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
     priori specification of the dependency file. The produced hello.d
     file is not found (or used) for unknown reasons. -->
 
-    <scons_example name="parsedep">
+    <scons_example name="depends_parsedep">
       <file name="hello.c">
       #define FOO_HEADER &lt;foo.h&gt;
       #include FOO_HEADER
       </file>
     </scons_example>
 
-    <scons_output example="parsedep" os="posix">
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="depends_parsedep" os="posix">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
       <scons_output_command output="   [CHANGE CONTENTS OF foo.h]"
-      >edit foo.h</scons_output_command>
-      <scons_output_command>scons -Q</scons_output_command>
+      suffix="2">edit foo.h</scons_output_command>
+      <scons_output_command suffix="3">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_example name="parsedeprebuild">
+    <scons_example name="depends_parsedeprebuild">
       <file name="hello.c">
       #define FOO_HEADER &lt;foo.h&gt;
       #include FOO_HEADER
     </scons_example>
 
     <!--
-    <scons_output example="parsedeprebuild" os="posix">
-      <scons_output_command>scons -Q</scons_output_command>
-      <scons_output_command>scons -Q</scons_output_command>
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="depends_parsedeprebuild" os="posix">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
+      <scons_output_command suffix="2">scons -Q</scons_output_command>
+      <scons_output_command suffix="3">scons -Q</scons_output_command>
     </scons_output>
     -->
 
 
     </para>
 
-    <scons_example name="ignore">
+    <scons_example name="depends_ignore">
       <file name="SConstruct" printme="1">
       hello_obj=Object('hello.c')
       hello = Program(hello_obj)
     <!-- XXX mention that you can use lists for target and source? -->
 
     <!--
-    <scons_output example="ignore">
-      <scons_output_command>scons -Q hello</scons_output_command>
-      <scons_output_command>scons -Q hello</scons_output_command>
-      <scons_output_command output="    [CHANGE THE CONTENTS OF hello.h]">edit hello.h</scons_output_command>
-      <scons_output_command>scons -Q hello</scons_output_command>
+    <scons_output example="depends_ignore">
+      <scons_output_command suffix="1">scons -Q hello</scons_output_command>
+      <scons_output_command suffix="2">scons -Q hello</scons_output_command>
+      <scons_output_command output="    [CHANGE THE CONTENTS OF hello.h]" suffix="3">edit hello.h</scons_output_command>
+      <scons_output_command suffix="4">scons -Q hello</scons_output_command>
       XXX THIS EXAMPLE SHOULD BE UP-TO-DATE! XXX
     </scons_output>
     -->
     by default.
     </para>
 
-    <scons_example name="ignore_explicit">
+    <scons_example name="depends_ignore_explicit">
       <file name="SConstruct" printme="1">
       hello_obj=Object('hello.c')
       hello = Program(hello_obj)
       </file>
     </scons_example>
 
-    <scons_output example="ignore_explicit" os="posix">
-      <scons_output_command>scons -Q</scons_output_command>
-      <scons_output_command>scons -Q hello</scons_output_command>
-      <scons_output_command>scons -Q hello</scons_output_command>
+    <scons_output example="depends_ignore_explicit" os="posix">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
+      <scons_output_command suffix="2">scons -Q hello</scons_output_command>
+      <scons_output_command suffix="3">scons -Q hello</scons_output_command>
     </scons_output>
   </section>
 
 
     </para>
 
-    <scons_example name="no-Requires">
+    <scons_example name="depends_no-Requires">
       <file name="SConstruct" printme="1">
       import time
 
 
     </para>
 
-    <scons_output example="no-Requires">
-      <scons_output_command>scons -Q hello</scons_output_command>
-      <scons_output_command>sleep 1</scons_output_command>
-      <scons_output_command>scons -Q hello</scons_output_command>
-      <scons_output_command>sleep 1</scons_output_command>
-      <scons_output_command>scons -Q hello</scons_output_command>
+    <scons_output example="depends_no-Requires">
+      <scons_output_command suffix="1">scons -Q hello</scons_output_command>
+      <scons_output_command suffix="2">sleep 1</scons_output_command>
+      <scons_output_command suffix="3">scons -Q hello</scons_output_command>
+      <scons_output_command suffix="4">sleep 1</scons_output_command>
+      <scons_output_command suffix="5">scons -Q hello</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_example name="Requires">
+    <scons_example name="depends_Requires">
       <file name="SConstruct" printme="1">
       import time
 
 
     </para>
 
-    <scons_output example="Requires">
-      <scons_output_command>scons -Q hello</scons_output_command>
-      <scons_output_command>sleep 1</scons_output_command>
-      <scons_output_command>scons -Q hello</scons_output_command>
-      <scons_output_command>sleep 1</scons_output_command>
-      <scons_output_command output="    [CHANGE THE CONTENTS OF hello.c]">edit hello.c</scons_output_command>
-      <scons_output_command>scons -Q hello</scons_output_command>
-      <scons_output_command>sleep 1</scons_output_command>
-      <scons_output_command>scons -Q hello</scons_output_command>
+    <scons_output example="depends_Requires">
+      <scons_output_command suffix="1">scons -Q hello</scons_output_command>
+      <scons_output_command suffix="2">sleep 1</scons_output_command>
+      <scons_output_command suffix="3">scons -Q hello</scons_output_command>
+      <scons_output_command suffix="4">sleep 1</scons_output_command>
+      <scons_output_command output="    [CHANGE THE CONTENTS OF hello.c]" suffix="5">edit hello.c</scons_output_command>
+      <scons_output_command suffix="6">scons -Q hello</scons_output_command>
+      <scons_output_command suffix="7">sleep 1</scons_output_command>
+      <scons_output_command suffix="8">scons -Q hello</scons_output_command>
     </scons_output>
 
   </section>
 
     </para>
 
-    <scons_example name="AlwaysBuild">
+    <scons_example name="depends_AlwaysBuild">
       <file name="SConstruct" printme="1">
       hello = Program('hello.c')
       AlwaysBuild(hello)
 
     </para>
 
-    <scons_output example="AlwaysBuild">
-      <scons_output_command>scons -Q</scons_output_command>
-      <scons_output_command>scons -Q</scons_output_command>
+    <scons_output example="depends_AlwaysBuild">
+      <scons_output_command suffix="1">scons -Q</scons_output_command>
+      <scons_output_command suffix="2">scons -Q</scons_output_command>
     </scons_output>
 
     <para>
 
     </para>
 
-    <scons_output example="AlwaysBuild">
-      <scons_output_command>scons -Q</scons_output_command>
-      <scons_output_command>scons -Q hello.o</scons_output_command>
+    <scons_output example="depends_AlwaysBuild">
+      <scons_output_command suffix="3">scons -Q</scons_output_command>
+      <scons_output_command suffix="4">scons -Q hello.o</scons_output_command>
     </scons_output>
 
     <!--

File doc/user/environments.xml

 
   </para>
 
-   <scons_example name="ex1">
+   <scons_example name="environments_ex1">
      <file name="SConstruct" printme="1">
      import os
      </file>
 
       </para>
 
-       <scons_example name="ex1">
+       <scons_example name="environments_ex1">
          <file name="SConstruct" printme="1">
          env = Environment(CC = 'gcc',
                            CCFLAGS = '-O2')
 
       </para>
 
-      <scons_output example="ex1">
-         <scons_output_command>scons -Q</scons_output_command>
+      <scons_output example="environments_ex1">
+         <scons_output_command suffix="1">scons -Q</scons_output_command>
       </scons_output>
 
     </section>
 
       </para>
 
-      <scons_example name="ex6">
+      <scons_example name="environments_ex6">
         <file name="SConstruct" printme="1">
          env = Environment()
          print "CC is:", env['CC']
 
       </para>
 
-      <scons_output example="ex6">
-         <scons_output_command>scons -Q</scons_output_command>
+      <scons_output example="environments_ex6">
+         <scons_output_command suffix="1">scons -Q</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_example name="ex6b">
+      <scons_example name="environments_ex6b">
          <file name="SConstruct" printme="1">
          env = Environment(FOO = 'foo', BAR = 'bar')
          dict = env.Dictionary()
 
       </para>
 
-      <scons_output example="ex6b" os="posix">
-         <scons_output_command>scons -Q</scons_output_command>
+      <scons_output example="environments_ex6b" os="posix">
+         <scons_output_command suffix="1">scons -Q</scons_output_command>
       </scons_output>
 
       <para>
 
       </para>
 
-      <scons_output example="ex6b" os="win32">
-         <scons_output_command>scons -Q</scons_output_command>
+      <scons_output example="environments_ex6b" os="win32">
+         <scons_output_command suffix="2">scons -Q</scons_output_command>
       </scons_output>
 
       <para>
       (a null string), and will not cause scons to fail. 
       </para>
 
-       <scons_example name="missing1">
+       <scons_example name="environments_missing1">
          <file name="SConstruct" printme="1">
           env = Environment()
           print "value is:", env.subst( '->$MISSING&lt;-' )
         </file>
       </scons_example>
 
-       <scons_output example="missing1">
-          <scons_output_command>scons -Q</scons_output_command>
+       <scons_output example="environments_missing1">
+          <scons_output_command suffix="1">scons -Q</scons_output_command>
        </scons_output>
 
       <para>
       with no extra arguments.
       </para>
 
-       <scons_example name="missing2">
+       <scons_example name="environments_missing2">
          <file name="SConstruct" printme="1">
           AllowSubstExceptions()
           env = Environment()
         </file>
       </scons_example>
 
-       <scons_output example="missing2">
-          <scons_output_command>scons -Q</scons_output_command>
+       <scons_output example="environments_missing2">
+          <scons_output_command suffix="1">scons -Q</scons_output_command>
        </scons_output>
 
       <para>
       allowed
       </para>
 
-       <scons_example name="missing3">
+       <scons_example name="environments_missing3">
          <file name="SConstruct" printme="1">
           AllowSubstExceptions(IndexError, NameError, ZeroDivisionError)
           env = Environment()
         </file>
       </scons_example>
 
-       <scons_output example="missing3">
-          <scons_output_command>scons -Q</scons_output_command>
+       <scons_output example="environments_missing3">
+          <scons_output_command suffix="1">scons -Q</scons_output_command>
        </scons_output>
       <sconstruct>
       </sconstruct>