summaryrefslogtreecommitdiffstats
path: root/scilab/modules/dynamic_link
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-03-02 09:50:36 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-03-02 09:50:36 +0100
commit1e31cf32e008bb057af4617380fb582730a4faef (patch)
treec7e869fb5e1fd5df7ee6eb81bbe5cff3ceeee73d /scilab/modules/dynamic_link
parent2a364cad7a1ccea3e167839947322b0db51a5b24 (diff)
parent887e53a813b39b25a9649f84f39d90e8e5086029 (diff)
downloadscilab-1e31cf32e008bb057af4617380fb582730a4faef.zip
scilab-1e31cf32e008bb057af4617380fb582730a4faef.tar.gz
Merge remote branch 'refs/remotes/origin/5.2'
Diffstat (limited to 'scilab/modules/dynamic_link')
-rw-r--r--scilab/modules/dynamic_link/Makefile.am3
-rw-r--r--scilab/modules/dynamic_link/Makefile.in4
-rw-r--r--scilab/modules/dynamic_link/help/en_US/G_make.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/addinter.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/c_link.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/call.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/fort.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_build.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_compile.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_for_link.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_gen_Make.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_gen_cleaner.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_gen_gateway.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_gen_loader.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_mex_build.xml1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_verbose.xml2
-rw-r--r--scilab/modules/dynamic_link/help/en_US/link.xml2
17 files changed, 24 insertions, 0 deletions
diff --git a/scilab/modules/dynamic_link/Makefile.am b/scilab/modules/dynamic_link/Makefile.am
index fdb8a88..40afbaa 100644
--- a/scilab/modules/dynamic_link/Makefile.am
+++ b/scilab/modules/dynamic_link/Makefile.am
@@ -75,4 +75,7 @@ src/scripts/install-sh \
75src/scripts/missing \ 75src/scripts/missing \
76src/scripts/scicompile.sh 76src/scripts/scicompile.sh
77 77
78# This is a cache file for the dynamic link (on use)
79CLEANFILES = src/scripts/Makefile.orig
80
78include $(top_srcdir)/Makefile.incl.am 81include $(top_srcdir)/Makefile.incl.am
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index 65ad867..ab8c86a 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -477,6 +477,9 @@ src/scripts/missing \
477src/scripts/scicompile.sh 477src/scripts/scicompile.sh
478 478
479 479
480# This is a cache file for the dynamic link (on use)
481CLEANFILES = src/scripts/Makefile.orig
482
480# Where all the Scilab stuff is installed (macros, help, ...) 483# Where all the Scilab stuff is installed (macros, help, ...)
481mydatadir = $(pkgdatadir)/modules/$(modulename) 484mydatadir = $(pkgdatadir)/modules/$(modulename)
482 485
@@ -978,6 +981,7 @@ install-strip:
978mostlyclean-generic: 981mostlyclean-generic:
979 982
980clean-generic: 983clean-generic:
984 -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
981 985
982distclean-generic: 986distclean-generic:
983 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) 987 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff --git a/scilab/modules/dynamic_link/help/en_US/G_make.xml b/scilab/modules/dynamic_link/help/en_US/G_make.xml
index 1fd02df..0db5a54 100644
--- a/scilab/modules/dynamic_link/help/en_US/G_make.xml
+++ b/scilab/modules/dynamic_link/help/en_US/G_make.xml
@@ -81,6 +81,7 @@ end
81 <member> 81 <member>
82 <link linkend="addinter">addinter</link> 82 <link linkend="addinter">addinter</link>
83 </member> 83 </member>
84 <member><link linkend="api_scilab">api_scilab</link></member>
84 </simplelist> 85 </simplelist>
85 </refsection> 86 </refsection>
86</refentry> 87</refentry>
diff --git a/scilab/modules/dynamic_link/help/en_US/addinter.xml b/scilab/modules/dynamic_link/help/en_US/addinter.xml
index e434ff1..93c31be 100644
--- a/scilab/modules/dynamic_link/help/en_US/addinter.xml
+++ b/scilab/modules/dynamic_link/help/en_US/addinter.xml
@@ -187,6 +187,7 @@ end // if haveacompiler()
187 <member><link linkend="newfun">newfun</link></member> 187 <member><link linkend="newfun">newfun</link></member>
188 188
189 <member><link linkend="clearfun">clearfun</link></member> 189 <member><link linkend="clearfun">clearfun</link></member>
190 <member><link linkend="api_scilab">api_scilab</link></member>
190 </simplelist> 191 </simplelist>
191 </refsection> 192 </refsection>
192 193
diff --git a/scilab/modules/dynamic_link/help/en_US/c_link.xml b/scilab/modules/dynamic_link/help/en_US/c_link.xml
index 938c2a6..b56c5f5 100644
--- a/scilab/modules/dynamic_link/help/en_US/c_link.xml
+++ b/scilab/modules/dynamic_link/help/en_US/c_link.xml
@@ -70,6 +70,7 @@ test=c_link(routine-name,num)</synopsis>
70 <member> 70 <member>
71 <link linkend="fort">fort</link> 71 <link linkend="fort">fort</link>
72 </member> 72 </member>
73 <member><link linkend="api_scilab">api_scilab</link></member>
73 </simplelist> 74 </simplelist>
74 </refsection> 75 </refsection>
75</refentry> 76</refentry>
diff --git a/scilab/modules/dynamic_link/help/en_US/call.xml b/scilab/modules/dynamic_link/help/en_US/call.xml
index b54ab8c..ab59dc1 100644
--- a/scilab/modules/dynamic_link/help/en_US/call.xml
+++ b/scilab/modules/dynamic_link/help/en_US/call.xml
@@ -269,6 +269,7 @@ c=call("foof",a,2,"d",b,3,"d",m,4,"i",n,5,"i","out",[m,n],1,"d");
269 <member><link linkend="intersci">intersci</link></member> 269 <member><link linkend="intersci">intersci</link></member>
270 270
271 <member><link linkend="addinter">addinter</link></member> 271 <member><link linkend="addinter">addinter</link></member>
272 <member><link linkend="api_scilab">api_scilab</link></member>
272 </simplelist> 273 </simplelist>
273 </refsection> 274 </refsection>
274</refentry> 275</refentry>
diff --git a/scilab/modules/dynamic_link/help/en_US/fort.xml b/scilab/modules/dynamic_link/help/en_US/fort.xml
index c68f694..3d4671c 100644
--- a/scilab/modules/dynamic_link/help/en_US/fort.xml
+++ b/scilab/modules/dynamic_link/help/en_US/fort.xml
@@ -252,6 +252,7 @@ c=fort("fooc",a,2,"d",b,3,"d",m,4,"i",n,5,"i","out",[m,n],1,"d");
252 <member><link linkend="intersci">intersci</link></member> 252 <member><link linkend="intersci">intersci</link></member>
253 253
254 <member><link linkend="addinter">addinter</link></member> 254 <member><link linkend="addinter">addinter</link></member>
255 <member><link linkend="api_scilab">api_scilab</link></member>
255 </simplelist> 256 </simplelist>
256 </refsection> 257 </refsection>
257</refentry> 258</refentry>
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 0e77ee5..a3da819 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_build.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_build.xml
@@ -551,6 +551,7 @@ if abs(m-3.)>%eps then pause,end
551 <member><link linkend="ilib_gen_loader">ilib_gen_loader</link></member> 551 <member><link linkend="ilib_gen_loader">ilib_gen_loader</link></member>
552 552
553 <member><link linkend="ilib_for_link">ilib_for_link</link></member> 553 <member><link linkend="ilib_for_link">ilib_for_link</link></member>
554 <member><link linkend="api_scilab">api_scilab</link></member>
554 </simplelist> 555 </simplelist>
555 </refsection> 556 </refsection>
556 557
diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_compile.xml b/scilab/modules/dynamic_link/help/en_US/ilib_compile.xml
index f3c8720..22e2173 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_compile.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_compile.xml
@@ -94,6 +94,7 @@
94 <member> 94 <member>
95 <link linkend="ilib_for_link">ilib_for_link</link> 95 <link linkend="ilib_for_link">ilib_for_link</link>
96 </member> 96 </member>
97 <member><link linkend="api_scilab">api_scilab</link></member>
97 </simplelist> 98 </simplelist>
98 </refsection> 99 </refsection>
99</refentry> 100</refentry>
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 014f87d..8201887 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
@@ -180,6 +180,7 @@ end
180 <member> 180 <member>
181 <link linkend="ilib_for_link">ilib_for_link</link> 181 <link linkend="ilib_for_link">ilib_for_link</link>
182 </member> 182 </member>
183 <member><link linkend="api_scilab">api_scilab</link></member>
183 </simplelist> 184 </simplelist>
184 </refsection> 185 </refsection>
185</refentry> 186</refentry>
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 dc14d65..e2f37a2 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
@@ -135,6 +135,7 @@
135 <member> 135 <member>
136 <link linkend="ilib_for_link">ilib_for_link</link> 136 <link linkend="ilib_for_link">ilib_for_link</link>
137 </member> 137 </member>
138 <member><link linkend="api_scilab">api_scilab</link></member>
138 </simplelist> 139 </simplelist>
139 </refsection> 140 </refsection>
140</refentry> 141</refentry>
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 60f807c..c5c58cb 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
@@ -68,6 +68,7 @@
68 <member> 68 <member>
69 <link linkend="ilib_for_link">ilib_for_link</link> 69 <link linkend="ilib_for_link">ilib_for_link</link>
70 </member> 70 </member>
71 <member><link linkend="api_scilab">api_scilab</link></member>
71 </simplelist> 72 </simplelist>
72 </refsection> 73 </refsection>
73</refentry> 74</refentry>
diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_gen_gateway.xml b/scilab/modules/dynamic_link/help/en_US/ilib_gen_gateway.xml
index 07f0892..9443767 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_gen_gateway.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_gen_gateway.xml
@@ -146,6 +146,7 @@ int sci_func2(char *fname)
146 <member><link linkend="ilib_gen_loader">ilib_gen_loader</link></member> 146 <member><link linkend="ilib_gen_loader">ilib_gen_loader</link></member>
147 147
148 <member><link linkend="ilib_for_link">ilib_for_link</link></member> 148 <member><link linkend="ilib_for_link">ilib_for_link</link></member>
149 <member><link linkend="api_scilab">api_scilab</link></member>
149 </simplelist> 150 </simplelist>
150 </refsection> 151 </refsection>
151</refentry> 152</refentry>
diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_gen_loader.xml b/scilab/modules/dynamic_link/help/en_US/ilib_gen_loader.xml
index 3f04dde..f1515f0 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_gen_loader.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_gen_loader.xml
@@ -75,6 +75,7 @@
75 <member> 75 <member>
76 <link linkend="ilib_for_link">ilib_for_link</link> 76 <link linkend="ilib_for_link">ilib_for_link</link>
77 </member> 77 </member>
78 <member><link linkend="api_scilab">api_scilab</link></member>
78 </simplelist> 79 </simplelist>
79 </refsection> 80 </refsection>
80</refentry> 81</refentry>
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 05c40a3..ff6d4be 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
@@ -114,6 +114,7 @@ mexf16(rand(2,3,2));
114 <member> 114 <member>
115 <link linkend="ilib_for_link">ilib_for_link</link> 115 <link linkend="ilib_for_link">ilib_for_link</link>
116 </member> 116 </member>
117 <member><link linkend="api_scilab">api_scilab</link></member>
117 </simplelist> 118 </simplelist>
118 </refsection> 119 </refsection>
119</refentry> 120</refentry>
diff --git a/scilab/modules/dynamic_link/help/en_US/ilib_verbose.xml b/scilab/modules/dynamic_link/help/en_US/ilib_verbose.xml
index 11ac6a0..ec44fee 100644
--- a/scilab/modules/dynamic_link/help/en_US/ilib_verbose.xml
+++ b/scilab/modules/dynamic_link/help/en_US/ilib_verbose.xml
@@ -131,6 +131,8 @@ end
131 <member><link linkend="ilib_gen_Make">ilib_build</link></member> 131 <member><link linkend="ilib_gen_Make">ilib_build</link></member>
132 132
133 <member><link linkend="ilib_for_link">ilib_for_link</link></member> 133 <member><link linkend="ilib_for_link">ilib_for_link</link></member>
134
135 <member><link linkend="api_scilab">api_scilab</link></member>
134 </simplelist> 136 </simplelist>
135 </refsection> 137 </refsection>
136 138
diff --git a/scilab/modules/dynamic_link/help/en_US/link.xml b/scilab/modules/dynamic_link/help/en_US/link.xml
index e425c48..e3c82d4 100644
--- a/scilab/modules/dynamic_link/help/en_US/link.xml
+++ b/scilab/modules/dynamic_link/help/en_US/link.xml
@@ -172,6 +172,8 @@ exec cleaner.sce;
172 <member><link linkend="ilib_for_link">ilib_for_link</link></member> 172 <member><link linkend="ilib_for_link">ilib_for_link</link></member>
173 173
174 <member><link linkend="ilib_build">ilib_build</link></member> 174 <member><link linkend="ilib_build">ilib_build</link></member>
175
176 <member><link linkend="api_scilab">api_scilab</link></member>
175 </simplelist> 177 </simplelist>
176 </refsection> 178 </refsection>
177</refentry> 179</refentry>