Merge branch 'feature/upstrem' into develop

1 files changed, 45 insertions, 42 deletions

diff --git a/scons.1 b/scons.1
index 4e75215..255f056 100644
--- a/scons.1
+++ b/scons.1
@@ -3,11 +3,11 @@
 .\"    Author: Steven Knight
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
 .\"      Date: <pubdate>2004 - 2019</pubdate>
-.\"    Manual: SCons 3.1.0
-.\"    Source: SCons 3.1.0 version 3.1.0
+.\"    Manual: SCons 3.1.1
+.\"    Source: SCons 3.1.1 version 3.1.1
 .\"  Language: English
 .\"
-.TH "SCONS" "1" "<pubdate>2004 - 2019</pubdate>" "SCons 3\&.1\&.0 version 3.1.0" "SCons 3\&.1\&.0"
+.TH "SCONS" "1" "<pubdate>2004 - 2019</pubdate>" "SCons 3\&.1\&.1 version 3.1.1" "SCons 3\&.1\&.1"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -3294,11 +3294,6 @@ Uses:
 \fB$ASPPCOMSTR\fR\&.
 .RE
 .PP
-packaging
-.RS 4
-A framework for building binary and source packages\&.
-.RE
-.PP
 Packaging
 .RS 4
 Sets construction variables for the
@@ -3306,6 +3301,11 @@ Sets construction variables for the
 Builder\&.
 .RE
 .PP
+packaging
+.RS 4
+A framework for building binary and source packages\&.
+.RE
+.PP
 pdf
 .RS 4
 Sets construction variables for the Portable Document Format builder\&.
@@ -8895,30 +8895,33 @@ Flag values are translated accordig to the prefix found, and added to the follow
 .RS 4
 .\}
 .nf
-\-arch               CCFLAGS, LINKFLAGS
-\-D                  CPPDEFINES
-\-framework          FRAMEWORKS
-\-frameworkdir=      FRAMEWORKPATH
-\-include            CCFLAGS
-\-isysroot           CCFLAGS, LINKFLAGS
-\-isystem            CCFLAGS
-\-iquote             CCFLAGS
-\-idirafter          CCFLAGS
-\-I                  CPPPATH
-\-l                  LIBS
-\-L                  LIBPATH
-\-mno\-cygwin         CCFLAGS, LINKFLAGS
-\-mwindows           LINKFLAGS
-\-pthread            CCFLAGS, LINKFLAGS
-\-std=               CFLAGS
-\-Wa,                ASFLAGS, CCFLAGS
-\-Wl,\-rpath=         RPATH
-\-Wl,\-R,             RPATH
-\-Wl,\-R              RPATH
-\-Wl,                LINKFLAGS
-\-Wp,                CPPFLAGS
-\-                   CCFLAGS
-+                   CCFLAGS, LINKFLAGS
+\-arch                   CCFLAGS, LINKFLAGS
+\-D                      CPPDEFINES
+\-framework              FRAMEWORKS
+\-frameworkdir=          FRAMEWORKPATH
+\-fmerge\-all\-constants   CCFLAGS, LINKFLAGS
+\-fopenmp                CCFLAGS, LINKFLAGS
+\-include                CCFLAGS
+\-isysroot               CCFLAGS, LINKFLAGS
+\-isystem                CCFLAGS
+\-iquote                 CCFLAGS
+\-idirafter              CCFLAGS
+\-I                      CPPPATH
+\-l                      LIBS
+\-L                      LIBPATH
+\-mno\-cygwin             CCFLAGS, LINKFLAGS
+\-mwindows               LINKFLAGS
+\-openmp                 CCFLAGS, LINKFLAGS
+\-pthread                CCFLAGS, LINKFLAGS
+\-std=                   CFLAGS
+\-Wa,                    ASFLAGS, CCFLAGS
+\-Wl,\-rpath=             RPATH
+\-Wl,\-R,                 RPATH
+\-Wl,\-R                  RPATH
+\-Wl,                    LINKFLAGS
+\-Wp,                    CPPFLAGS
+\-                       CCFLAGS
++                       CCFLAGS, LINKFLAGS
 .fi
 .if n \{\
 .RE
@@ -15637,6 +15640,16 @@ versions should exist as alpha\-numeric, decimal\-delimited values as defined by
 values include \*(Aq1\*(Aq, \*(Aq1\&.2\&.3\*(Aq, and \*(Aq1\&.2\&.gitaa412c8b\*(Aq\&.
 .RE
 .PP
+SHLIBVERSIONFLAGS
+.RS 4
+Extra flags added to
+\fB$SHLINKCOM\fR
+when building versioned
+\fBSharedLibrary\fR\&. These flags are only used when
+\fB$SHLIBVERSION\fR
+is set\&.
+.RE
+.PP
 _SHLIBVERSIONFLAGS
 .RS 4
 This macro automatically introduces extra flags to
@@ -15653,16 +15666,6 @@ and some extra dynamically generated options (such as
 \-Wl,\-soname=$_SHLIBSONAME\&. It is unused by "plain" (unversioned) shared libraries\&.
 .RE
 .PP
-SHLIBVERSIONFLAGS
-.RS 4
-Extra flags added to
-\fB$SHLINKCOM\fR
-when building versioned
-\fBSharedLibrary\fR\&. These flags are only used when
-\fB$SHLIBVERSION\fR
-is set\&.
-.RE
-.PP
 SHLINK
 .RS 4
 The linker for programs that use shared libraries\&.