summaryrefslogtreecommitdiffstats
path: root/scilab/modules/polynomials
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
commit4543a005198ee3197c08e553378430c9bc590911 (patch)
treef48aacd7ed42e1a1b0f13d95fa7185fe4b6afde7 /scilab/modules/polynomials
parent7262c7b88b413c8a0b09bb0a627d613cdca3f845 (diff)
parent97de4eee52d09735f550d4c632fba106d0cc1762 (diff)
downloadscilab-4543a005198ee3197c08e553378430c9bc590911.zip
scilab-4543a005198ee3197c08e553378430c9bc590911.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/polynomials')
-rw-r--r--scilab/modules/polynomials/Makefile.in4
-rw-r--r--scilab/modules/polynomials/src/c/polynomials.vcproj4
-rw-r--r--scilab/modules/polynomials/src/fortran/polynomials_f.vfproj4
-rw-r--r--scilab/modules/polynomials/src/fortran/rpoly.f9
4 files changed, 8 insertions, 13 deletions
diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index 3ac967a..78010b7 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -194,6 +194,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
194AWK = @AWK@ 194AWK = @AWK@
195BATIK = @BATIK@ 195BATIK = @BATIK@
196BLAS_LIBS = @BLAS_LIBS@ 196BLAS_LIBS = @BLAS_LIBS@
197BSH = @BSH@
197CC = @CC@ 198CC = @CC@
198CCDEPMODE = @CCDEPMODE@ 199CCDEPMODE = @CCDEPMODE@
199CFLAGS = @CFLAGS@ 200CFLAGS = @CFLAGS@
@@ -267,6 +268,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
267JOGL = @JOGL@ 268JOGL = @JOGL@
268JROSETTA_API = @JROSETTA_API@ 269JROSETTA_API = @JROSETTA_API@
269JROSETTA_ENGINE = @JROSETTA_ENGINE@ 270JROSETTA_ENGINE = @JROSETTA_ENGINE@
271JUNIT = @JUNIT@
270LAPACK_LIBS = @LAPACK_LIBS@ 272LAPACK_LIBS = @LAPACK_LIBS@
271LD = @LD@ 273LD = @LD@
272LDFLAGS = @LDFLAGS@ 274LDFLAGS = @LDFLAGS@
@@ -323,6 +325,7 @@ PVM_ENABLE = @PVM_ENABLE@
323PVM_INCLUDE = @PVM_INCLUDE@ 325PVM_INCLUDE = @PVM_INCLUDE@
324PVM_LIB = @PVM_LIB@ 326PVM_LIB = @PVM_LIB@
325PYTHON = @PYTHON@ 327PYTHON = @PYTHON@
328QDOX = @QDOX@
326RANLIB = @RANLIB@ 329RANLIB = @RANLIB@
327RELOCATABLE = @RELOCATABLE@ 330RELOCATABLE = @RELOCATABLE@
328RT_LIB = @RT_LIB@ 331RT_LIB = @RT_LIB@
@@ -341,6 +344,7 @@ SWIG_JAVA = @SWIG_JAVA@
341SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 344SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
342TCLTK_LIBS = @TCLTK_LIBS@ 345TCLTK_LIBS = @TCLTK_LIBS@
343TCL_INC_PATH = @TCL_INC_PATH@ 346TCL_INC_PATH = @TCL_INC_PATH@
347TESTNG = @TESTNG@
344TK_INC_PATH = @TK_INC_PATH@ 348TK_INC_PATH = @TK_INC_PATH@
345UMFPACK_ENABLE = @UMFPACK_ENABLE@ 349UMFPACK_ENABLE = @UMFPACK_ENABLE@
346UMFPACK_LIB = @UMFPACK_LIB@ 350UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/polynomials/src/c/polynomials.vcproj b/scilab/modules/polynomials/src/c/polynomials.vcproj
index 8bffc14..97b096e 100644
--- a/scilab/modules/polynomials/src/c/polynomials.vcproj
+++ b/scilab/modules/polynomials/src/c/polynomials.vcproj
@@ -43,7 +43,7 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes" 48 AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;POLYNOMIALS_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;POLYNOMIALS_EXPORTS"
@@ -210,7 +210,7 @@
210 /> 210 />
211 <Tool 211 <Tool
212 Name="VCCLCompilerTool" 212 Name="VCCLCompilerTool"
213 AdditionalOptions="/arch:IA32" 213 AdditionalOptions=""
214 InlineFunctionExpansion="1" 214 InlineFunctionExpansion="1"
215 FavorSizeOrSpeed="1" 215 FavorSizeOrSpeed="1"
216 WholeProgramOptimization="false" 216 WholeProgramOptimization="false"
diff --git a/scilab/modules/polynomials/src/fortran/polynomials_f.vfproj b/scilab/modules/polynomials/src/fortran/polynomials_f.vfproj
index d683e61..61b1b89 100644
--- a/scilab/modules/polynomials/src/fortran/polynomials_f.vfproj
+++ b/scilab/modules/polynomials/src/fortran/polynomials_f.vfproj
@@ -5,7 +5,7 @@
5 <Platform Name="x64"/></Platforms> 5 <Platform Name="x64"/></Platforms>
6 <Configurations> 6 <Configurations>
7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
8 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/arch:IA32" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/> 8 <Tool Name="VFFortranCompilerTool" AdditionalOptions="" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\polynomials_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="polynomials_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\polynomials_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib polynomials.lib output_stream.lib linear_algebra.lib"/> 9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\polynomials_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="polynomials_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\polynomials_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib polynomials.lib output_stream.lib linear_algebra.lib"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
@@ -24,7 +24,7 @@ lib /DEF:&quot;$(InputDir)linear_algebra_Import.def&quot; /SUBSYSTEM:WINDOWS /MA
24 <Tool Name="VFPostBuildEventTool"/> 24 <Tool Name="VFPostBuildEventTool"/>
25 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 25 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
26 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 26 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
27 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/arch:IA32" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/> 27 <Tool Name="VFFortranCompilerTool" AdditionalOptions="" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
28 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\polynomials_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="polynomials_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\polynomials_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib polynomials.lib output_stream.lib linear_algebra.lib"/> 28 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\polynomials_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="polynomials_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\polynomials_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib polynomials.lib output_stream.lib linear_algebra.lib"/>
29 <Tool Name="VFResourceCompilerTool"/> 29 <Tool Name="VFResourceCompilerTool"/>
30 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 30 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
diff --git a/scilab/modules/polynomials/src/fortran/rpoly.f b/scilab/modules/polynomials/src/fortran/rpoly.f
index 0598672..f8a53c0 100644
--- a/scilab/modules/polynomials/src/fortran/rpoly.f
+++ b/scilab/modules/polynomials/src/fortran/rpoly.f
@@ -1,12 +1,3 @@
1c Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2c Copyright (C) ????-2008 - INRIA
3c
4c This file must be used under the terms of the CeCILL.
5c This source file is licensed as described in the file COPYING, which
6c you should have received as part of this distribution. The terms
7c are also available at
8c http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
10c 1c
11c From NETLIB : TOMS/493 2c From NETLIB : TOMS/493
12c Based on Jenkins-Traub algorithm : 3c Based on Jenkins-Traub algorithm :