summaryrefslogtreecommitdiffstats
path: root/scilab/modules/dynamic_link
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-12 17:27:01 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-12 17:27:18 +0200
commit987adfbfe4b4a660e482a5b3dabee892345de576 (patch)
tree4707f4a1a00fe74293d99a4dbb362f3ed073fc65 /scilab/modules/dynamic_link
parentaa7562c863b369ba7f9546da2cbc065ec2a50ab2 (diff)
parent0f206042ddf884df9024a406aa119a3f3f541703 (diff)
downloadscilab-987adfbfe4b4a660e482a5b3dabee892345de576.zip
scilab-987adfbfe4b4a660e482a5b3dabee892345de576.tar.gz
Merge commit 'origin/5.2'
Change-Id: I9d768c3f95431ce879e34afc211147f99c6c8ef1
Diffstat (limited to 'scilab/modules/dynamic_link')
-rw-r--r--scilab/modules/dynamic_link/help/en_US/getdynlibext.xml2
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_build.xml5
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_for_link.xml3
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_gen_Make.xml8
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_gen_cleaner.xml6
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_mex_build.xml2
6 files changed, 15 insertions, 11 deletions
diff --git a/scilab/modules/dynamic_link/help/en_US/getdynlibext.xml b/scilab/modules/dynamic_link/help/en_US/getdynlibext.xml
index 9ef830c..d04985c 100644
--- a/scilab/modules/dynamic_link/help/en_US/getdynlibext.xml
+++ b/scilab/modules/dynamic_link/help/en_US/getdynlibext.xml
@@ -25,7 +25,7 @@
25 <refsection> 25 <refsection>
26 <title>Description</title> 26 <title>Description</title>
27 <para>get the extension of dynamic libraries on your operating system.</para> 27 <para>get the extension of dynamic libraries on your operating system.</para>
28 <para>ret=getdynlibext() returns (.so on linux,.sl HP-UX,.dll on Windows, ...).</para> 28 <para>ret=getdynlibext() returns (.so on linux, .dylib on MacOS, .sl HP-UX,.dll on Windows, ...).</para>
29 </refsection> 29 </refsection>
30 <refsection> 30 <refsection>
31 <title>Examples</title> 31 <title>Examples</title>
diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_build.xml b/scilab/modules/dynamic_link/help/en_US/ilib_build.xml
index a3da819..908345d 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_build.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_build.xml
@@ -78,8 +78,9 @@
78 <term>makename</term> 78 <term>makename</term>
79 79
80 <listitem> 80 <listitem>
81 <para>character string. The path of the Makefile file without 81 <para>character string. The path of the Makefile file without extension.</para>
82 extension.</para> 82 <para>This parameter is useless since Scilab 5.0. Default value to use: [].</para>
83 <para>A warning will be displayed in Scilab 5.3 if you use another value that the default.</para>
83 </listitem> 84 </listitem>
84 </varlistentry> 85 </varlistentry>
85 86
diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_for_link.xml b/scilab/modules/dynamic_link/help/en_US/ilib_for_link.xml
index 8201887..f578a4f 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_for_link.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_for_link.xml
@@ -53,6 +53,9 @@
53 <term>makename</term> 53 <term>makename</term>
54 <listitem> 54 <listitem>
55 <para>character string. The pathname of the Makefile file without extension (default value <literal>Makelib</literal>).</para> 55 <para>character string. The pathname of the Makefile file without extension (default value <literal>Makelib</literal>).</para>
56 <para>This parameter is useless since Scilab 5.0.</para>
57 <para>A warning will be displayed in Scilab 5.3 if you use another value that the default.</para>
58
56 </listitem> 59 </listitem>
57 </varlistentry> 60 </varlistentry>
58 <varlistentry> 61 <varlistentry>
diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_gen_Make.xml b/scilab/modules/dynamic_link/help/en_US/ilib_gen_Make.xml
index e2f37a2..4fc089a 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_gen_Make.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_gen_Make.xml
@@ -47,6 +47,8 @@
47 <term>makename</term> 47 <term>makename</term>
48 <listitem> 48 <listitem>
49 <para>character string. The path of the Makefile file.</para> 49 <para>character string. The path of the Makefile file.</para>
50 <para>This parameter is useless since Scilab 5.0.</para>
51 <para>A warning will be displayed in Scilab 5.3 if you use another value that the default.</para>
50 </listitem> 52 </listitem>
51 </varlistentry> 53 </varlistentry>
52 <varlistentry> 54 <varlistentry>
@@ -83,12 +85,6 @@
83 <para>a string. The name of the C compiler. Default value is the C compiler detected on the host.</para> 85 <para>a string. The name of the C compiler. Default value is the C compiler detected on the host.</para>
84 </listitem> 86 </listitem>
85 </varlistentry> 87 </varlistentry>
86 <varlistentry>
87 <term>Makename</term>
88 <listitem>
89 <para>character string. The path of the really generated Makefile file.</para>
90 </listitem>
91 </varlistentry>
92 </variablelist> 88 </variablelist>
93 </refsection> 89 </refsection>
94 <refsection> 90 <refsection>
diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_gen_cleaner.xml b/scilab/modules/dynamic_link/help/en_US/ilib_gen_cleaner.xml
index c5c58cb..171e260 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_gen_cleaner.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_gen_cleaner.xml
@@ -30,6 +30,8 @@
30 <term>makename</term> 30 <term>makename</term>
31 <listitem> 31 <listitem>
32 <para>character string. The pathname of the Makefile file without extension (default value <literal>Makelib</literal>).</para> 32 <para>character string. The pathname of the Makefile file without extension (default value <literal>Makelib</literal>).</para>
33 <para>This parameter is useless since Scilab 5.0.</para>
34 <para>A warning will be displayed in Scilab 5.3 if you use another value that the default.</para>
33 </listitem> 35 </listitem>
34 </varlistentry> 36 </varlistentry>
35 37
@@ -52,9 +54,9 @@
52 </refsection> 54 </refsection>
53 <refsection> 55 <refsection>
54 <title>Description</title> 56 <title>Description</title>
55 <para> 57 <para>This is internal function used by <literal>ilib_build and ilib_for_link</literal>
56 Utility function used by <literal>ilib_build and ilib_for_link</literal>
57 This function generates a cleaner file.</para> 58 This function generates a cleaner file.</para>
59 <para><emphasis role="bold">Only use this function is you know what you are doing (it is a semi-private function).</emphasis></para>
58 </refsection> 60 </refsection>
59 <refsection> 61 <refsection>
60 <title>See Also</title> 62 <title>See Also</title>
diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_mex_build.xml b/scilab/modules/dynamic_link/help/en_US/ilib_mex_build.xml
index ff6d4be..b623a97 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_mex_build.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_mex_build.xml
@@ -53,6 +53,8 @@
53 <term>makename</term> 53 <term>makename</term>
54 <listitem> 54 <listitem>
55 <para>character string. The path of the Makefile file without extension.</para> 55 <para>character string. The path of the Makefile file without extension.</para>
56 <para>This parameter is useless since Scilab 5.0. Default value to use: [].</para>
57 <para>A warning will be displayed in Scilab 5.3 if you use another value that the default.</para>
56 </listitem> 58 </listitem>
57 </varlistentry> 59 </varlistentry>
58 <varlistentry> 60 <varlistentry>