summaryrefslogtreecommitdiffstats
path: root/doc/user/mergeflags.xml
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2013-10-06 15:04:19 (GMT)
committerDirk Baechle <dl9obn@darc.de>2013-10-06 15:04:19 (GMT)
commite2d8d87c5911067374d0b3b5be562c4ce2dddcce (patch)
tree2ee5b8a387b880e61a23a7abda1a152fead7af00 /doc/user/mergeflags.xml
parent43f296c7c2a350de0c59a442e566c165420803e3 (diff)
downloadSCons-e2d8d87c5911067374d0b3b5be562c4ce2dddcce.zip
SCons-e2d8d87c5911067374d0b3b5be562c4ce2dddcce.tar.gz
SCons-e2d8d87c5911067374d0b3b5be562c4ce2dddcce.tar.bz2
- left-aligned all code examples in documentation
- accordingly updated the generated files, containing example output
Diffstat (limited to 'doc/user/mergeflags.xml')
-rw-r--r--doc/user/mergeflags.xml32
1 files changed, 16 insertions, 16 deletions
diff --git a/doc/user/mergeflags.xml b/doc/user/mergeflags.xml
index 393cfbc..1143ee9 100644
--- a/doc/user/mergeflags.xml
+++ b/doc/user/mergeflags.xml
@@ -73,11 +73,11 @@
<scons_example name="mergeflags_MergeFlags1">
<file name="SConstruct" printme="1">
- env = Environment()
- env.Append(CCFLAGS = '-option -O3 -O1')
- flags = { 'CCFLAGS' : '-whatever -O3' }
- env.MergeFlags(flags)
- print env['CCFLAGS']
+env = Environment()
+env.Append(CCFLAGS = '-option -O3 -O1')
+flags = { 'CCFLAGS' : '-whatever -O3' }
+env.MergeFlags(flags)
+print env['CCFLAGS']
</file>
</scons_example>
@@ -100,11 +100,11 @@
<scons_example name="mergeflags_MergeFlags2">
<file name="SConstruct" printme="1">
- env = Environment()
- env.Append(CPPPATH = ['/include', '/usr/local/include', '/usr/include'])
- flags = { 'CPPPATH' : ['/usr/opt/include', '/usr/local/include'] }
- env.MergeFlags(flags)
- print env['CPPPATH']
+env = Environment()
+env.Append(CPPPATH = ['/include', '/usr/local/include', '/usr/include'])
+flags = { 'CPPPATH' : ['/usr/opt/include', '/usr/local/include'] }
+env.MergeFlags(flags)
+print env['CPPPATH']
</file>
</scons_example>
@@ -134,12 +134,12 @@
<scons_example name="mergeflags_MergeFlags3">
<file name="SConstruct" printme="1">
- env = Environment()
- env.Append(CCFLAGS = '-option -O3 -O1')
- env.Append(CPPPATH = ['/include', '/usr/local/include', '/usr/include'])
- env.MergeFlags('-whatever -I/usr/opt/include -O3 -I/usr/local/include')
- print env['CCFLAGS']
- print env['CPPPATH']
+env = Environment()
+env.Append(CCFLAGS = '-option -O3 -O1')
+env.Append(CPPPATH = ['/include', '/usr/local/include', '/usr/include'])
+env.MergeFlags('-whatever -I/usr/opt/include -O3 -I/usr/local/include')
+print env['CCFLAGS']
+print env['CPPPATH']
</file>
</scons_example>