summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/Makefile.in3
-rw-r--r--scilab/modules/action_binding/Makefile.in3
-rw-r--r--scilab/modules/api_scilab/Makefile.in3
-rw-r--r--scilab/modules/arnoldi/Makefile.in3
-rw-r--r--scilab/modules/atoms/Makefile.in3
-rw-r--r--scilab/modules/boolean/Makefile.in3
-rw-r--r--scilab/modules/cacsd/Makefile.in3
-rw-r--r--scilab/modules/call_scilab/Makefile.in3
-rw-r--r--scilab/modules/commons/Makefile.in3
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in3
-rw-r--r--scilab/modules/completion/Makefile.in3
-rw-r--r--scilab/modules/console/Makefile.in3
-rw-r--r--scilab/modules/core/Makefile.in3
-rw-r--r--scilab/modules/data_structures/Makefile.in3
-rw-r--r--scilab/modules/demo_tools/Makefile.in3
-rw-r--r--scilab/modules/development_tools/Makefile.in3
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in3
-rw-r--r--scilab/modules/differential_equations/Makefile.in3
-rw-r--r--scilab/modules/double/Makefile.in3
-rw-r--r--scilab/modules/dynamic_link/Makefile.in3
-rw-r--r--scilab/modules/elementary_functions/Makefile.in3
-rw-r--r--scilab/modules/fftw/Makefile.in3
-rw-r--r--scilab/modules/fileio/Makefile.in3
-rw-r--r--scilab/modules/functions/Makefile.in3
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in3
-rw-r--r--scilab/modules/graph/Makefile.in3
-rw-r--r--scilab/modules/graphic_export/Makefile.in3
-rw-r--r--scilab/modules/graphics/Makefile.in3
-rw-r--r--scilab/modules/gui/Makefile.in3
-rw-r--r--scilab/modules/hdf5/Makefile.in3
-rw-r--r--scilab/modules/helptools/Makefile.in3
-rw-r--r--scilab/modules/history_browser/Makefile.in3
-rw-r--r--scilab/modules/history_manager/Makefile.in3
-rw-r--r--scilab/modules/integer/Makefile.in3
-rw-r--r--scilab/modules/interpolation/Makefile.in3
-rw-r--r--scilab/modules/intersci/Makefile.in3
-rw-r--r--scilab/modules/io/Makefile.in3
-rw-r--r--scilab/modules/javasci/Makefile.in3
-rw-r--r--scilab/modules/jvm/Makefile.in3
-rw-r--r--scilab/modules/linear_algebra/Makefile.in3
-rw-r--r--scilab/modules/localization/Makefile.in3
-rw-r--r--scilab/modules/m2sci/Makefile.in3
-rw-r--r--scilab/modules/maple2scilab/Makefile.in3
-rw-r--r--scilab/modules/matio/Makefile.in3
-rw-r--r--scilab/modules/mexlib/Makefile.in3
-rw-r--r--scilab/modules/modules_manager/Makefile.in3
-rw-r--r--scilab/modules/optimization/Makefile.in3
-rw-r--r--scilab/modules/output_stream/Makefile.in3
-rw-r--r--scilab/modules/overloading/Makefile.in3
-rw-r--r--scilab/modules/parallel/Makefile.in3
-rw-r--r--scilab/modules/parameters/Makefile.in3
-rw-r--r--scilab/modules/polynomials/Makefile.in3
-rw-r--r--scilab/modules/pvm/Makefile.in3
-rw-r--r--scilab/modules/randlib/Makefile.in3
-rw-r--r--scilab/modules/renderer/Makefile.in3
-rw-r--r--scilab/modules/scicos/Makefile.in3
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in3
-rw-r--r--scilab/modules/scinotes/Makefile.in3
-rw-r--r--scilab/modules/shell/Makefile.in3
-rw-r--r--scilab/modules/signal_processing/Makefile.in3
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in3
-rw-r--r--scilab/modules/sound/Makefile.in3
-rw-r--r--scilab/modules/sparse/Makefile.in3
-rw-r--r--scilab/modules/special_functions/Makefile.in3
-rw-r--r--scilab/modules/spreadsheet/Makefile.in3
-rw-r--r--scilab/modules/statistics/Makefile.in3
-rw-r--r--scilab/modules/string/Makefile.in3
-rw-r--r--scilab/modules/symbolic/Makefile.in3
-rw-r--r--scilab/modules/tclsci/Makefile.in3
-rw-r--r--scilab/modules/texmacs/Makefile.in3
-rw-r--r--scilab/modules/time/Makefile.in3
-rw-r--r--scilab/modules/types/Makefile.in3
-rw-r--r--scilab/modules/ui_data/Makefile.in3
-rw-r--r--scilab/modules/umfpack/Makefile.in3
-rw-r--r--scilab/modules/windows_tools/Makefile.in3
-rw-r--r--scilab/modules/xcos/Makefile.in3
-rw-r--r--scilab/modules/xcos/build.xml5
-rw-r--r--scilab/modules/xcos/etc/SimulinkImportConfiguration.xsd114
-rw-r--r--scilab/modules/xcos/etc/simulinkImportBlocks.xml576
-rw-r--r--scilab/modules/xcos/etc/simulinkImportGeneralParameters.xml14
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java1
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/ProdPortLabelingListener.java10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/AbstractElement.java20
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/AnnotationElement.java42
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/BlockElement.java175
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/BlockGraphicElement.java210
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/BlockModelElement.java123
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/BlockSpecificElement.java37
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/DiagramElement.java186
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/DiagramParametersElement.java40
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/ImportAction.java113
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/ImportMdl.java55
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/InputPortElement.java80
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/LineElement.java184
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/MatrixElement.java136
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/OutputPortElement.java86
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/PatternElement.java755
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/SimulinkFormatException.java17
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/SimulinkParametrizedElement.java17
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Block.java312
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/BlockPalette.java67
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/GeneralParameters.java159
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrParameters.java151
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrValueMap.java86
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerParameters.java151
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerValueMap.java86
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/ObjectFactory.java157
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/RealParameters.java151
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/RealValueMap.java85
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/SimpleParameter.java112
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntParameters.java151
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntValueMap.java86
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringParameters.java151
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringValueMap.java85
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java1
116 files changed, 5217 insertions, 4 deletions
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 596a3ae..c1e3b59 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -211,6 +211,7 @@ BLAS_LIBS = @BLAS_LIBS@
211BSH = @BSH@ 211BSH = @BSH@
212CC = @CC@ 212CC = @CC@
213CCDEPMODE = @CCDEPMODE@ 213CCDEPMODE = @CCDEPMODE@
214CCSM = @CCSM@
214CFLAGS = @CFLAGS@ 215CFLAGS = @CFLAGS@
215CHECKSTYLE = @CHECKSTYLE@ 216CHECKSTYLE = @CHECKSTYLE@
216COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 217COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -269,6 +270,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
269JAVADOC = @JAVADOC@ 270JAVADOC = @JAVADOC@
270JAVAH = @JAVAH@ 271JAVAH = @JAVAH@
271JAVASCI_ENABLE = @JAVASCI_ENABLE@ 272JAVASCI_ENABLE = @JAVASCI_ENABLE@
273JAVA_CUP = @JAVA_CUP@
272JAVA_ENABLE = @JAVA_ENABLE@ 274JAVA_ENABLE = @JAVA_ENABLE@
273JAVA_G = @JAVA_G@ 275JAVA_G = @JAVA_G@
274JAVA_HOME = @JAVA_HOME@ 276JAVA_HOME = @JAVA_HOME@
@@ -361,6 +363,7 @@ SED = @SED@
361SET_MAKE = @SET_MAKE@ 363SET_MAKE = @SET_MAKE@
362SET_RELOCATABLE = @SET_RELOCATABLE@ 364SET_RELOCATABLE = @SET_RELOCATABLE@
363SHELL = @SHELL@ 365SHELL = @SHELL@
366SIMULINK = @SIMULINK@
364SKINLF = @SKINLF@ 367SKINLF = @SKINLF@
365SPLINT = @SPLINT@ 368SPLINT = @SPLINT@
366STRIP = @STRIP@ 369STRIP = @STRIP@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 0acbb40..a3003eb 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -197,6 +197,7 @@ BLAS_LIBS = @BLAS_LIBS@
197BSH = @BSH@ 197BSH = @BSH@
198CC = @CC@ 198CC = @CC@
199CCDEPMODE = @CCDEPMODE@ 199CCDEPMODE = @CCDEPMODE@
200CCSM = @CCSM@
200CFLAGS = @CFLAGS@ 201CFLAGS = @CFLAGS@
201CHECKSTYLE = @CHECKSTYLE@ 202CHECKSTYLE = @CHECKSTYLE@
202COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 203COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -255,6 +256,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
255JAVADOC = @JAVADOC@ 256JAVADOC = @JAVADOC@
256JAVAH = @JAVAH@ 257JAVAH = @JAVAH@
257JAVASCI_ENABLE = @JAVASCI_ENABLE@ 258JAVASCI_ENABLE = @JAVASCI_ENABLE@
259JAVA_CUP = @JAVA_CUP@
258JAVA_ENABLE = @JAVA_ENABLE@ 260JAVA_ENABLE = @JAVA_ENABLE@
259JAVA_G = @JAVA_G@ 261JAVA_G = @JAVA_G@
260JAVA_HOME = @JAVA_HOME@ 262JAVA_HOME = @JAVA_HOME@
@@ -347,6 +349,7 @@ SED = @SED@
347SET_MAKE = @SET_MAKE@ 349SET_MAKE = @SET_MAKE@
348SET_RELOCATABLE = @SET_RELOCATABLE@ 350SET_RELOCATABLE = @SET_RELOCATABLE@
349SHELL = @SHELL@ 351SHELL = @SHELL@
352SIMULINK = @SIMULINK@
350SKINLF = @SKINLF@ 353SKINLF = @SKINLF@
351SPLINT = @SPLINT@ 354SPLINT = @SPLINT@
352STRIP = @STRIP@ 355STRIP = @STRIP@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index b4a6ff1..b9b7320 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -165,6 +165,7 @@ BLAS_LIBS = @BLAS_LIBS@
165BSH = @BSH@ 165BSH = @BSH@
166CC = @CC@ 166CC = @CC@
167CCDEPMODE = @CCDEPMODE@ 167CCDEPMODE = @CCDEPMODE@
168CCSM = @CCSM@
168CFLAGS = @CFLAGS@ 169CFLAGS = @CFLAGS@
169CHECKSTYLE = @CHECKSTYLE@ 170CHECKSTYLE = @CHECKSTYLE@
170COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 171COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -223,6 +224,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
223JAVADOC = @JAVADOC@ 224JAVADOC = @JAVADOC@
224JAVAH = @JAVAH@ 225JAVAH = @JAVAH@
225JAVASCI_ENABLE = @JAVASCI_ENABLE@ 226JAVASCI_ENABLE = @JAVASCI_ENABLE@
227JAVA_CUP = @JAVA_CUP@
226JAVA_ENABLE = @JAVA_ENABLE@ 228JAVA_ENABLE = @JAVA_ENABLE@
227JAVA_G = @JAVA_G@ 229JAVA_G = @JAVA_G@
228JAVA_HOME = @JAVA_HOME@ 230JAVA_HOME = @JAVA_HOME@
@@ -315,6 +317,7 @@ SED = @SED@
315SET_MAKE = @SET_MAKE@ 317SET_MAKE = @SET_MAKE@
316SET_RELOCATABLE = @SET_RELOCATABLE@ 318SET_RELOCATABLE = @SET_RELOCATABLE@
317SHELL = @SHELL@ 319SHELL = @SHELL@
320SIMULINK = @SIMULINK@
318SKINLF = @SKINLF@ 321SKINLF = @SKINLF@
319SPLINT = @SPLINT@ 322SPLINT = @SPLINT@
320STRIP = @STRIP@ 323STRIP = @STRIP@
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 94b2b72..3e6a953 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -187,6 +187,7 @@ BLAS_LIBS = @BLAS_LIBS@
187BSH = @BSH@ 187BSH = @BSH@
188CC = @CC@ 188CC = @CC@
189CCDEPMODE = @CCDEPMODE@ 189CCDEPMODE = @CCDEPMODE@
190CCSM = @CCSM@
190CFLAGS = @CFLAGS@ 191CFLAGS = @CFLAGS@
191CHECKSTYLE = @CHECKSTYLE@ 192CHECKSTYLE = @CHECKSTYLE@
192COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 193COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -245,6 +246,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
245JAVADOC = @JAVADOC@ 246JAVADOC = @JAVADOC@
246JAVAH = @JAVAH@ 247JAVAH = @JAVAH@
247JAVASCI_ENABLE = @JAVASCI_ENABLE@ 248JAVASCI_ENABLE = @JAVASCI_ENABLE@
249JAVA_CUP = @JAVA_CUP@
248JAVA_ENABLE = @JAVA_ENABLE@ 250JAVA_ENABLE = @JAVA_ENABLE@
249JAVA_G = @JAVA_G@ 251JAVA_G = @JAVA_G@
250JAVA_HOME = @JAVA_HOME@ 252JAVA_HOME = @JAVA_HOME@
@@ -337,6 +339,7 @@ SED = @SED@
337SET_MAKE = @SET_MAKE@ 339SET_MAKE = @SET_MAKE@
338SET_RELOCATABLE = @SET_RELOCATABLE@ 340SET_RELOCATABLE = @SET_RELOCATABLE@
339SHELL = @SHELL@ 341SHELL = @SHELL@
342SIMULINK = @SIMULINK@
340SKINLF = @SKINLF@ 343SKINLF = @SKINLF@
341SPLINT = @SPLINT@ 344SPLINT = @SPLINT@
342STRIP = @STRIP@ 345STRIP = @STRIP@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 800da92..75c6e8a13 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -130,6 +130,7 @@ BLAS_LIBS = @BLAS_LIBS@
130BSH = @BSH@ 130BSH = @BSH@
131CC = @CC@ 131CC = @CC@
132CCDEPMODE = @CCDEPMODE@ 132CCDEPMODE = @CCDEPMODE@
133CCSM = @CCSM@
133CFLAGS = @CFLAGS@ 134CFLAGS = @CFLAGS@
134CHECKSTYLE = @CHECKSTYLE@ 135CHECKSTYLE = @CHECKSTYLE@
135COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 136COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -188,6 +189,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
188JAVADOC = @JAVADOC@ 189JAVADOC = @JAVADOC@
189JAVAH = @JAVAH@ 190JAVAH = @JAVAH@
190JAVASCI_ENABLE = @JAVASCI_ENABLE@ 191JAVASCI_ENABLE = @JAVASCI_ENABLE@
192JAVA_CUP = @JAVA_CUP@
191JAVA_ENABLE = @JAVA_ENABLE@ 193JAVA_ENABLE = @JAVA_ENABLE@
192JAVA_G = @JAVA_G@ 194JAVA_G = @JAVA_G@
193JAVA_HOME = @JAVA_HOME@ 195JAVA_HOME = @JAVA_HOME@
@@ -280,6 +282,7 @@ SED = @SED@
280SET_MAKE = @SET_MAKE@ 282SET_MAKE = @SET_MAKE@
281SET_RELOCATABLE = @SET_RELOCATABLE@ 283SET_RELOCATABLE = @SET_RELOCATABLE@
282SHELL = @SHELL@ 284SHELL = @SHELL@
285SIMULINK = @SIMULINK@
283SKINLF = @SKINLF@ 286SKINLF = @SKINLF@
284SPLINT = @SPLINT@ 287SPLINT = @SPLINT@
285STRIP = @STRIP@ 288STRIP = @STRIP@
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 4b2cb99..9717384 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -167,6 +167,7 @@ BLAS_LIBS = @BLAS_LIBS@
167BSH = @BSH@ 167BSH = @BSH@
168CC = @CC@ 168CC = @CC@
169CCDEPMODE = @CCDEPMODE@ 169CCDEPMODE = @CCDEPMODE@
170CCSM = @CCSM@
170CFLAGS = @CFLAGS@ 171CFLAGS = @CFLAGS@
171CHECKSTYLE = @CHECKSTYLE@ 172CHECKSTYLE = @CHECKSTYLE@
172COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 173COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -225,6 +226,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
225JAVADOC = @JAVADOC@ 226JAVADOC = @JAVADOC@
226JAVAH = @JAVAH@ 227JAVAH = @JAVAH@
227JAVASCI_ENABLE = @JAVASCI_ENABLE@ 228JAVASCI_ENABLE = @JAVASCI_ENABLE@
229JAVA_CUP = @JAVA_CUP@
228JAVA_ENABLE = @JAVA_ENABLE@ 230JAVA_ENABLE = @JAVA_ENABLE@
229JAVA_G = @JAVA_G@ 231JAVA_G = @JAVA_G@
230JAVA_HOME = @JAVA_HOME@ 232JAVA_HOME = @JAVA_HOME@
@@ -317,6 +319,7 @@ SED = @SED@
317SET_MAKE = @SET_MAKE@ 319SET_MAKE = @SET_MAKE@
318SET_RELOCATABLE = @SET_RELOCATABLE@ 320SET_RELOCATABLE = @SET_RELOCATABLE@
319SHELL = @SHELL@ 321SHELL = @SHELL@
322SIMULINK = @SIMULINK@
320SKINLF = @SKINLF@ 323SKINLF = @SKINLF@
321SPLINT = @SPLINT@ 324SPLINT = @SPLINT@
322STRIP = @STRIP@ 325STRIP = @STRIP@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index ea71dd6..0c44ff4 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -261,6 +261,7 @@ BLAS_LIBS = @BLAS_LIBS@
261BSH = @BSH@ 261BSH = @BSH@
262CC = @CC@ 262CC = @CC@
263CCDEPMODE = @CCDEPMODE@ 263CCDEPMODE = @CCDEPMODE@
264CCSM = @CCSM@
264CFLAGS = @CFLAGS@ 265CFLAGS = @CFLAGS@
265CHECKSTYLE = @CHECKSTYLE@ 266CHECKSTYLE = @CHECKSTYLE@
266COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 267COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -319,6 +320,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
319JAVADOC = @JAVADOC@ 320JAVADOC = @JAVADOC@
320JAVAH = @JAVAH@ 321JAVAH = @JAVAH@
321JAVASCI_ENABLE = @JAVASCI_ENABLE@ 322JAVASCI_ENABLE = @JAVASCI_ENABLE@
323JAVA_CUP = @JAVA_CUP@
322JAVA_ENABLE = @JAVA_ENABLE@ 324JAVA_ENABLE = @JAVA_ENABLE@
323JAVA_G = @JAVA_G@ 325JAVA_G = @JAVA_G@
324JAVA_HOME = @JAVA_HOME@ 326JAVA_HOME = @JAVA_HOME@
@@ -411,6 +413,7 @@ SED = @SED@
411SET_MAKE = @SET_MAKE@ 413SET_MAKE = @SET_MAKE@
412SET_RELOCATABLE = @SET_RELOCATABLE@ 414SET_RELOCATABLE = @SET_RELOCATABLE@
413SHELL = @SHELL@ 415SHELL = @SHELL@
416SIMULINK = @SIMULINK@
414SKINLF = @SKINLF@ 417SKINLF = @SKINLF@
415SPLINT = @SPLINT@ 418SPLINT = @SPLINT@
416STRIP = @STRIP@ 419STRIP = @STRIP@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index 48e67f2..6e681ef 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -162,6 +162,7 @@ BLAS_LIBS = @BLAS_LIBS@
162BSH = @BSH@ 162BSH = @BSH@
163CC = @CC@ 163CC = @CC@
164CCDEPMODE = @CCDEPMODE@ 164CCDEPMODE = @CCDEPMODE@
165CCSM = @CCSM@
165CFLAGS = @CFLAGS@ 166CFLAGS = @CFLAGS@
166CHECKSTYLE = @CHECKSTYLE@ 167CHECKSTYLE = @CHECKSTYLE@
167COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 168COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -220,6 +221,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
220JAVADOC = @JAVADOC@ 221JAVADOC = @JAVADOC@
221JAVAH = @JAVAH@ 222JAVAH = @JAVAH@
222JAVASCI_ENABLE = @JAVASCI_ENABLE@ 223JAVASCI_ENABLE = @JAVASCI_ENABLE@
224JAVA_CUP = @JAVA_CUP@
223JAVA_ENABLE = @JAVA_ENABLE@ 225JAVA_ENABLE = @JAVA_ENABLE@
224JAVA_G = @JAVA_G@ 226JAVA_G = @JAVA_G@
225JAVA_HOME = @JAVA_HOME@ 227JAVA_HOME = @JAVA_HOME@
@@ -312,6 +314,7 @@ SED = @SED@
312SET_MAKE = @SET_MAKE@ 314SET_MAKE = @SET_MAKE@
313SET_RELOCATABLE = @SET_RELOCATABLE@ 315SET_RELOCATABLE = @SET_RELOCATABLE@
314SHELL = @SHELL@ 316SHELL = @SHELL@
317SIMULINK = @SIMULINK@
315SKINLF = @SKINLF@ 318SKINLF = @SKINLF@
316SPLINT = @SPLINT@ 319SPLINT = @SPLINT@
317STRIP = @STRIP@ 320STRIP = @STRIP@
diff --git a/scilab/modules/commons/Makefile.in b/scilab/modules/commons/Makefile.in
index ccf49d4..2670675 100644
--- a/scilab/modules/commons/Makefile.in
+++ b/scilab/modules/commons/Makefile.in
@@ -182,6 +182,7 @@ BLAS_LIBS = @BLAS_LIBS@
182BSH = @BSH@ 182BSH = @BSH@
183CC = @CC@ 183CC = @CC@
184CCDEPMODE = @CCDEPMODE@ 184CCDEPMODE = @CCDEPMODE@
185CCSM = @CCSM@
185CFLAGS = @CFLAGS@ 186CFLAGS = @CFLAGS@
186CHECKSTYLE = @CHECKSTYLE@ 187CHECKSTYLE = @CHECKSTYLE@
187COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 188COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -240,6 +241,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
240JAVADOC = @JAVADOC@ 241JAVADOC = @JAVADOC@
241JAVAH = @JAVAH@ 242JAVAH = @JAVAH@
242JAVASCI_ENABLE = @JAVASCI_ENABLE@ 243JAVASCI_ENABLE = @JAVASCI_ENABLE@
244JAVA_CUP = @JAVA_CUP@
243JAVA_ENABLE = @JAVA_ENABLE@ 245JAVA_ENABLE = @JAVA_ENABLE@
244JAVA_G = @JAVA_G@ 246JAVA_G = @JAVA_G@
245JAVA_HOME = @JAVA_HOME@ 247JAVA_HOME = @JAVA_HOME@
@@ -332,6 +334,7 @@ SED = @SED@
332SET_MAKE = @SET_MAKE@ 334SET_MAKE = @SET_MAKE@
333SET_RELOCATABLE = @SET_RELOCATABLE@ 335SET_RELOCATABLE = @SET_RELOCATABLE@
334SHELL = @SHELL@ 336SHELL = @SHELL@
337SIMULINK = @SIMULINK@
335SKINLF = @SKINLF@ 338SKINLF = @SKINLF@
336SPLINT = @SPLINT@ 339SPLINT = @SPLINT@
337STRIP = @STRIP@ 340STRIP = @STRIP@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index f9459d5..496a422 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -127,6 +127,7 @@ BLAS_LIBS = @BLAS_LIBS@
127BSH = @BSH@ 127BSH = @BSH@
128CC = @CC@ 128CC = @CC@
129CCDEPMODE = @CCDEPMODE@ 129CCDEPMODE = @CCDEPMODE@
130CCSM = @CCSM@
130CFLAGS = @CFLAGS@ 131CFLAGS = @CFLAGS@
131CHECKSTYLE = @CHECKSTYLE@ 132CHECKSTYLE = @CHECKSTYLE@
132COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 133COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -185,6 +186,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
185JAVADOC = @JAVADOC@ 186JAVADOC = @JAVADOC@
186JAVAH = @JAVAH@ 187JAVAH = @JAVAH@
187JAVASCI_ENABLE = @JAVASCI_ENABLE@ 188JAVASCI_ENABLE = @JAVASCI_ENABLE@
189JAVA_CUP = @JAVA_CUP@
188JAVA_ENABLE = @JAVA_ENABLE@ 190JAVA_ENABLE = @JAVA_ENABLE@
189JAVA_G = @JAVA_G@ 191JAVA_G = @JAVA_G@
190JAVA_HOME = @JAVA_HOME@ 192JAVA_HOME = @JAVA_HOME@
@@ -277,6 +279,7 @@ SED = @SED@
277SET_MAKE = @SET_MAKE@ 279SET_MAKE = @SET_MAKE@
278SET_RELOCATABLE = @SET_RELOCATABLE@ 280SET_RELOCATABLE = @SET_RELOCATABLE@
279SHELL = @SHELL@ 281SHELL = @SHELL@
282SIMULINK = @SIMULINK@
280SKINLF = @SKINLF@ 283SKINLF = @SKINLF@
281SPLINT = @SPLINT@ 284SPLINT = @SPLINT@
282STRIP = @STRIP@ 285STRIP = @STRIP@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 8bb840f..8640a02 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -189,6 +189,7 @@ BLAS_LIBS = @BLAS_LIBS@
189BSH = @BSH@ 189BSH = @BSH@
190CC = @CC@ 190CC = @CC@
191CCDEPMODE = @CCDEPMODE@ 191CCDEPMODE = @CCDEPMODE@
192CCSM = @CCSM@
192CFLAGS = @CFLAGS@ 193CFLAGS = @CFLAGS@
193CHECKSTYLE = @CHECKSTYLE@ 194CHECKSTYLE = @CHECKSTYLE@
194COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 195COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -247,6 +248,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
247JAVADOC = @JAVADOC@ 248JAVADOC = @JAVADOC@
248JAVAH = @JAVAH@ 249JAVAH = @JAVAH@
249JAVASCI_ENABLE = @JAVASCI_ENABLE@ 250JAVASCI_ENABLE = @JAVASCI_ENABLE@
251JAVA_CUP = @JAVA_CUP@
250JAVA_ENABLE = @JAVA_ENABLE@ 252JAVA_ENABLE = @JAVA_ENABLE@
251JAVA_G = @JAVA_G@ 253JAVA_G = @JAVA_G@
252JAVA_HOME = @JAVA_HOME@ 254JAVA_HOME = @JAVA_HOME@
@@ -339,6 +341,7 @@ SED = @SED@
339SET_MAKE = @SET_MAKE@ 341SET_MAKE = @SET_MAKE@
340SET_RELOCATABLE = @SET_RELOCATABLE@ 342SET_RELOCATABLE = @SET_RELOCATABLE@
341SHELL = @SHELL@ 343SHELL = @SHELL@
344SIMULINK = @SIMULINK@
342SKINLF = @SKINLF@ 345SKINLF = @SKINLF@
343SPLINT = @SPLINT@ 346SPLINT = @SPLINT@
344STRIP = @STRIP@ 347STRIP = @STRIP@
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index 8582a91..a6e64c3 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -201,6 +201,7 @@ BLAS_LIBS = @BLAS_LIBS@
201BSH = @BSH@ 201BSH = @BSH@
202CC = @CC@ 202CC = @CC@
203CCDEPMODE = @CCDEPMODE@ 203CCDEPMODE = @CCDEPMODE@
204CCSM = @CCSM@
204CFLAGS = @CFLAGS@ 205CFLAGS = @CFLAGS@
205CHECKSTYLE = @CHECKSTYLE@ 206CHECKSTYLE = @CHECKSTYLE@
206COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 207COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -259,6 +260,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
259JAVADOC = @JAVADOC@ 260JAVADOC = @JAVADOC@
260JAVAH = @JAVAH@ 261JAVAH = @JAVAH@
261JAVASCI_ENABLE = @JAVASCI_ENABLE@ 262JAVASCI_ENABLE = @JAVASCI_ENABLE@
263JAVA_CUP = @JAVA_CUP@
262JAVA_ENABLE = @JAVA_ENABLE@ 264JAVA_ENABLE = @JAVA_ENABLE@
263JAVA_G = @JAVA_G@ 265JAVA_G = @JAVA_G@
264JAVA_HOME = @JAVA_HOME@ 266JAVA_HOME = @JAVA_HOME@
@@ -351,6 +353,7 @@ SED = @SED@
351SET_MAKE = @SET_MAKE@ 353SET_MAKE = @SET_MAKE@
352SET_RELOCATABLE = @SET_RELOCATABLE@ 354SET_RELOCATABLE = @SET_RELOCATABLE@
353SHELL = @SHELL@ 355SHELL = @SHELL@
356SIMULINK = @SIMULINK@
354SKINLF = @SKINLF@ 357SKINLF = @SKINLF@
355SPLINT = @SPLINT@ 358SPLINT = @SPLINT@
356STRIP = @STRIP@ 359STRIP = @STRIP@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 180170e..f4ead59 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -402,6 +402,7 @@ BLAS_LIBS = @BLAS_LIBS@
402BSH = @BSH@ 402BSH = @BSH@
403CC = @CC@ 403CC = @CC@
404CCDEPMODE = @CCDEPMODE@ 404CCDEPMODE = @CCDEPMODE@
405CCSM = @CCSM@
405CFLAGS = @CFLAGS@ 406CFLAGS = @CFLAGS@
406CHECKSTYLE = @CHECKSTYLE@ 407CHECKSTYLE = @CHECKSTYLE@
407COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 408COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -460,6 +461,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
460JAVADOC = @JAVADOC@ 461JAVADOC = @JAVADOC@
461JAVAH = @JAVAH@ 462JAVAH = @JAVAH@
462JAVASCI_ENABLE = @JAVASCI_ENABLE@ 463JAVASCI_ENABLE = @JAVASCI_ENABLE@
464JAVA_CUP = @JAVA_CUP@
463JAVA_ENABLE = @JAVA_ENABLE@ 465JAVA_ENABLE = @JAVA_ENABLE@
464JAVA_G = @JAVA_G@ 466JAVA_G = @JAVA_G@
465JAVA_HOME = @JAVA_HOME@ 467JAVA_HOME = @JAVA_HOME@
@@ -552,6 +554,7 @@ SED = @SED@
552SET_MAKE = @SET_MAKE@ 554SET_MAKE = @SET_MAKE@
553SET_RELOCATABLE = @SET_RELOCATABLE@ 555SET_RELOCATABLE = @SET_RELOCATABLE@
554SHELL = @SHELL@ 556SHELL = @SHELL@
557SIMULINK = @SIMULINK@
555SKINLF = @SKINLF@ 558SKINLF = @SKINLF@
556SPLINT = @SPLINT@ 559SPLINT = @SPLINT@
557STRIP = @STRIP@ 560STRIP = @STRIP@
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index d2ff9d5..cbd9d4f 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -197,6 +197,7 @@ BLAS_LIBS = @BLAS_LIBS@
197BSH = @BSH@ 197BSH = @BSH@
198CC = @CC@ 198CC = @CC@
199CCDEPMODE = @CCDEPMODE@ 199CCDEPMODE = @CCDEPMODE@
200CCSM = @CCSM@
200CFLAGS = @CFLAGS@ 201CFLAGS = @CFLAGS@
201CHECKSTYLE = @CHECKSTYLE@ 202CHECKSTYLE = @CHECKSTYLE@
202COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 203COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -255,6 +256,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
255JAVADOC = @JAVADOC@ 256JAVADOC = @JAVADOC@
256JAVAH = @JAVAH@ 257JAVAH = @JAVAH@
257JAVASCI_ENABLE = @JAVASCI_ENABLE@ 258JAVASCI_ENABLE = @JAVASCI_ENABLE@
259JAVA_CUP = @JAVA_CUP@
258JAVA_ENABLE = @JAVA_ENABLE@ 260JAVA_ENABLE = @JAVA_ENABLE@
259JAVA_G = @JAVA_G@ 261JAVA_G = @JAVA_G@
260JAVA_HOME = @JAVA_HOME@ 262JAVA_HOME = @JAVA_HOME@
@@ -347,6 +349,7 @@ SED = @SED@
347SET_MAKE = @SET_MAKE@ 349SET_MAKE = @SET_MAKE@
348SET_RELOCATABLE = @SET_RELOCATABLE@ 350SET_RELOCATABLE = @SET_RELOCATABLE@
349SHELL = @SHELL@ 351SHELL = @SHELL@
352SIMULINK = @SIMULINK@
350SKINLF = @SKINLF@ 353SKINLF = @SKINLF@
351SPLINT = @SPLINT@ 354SPLINT = @SPLINT@
352STRIP = @STRIP@ 355STRIP = @STRIP@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index f4f2623..b8e2dee 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -126,6 +126,7 @@ BLAS_LIBS = @BLAS_LIBS@
126BSH = @BSH@ 126BSH = @BSH@
127CC = @CC@ 127CC = @CC@
128CCDEPMODE = @CCDEPMODE@ 128CCDEPMODE = @CCDEPMODE@
129CCSM = @CCSM@
129CFLAGS = @CFLAGS@ 130CFLAGS = @CFLAGS@
130CHECKSTYLE = @CHECKSTYLE@ 131CHECKSTYLE = @CHECKSTYLE@
131COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 132COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -184,6 +185,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
184JAVADOC = @JAVADOC@ 185JAVADOC = @JAVADOC@
185JAVAH = @JAVAH@ 186JAVAH = @JAVAH@
186JAVASCI_ENABLE = @JAVASCI_ENABLE@ 187JAVASCI_ENABLE = @JAVASCI_ENABLE@
188JAVA_CUP = @JAVA_CUP@
187JAVA_ENABLE = @JAVA_ENABLE@ 189JAVA_ENABLE = @JAVA_ENABLE@
188JAVA_G = @JAVA_G@ 190JAVA_G = @JAVA_G@
189JAVA_HOME = @JAVA_HOME@ 191JAVA_HOME = @JAVA_HOME@
@@ -276,6 +278,7 @@ SED = @SED@
276SET_MAKE = @SET_MAKE@ 278SET_MAKE = @SET_MAKE@
277SET_RELOCATABLE = @SET_RELOCATABLE@ 279SET_RELOCATABLE = @SET_RELOCATABLE@
278SHELL = @SHELL@ 280SHELL = @SHELL@
281SIMULINK = @SIMULINK@
279SKINLF = @SKINLF@ 282SKINLF = @SKINLF@
280SPLINT = @SPLINT@ 283SPLINT = @SPLINT@
281STRIP = @STRIP@ 284STRIP = @STRIP@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index a2e921c..c51bf2d 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -125,6 +125,7 @@ BLAS_LIBS = @BLAS_LIBS@
125BSH = @BSH@ 125BSH = @BSH@
126CC = @CC@ 126CC = @CC@
127CCDEPMODE = @CCDEPMODE@ 127CCDEPMODE = @CCDEPMODE@
128CCSM = @CCSM@
128CFLAGS = @CFLAGS@ 129CFLAGS = @CFLAGS@
129CHECKSTYLE = @CHECKSTYLE@ 130CHECKSTYLE = @CHECKSTYLE@
130COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 131COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -183,6 +184,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
183JAVADOC = @JAVADOC@ 184JAVADOC = @JAVADOC@
184JAVAH = @JAVAH@ 185JAVAH = @JAVAH@
185JAVASCI_ENABLE = @JAVASCI_ENABLE@ 186JAVASCI_ENABLE = @JAVASCI_ENABLE@
187JAVA_CUP = @JAVA_CUP@
186JAVA_ENABLE = @JAVA_ENABLE@ 188JAVA_ENABLE = @JAVA_ENABLE@
187JAVA_G = @JAVA_G@ 189JAVA_G = @JAVA_G@
188JAVA_HOME = @JAVA_HOME@ 190JAVA_HOME = @JAVA_HOME@
@@ -275,6 +277,7 @@ SED = @SED@
275SET_MAKE = @SET_MAKE@ 277SET_MAKE = @SET_MAKE@
276SET_RELOCATABLE = @SET_RELOCATABLE@ 278SET_RELOCATABLE = @SET_RELOCATABLE@
277SHELL = @SHELL@ 279SHELL = @SHELL@
280SIMULINK = @SIMULINK@
278SKINLF = @SKINLF@ 281SKINLF = @SKINLF@
279SPLINT = @SPLINT@ 282SPLINT = @SPLINT@
280STRIP = @STRIP@ 283STRIP = @STRIP@
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index 5d8fb6b..e14e518 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -76,6 +76,7 @@ BLAS_LIBS = @BLAS_LIBS@
76BSH = @BSH@ 76BSH = @BSH@
77CC = @CC@ 77CC = @CC@
78CCDEPMODE = @CCDEPMODE@ 78CCDEPMODE = @CCDEPMODE@
79CCSM = @CCSM@
79CFLAGS = @CFLAGS@ 80CFLAGS = @CFLAGS@
80CHECKSTYLE = @CHECKSTYLE@ 81CHECKSTYLE = @CHECKSTYLE@
81COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 82COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -134,6 +135,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
134JAVADOC = @JAVADOC@ 135JAVADOC = @JAVADOC@
135JAVAH = @JAVAH@ 136JAVAH = @JAVAH@
136JAVASCI_ENABLE = @JAVASCI_ENABLE@ 137JAVASCI_ENABLE = @JAVASCI_ENABLE@
138JAVA_CUP = @JAVA_CUP@
137JAVA_ENABLE = @JAVA_ENABLE@ 139JAVA_ENABLE = @JAVA_ENABLE@
138JAVA_G = @JAVA_G@ 140JAVA_G = @JAVA_G@
139JAVA_HOME = @JAVA_HOME@ 141JAVA_HOME = @JAVA_HOME@
@@ -226,6 +228,7 @@ SED = @SED@
226SET_MAKE = @SET_MAKE@ 228SET_MAKE = @SET_MAKE@
227SET_RELOCATABLE = @SET_RELOCATABLE@ 229SET_RELOCATABLE = @SET_RELOCATABLE@
228SHELL = @SHELL@ 230SHELL = @SHELL@
231SIMULINK = @SIMULINK@
229SKINLF = @SKINLF@ 232SKINLF = @SKINLF@
230SPLINT = @SPLINT@ 233SPLINT = @SPLINT@
231STRIP = @STRIP@ 234STRIP = @STRIP@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 629185f..7831569 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -207,6 +207,7 @@ BLAS_LIBS = @BLAS_LIBS@
207BSH = @BSH@ 207BSH = @BSH@
208CC = @CC@ 208CC = @CC@
209CCDEPMODE = @CCDEPMODE@ 209CCDEPMODE = @CCDEPMODE@
210CCSM = @CCSM@
210CFLAGS = @CFLAGS@ 211CFLAGS = @CFLAGS@
211CHECKSTYLE = @CHECKSTYLE@ 212CHECKSTYLE = @CHECKSTYLE@
212COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 213COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -265,6 +266,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
265JAVADOC = @JAVADOC@ 266JAVADOC = @JAVADOC@
266JAVAH = @JAVAH@ 267JAVAH = @JAVAH@
267JAVASCI_ENABLE = @JAVASCI_ENABLE@ 268JAVASCI_ENABLE = @JAVASCI_ENABLE@
269JAVA_CUP = @JAVA_CUP@
268JAVA_ENABLE = @JAVA_ENABLE@ 270JAVA_ENABLE = @JAVA_ENABLE@
269JAVA_G = @JAVA_G@ 271JAVA_G = @JAVA_G@
270JAVA_HOME = @JAVA_HOME@ 272JAVA_HOME = @JAVA_HOME@
@@ -357,6 +359,7 @@ SED = @SED@
357SET_MAKE = @SET_MAKE@ 359SET_MAKE = @SET_MAKE@
358SET_RELOCATABLE = @SET_RELOCATABLE@ 360SET_RELOCATABLE = @SET_RELOCATABLE@
359SHELL = @SHELL@ 361SHELL = @SHELL@
362SIMULINK = @SIMULINK@
360SKINLF = @SKINLF@ 363SKINLF = @SKINLF@
361SPLINT = @SPLINT@ 364SPLINT = @SPLINT@
362STRIP = @STRIP@ 365STRIP = @STRIP@
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index fd7c6df..b7a23c6 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -166,6 +166,7 @@ BLAS_LIBS = @BLAS_LIBS@
166BSH = @BSH@ 166BSH = @BSH@
167CC = @CC@ 167CC = @CC@
168CCDEPMODE = @CCDEPMODE@ 168CCDEPMODE = @CCDEPMODE@
169CCSM = @CCSM@
169CFLAGS = @CFLAGS@ 170CFLAGS = @CFLAGS@
170CHECKSTYLE = @CHECKSTYLE@ 171CHECKSTYLE = @CHECKSTYLE@
171COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 172COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -224,6 +225,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
224JAVADOC = @JAVADOC@ 225JAVADOC = @JAVADOC@
225JAVAH = @JAVAH@ 226JAVAH = @JAVAH@
226JAVASCI_ENABLE = @JAVASCI_ENABLE@ 227JAVASCI_ENABLE = @JAVASCI_ENABLE@
228JAVA_CUP = @JAVA_CUP@
227JAVA_ENABLE = @JAVA_ENABLE@ 229JAVA_ENABLE = @JAVA_ENABLE@
228JAVA_G = @JAVA_G@ 230JAVA_G = @JAVA_G@
229JAVA_HOME = @JAVA_HOME@ 231JAVA_HOME = @JAVA_HOME@
@@ -316,6 +318,7 @@ SED = @SED@
316SET_MAKE = @SET_MAKE@ 318SET_MAKE = @SET_MAKE@
317SET_RELOCATABLE = @SET_RELOCATABLE@ 319SET_RELOCATABLE = @SET_RELOCATABLE@
318SHELL = @SHELL@ 320SHELL = @SHELL@
321SIMULINK = @SIMULINK@
319SKINLF = @SKINLF@ 322SKINLF = @SKINLF@
320SPLINT = @SPLINT@ 323SPLINT = @SPLINT@
321STRIP = @STRIP@ 324STRIP = @STRIP@
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index 3f9b563..6886f2f 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -184,6 +184,7 @@ BLAS_LIBS = @BLAS_LIBS@
184BSH = @BSH@ 184BSH = @BSH@
185CC = @CC@ 185CC = @CC@
186CCDEPMODE = @CCDEPMODE@ 186CCDEPMODE = @CCDEPMODE@
187CCSM = @CCSM@
187CFLAGS = @CFLAGS@ 188CFLAGS = @CFLAGS@
188CHECKSTYLE = @CHECKSTYLE@ 189CHECKSTYLE = @CHECKSTYLE@
189COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 190COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -242,6 +243,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
242JAVADOC = @JAVADOC@ 243JAVADOC = @JAVADOC@
243JAVAH = @JAVAH@ 244JAVAH = @JAVAH@
244JAVASCI_ENABLE = @JAVASCI_ENABLE@ 245JAVASCI_ENABLE = @JAVASCI_ENABLE@
246JAVA_CUP = @JAVA_CUP@
245JAVA_ENABLE = @JAVA_ENABLE@ 247JAVA_ENABLE = @JAVA_ENABLE@
246JAVA_G = @JAVA_G@ 248JAVA_G = @JAVA_G@
247JAVA_HOME = @JAVA_HOME@ 249JAVA_HOME = @JAVA_HOME@
@@ -334,6 +336,7 @@ SED = @SED@
334SET_MAKE = @SET_MAKE@ 336SET_MAKE = @SET_MAKE@
335SET_RELOCATABLE = @SET_RELOCATABLE@ 337SET_RELOCATABLE = @SET_RELOCATABLE@
336SHELL = @SHELL@ 338SHELL = @SHELL@
339SIMULINK = @SIMULINK@
337SKINLF = @SKINLF@ 340SKINLF = @SKINLF@
338SPLINT = @SPLINT@ 341SPLINT = @SPLINT@
339STRIP = @STRIP@ 342STRIP = @STRIP@
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 931fd81..cfcbbe0 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -536,6 +536,7 @@ BLAS_LIBS = @BLAS_LIBS@
536BSH = @BSH@ 536BSH = @BSH@
537CC = @CC@ 537CC = @CC@
538CCDEPMODE = @CCDEPMODE@ 538CCDEPMODE = @CCDEPMODE@
539CCSM = @CCSM@
539CFLAGS = @CFLAGS@ 540CFLAGS = @CFLAGS@
540CHECKSTYLE = @CHECKSTYLE@ 541CHECKSTYLE = @CHECKSTYLE@
541COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 542COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -594,6 +595,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
594JAVADOC = @JAVADOC@ 595JAVADOC = @JAVADOC@
595JAVAH = @JAVAH@ 596JAVAH = @JAVAH@
596JAVASCI_ENABLE = @JAVASCI_ENABLE@ 597JAVASCI_ENABLE = @JAVASCI_ENABLE@
598JAVA_CUP = @JAVA_CUP@
597JAVA_ENABLE = @JAVA_ENABLE@ 599JAVA_ENABLE = @JAVA_ENABLE@
598JAVA_G = @JAVA_G@ 600JAVA_G = @JAVA_G@
599JAVA_HOME = @JAVA_HOME@ 601JAVA_HOME = @JAVA_HOME@
@@ -686,6 +688,7 @@ SED = @SED@
686SET_MAKE = @SET_MAKE@ 688SET_MAKE = @SET_MAKE@
687SET_RELOCATABLE = @SET_RELOCATABLE@ 689SET_RELOCATABLE = @SET_RELOCATABLE@
688SHELL = @SHELL@ 690SHELL = @SHELL@
691SIMULINK = @SIMULINK@
689SKINLF = @SKINLF@ 692SKINLF = @SKINLF@
690SPLINT = @SPLINT@ 693SPLINT = @SPLINT@
691STRIP = @STRIP@ 694STRIP = @STRIP@
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index 0322789..c031524 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -185,6 +185,7 @@ BLAS_LIBS = @BLAS_LIBS@
185BSH = @BSH@ 185BSH = @BSH@
186CC = @CC@ 186CC = @CC@
187CCDEPMODE = @CCDEPMODE@ 187CCDEPMODE = @CCDEPMODE@
188CCSM = @CCSM@
188CFLAGS = @CFLAGS@ 189CFLAGS = @CFLAGS@
189CHECKSTYLE = @CHECKSTYLE@ 190CHECKSTYLE = @CHECKSTYLE@
190COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 191COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -243,6 +244,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
243JAVADOC = @JAVADOC@ 244JAVADOC = @JAVADOC@
244JAVAH = @JAVAH@ 245JAVAH = @JAVAH@
245JAVASCI_ENABLE = @JAVASCI_ENABLE@ 246JAVASCI_ENABLE = @JAVASCI_ENABLE@
247JAVA_CUP = @JAVA_CUP@
246JAVA_ENABLE = @JAVA_ENABLE@ 248JAVA_ENABLE = @JAVA_ENABLE@
247JAVA_G = @JAVA_G@ 249JAVA_G = @JAVA_G@
248JAVA_HOME = @JAVA_HOME@ 250JAVA_HOME = @JAVA_HOME@
@@ -335,6 +337,7 @@ SED = @SED@
335SET_MAKE = @SET_MAKE@ 337SET_MAKE = @SET_MAKE@
336SET_RELOCATABLE = @SET_RELOCATABLE@ 338SET_RELOCATABLE = @SET_RELOCATABLE@
337SHELL = @SHELL@ 339SHELL = @SHELL@
340SIMULINK = @SIMULINK@
338SKINLF = @SKINLF@ 341SKINLF = @SKINLF@
339SPLINT = @SPLINT@ 342SPLINT = @SPLINT@
340STRIP = @STRIP@ 343STRIP = @STRIP@
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index e443c62..0b5bc7d 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -220,6 +220,7 @@ BLAS_LIBS = @BLAS_LIBS@
220BSH = @BSH@ 220BSH = @BSH@
221CC = @CC@ 221CC = @CC@
222CCDEPMODE = @CCDEPMODE@ 222CCDEPMODE = @CCDEPMODE@
223CCSM = @CCSM@
223CFLAGS = @CFLAGS@ 224CFLAGS = @CFLAGS@
224CHECKSTYLE = @CHECKSTYLE@ 225CHECKSTYLE = @CHECKSTYLE@
225COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 226COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -278,6 +279,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
278JAVADOC = @JAVADOC@ 279JAVADOC = @JAVADOC@
279JAVAH = @JAVAH@ 280JAVAH = @JAVAH@
280JAVASCI_ENABLE = @JAVASCI_ENABLE@ 281JAVASCI_ENABLE = @JAVASCI_ENABLE@
282JAVA_CUP = @JAVA_CUP@
281JAVA_ENABLE = @JAVA_ENABLE@ 283JAVA_ENABLE = @JAVA_ENABLE@
282JAVA_G = @JAVA_G@ 284JAVA_G = @JAVA_G@
283JAVA_HOME = @JAVA_HOME@ 285JAVA_HOME = @JAVA_HOME@
@@ -370,6 +372,7 @@ SED = @SED@
370SET_MAKE = @SET_MAKE@ 372SET_MAKE = @SET_MAKE@
371SET_RELOCATABLE = @SET_RELOCATABLE@ 373SET_RELOCATABLE = @SET_RELOCATABLE@
372SHELL = @SHELL@ 374SHELL = @SHELL@
375SIMULINK = @SIMULINK@
373SKINLF = @SKINLF@ 376SKINLF = @SKINLF@
374SPLINT = @SPLINT@ 377SPLINT = @SPLINT@
375STRIP = @STRIP@ 378STRIP = @STRIP@
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index bd70bf7..64233ba 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -175,6 +175,7 @@ BLAS_LIBS = @BLAS_LIBS@
175BSH = @BSH@ 175BSH = @BSH@
176CC = @CC@ 176CC = @CC@
177CCDEPMODE = @CCDEPMODE@ 177CCDEPMODE = @CCDEPMODE@
178CCSM = @CCSM@
178CFLAGS = @CFLAGS@ 179CFLAGS = @CFLAGS@
179CHECKSTYLE = @CHECKSTYLE@ 180CHECKSTYLE = @CHECKSTYLE@
180COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 181COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -233,6 +234,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
233JAVADOC = @JAVADOC@ 234JAVADOC = @JAVADOC@
234JAVAH = @JAVAH@ 235JAVAH = @JAVAH@
235JAVASCI_ENABLE = @JAVASCI_ENABLE@ 236JAVASCI_ENABLE = @JAVASCI_ENABLE@
237JAVA_CUP = @JAVA_CUP@
236JAVA_ENABLE = @JAVA_ENABLE@ 238JAVA_ENABLE = @JAVA_ENABLE@
237JAVA_G = @JAVA_G@ 239JAVA_G = @JAVA_G@
238JAVA_HOME = @JAVA_HOME@ 240JAVA_HOME = @JAVA_HOME@
@@ -325,6 +327,7 @@ SED = @SED@
325SET_MAKE = @SET_MAKE@ 327SET_MAKE = @SET_MAKE@
326SET_RELOCATABLE = @SET_RELOCATABLE@ 328SET_RELOCATABLE = @SET_RELOCATABLE@
327SHELL = @SHELL@ 329SHELL = @SHELL@
330SIMULINK = @SIMULINK@
328SKINLF = @SKINLF@ 331SKINLF = @SKINLF@
329SPLINT = @SPLINT@ 332SPLINT = @SPLINT@
330STRIP = @STRIP@ 333STRIP = @STRIP@
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index cb63128..8e1a204 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -129,6 +129,7 @@ BLAS_LIBS = @BLAS_LIBS@
129BSH = @BSH@ 129BSH = @BSH@
130CC = @CC@ 130CC = @CC@
131CCDEPMODE = @CCDEPMODE@ 131CCDEPMODE = @CCDEPMODE@
132CCSM = @CCSM@
132CFLAGS = @CFLAGS@ 133CFLAGS = @CFLAGS@
133CHECKSTYLE = @CHECKSTYLE@ 134CHECKSTYLE = @CHECKSTYLE@
134COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 135COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -187,6 +188,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
187JAVADOC = @JAVADOC@ 188JAVADOC = @JAVADOC@
188JAVAH = @JAVAH@ 189JAVAH = @JAVAH@
189JAVASCI_ENABLE = @JAVASCI_ENABLE@ 190JAVASCI_ENABLE = @JAVASCI_ENABLE@
191JAVA_CUP = @JAVA_CUP@
190JAVA_ENABLE = @JAVA_ENABLE@ 192JAVA_ENABLE = @JAVA_ENABLE@
191JAVA_G = @JAVA_G@ 193JAVA_G = @JAVA_G@
192JAVA_HOME = @JAVA_HOME@ 194JAVA_HOME = @JAVA_HOME@
@@ -279,6 +281,7 @@ SED = @SED@
279SET_MAKE = @SET_MAKE@ 281SET_MAKE = @SET_MAKE@
280SET_RELOCATABLE = @SET_RELOCATABLE@ 282SET_RELOCATABLE = @SET_RELOCATABLE@
281SHELL = @SHELL@ 283SHELL = @SHELL@
284SIMULINK = @SIMULINK@
282SKINLF = @SKINLF@ 285SKINLF = @SKINLF@
283SPLINT = @SPLINT@ 286SPLINT = @SPLINT@
284STRIP = @STRIP@ 287STRIP = @STRIP@
diff --git a/scilab/modules/graph/Makefile.in b/scilab/modules/graph/Makefile.in
index 17c3459..9d77570 100644
--- a/scilab/modules/graph/Makefile.in
+++ b/scilab/modules/graph/Makefile.in
@@ -165,6 +165,7 @@ BLAS_LIBS = @BLAS_LIBS@
165BSH = @BSH@ 165BSH = @BSH@
166CC = @CC@ 166CC = @CC@
167CCDEPMODE = @CCDEPMODE@ 167CCDEPMODE = @CCDEPMODE@
168CCSM = @CCSM@
168CFLAGS = @CFLAGS@ 169CFLAGS = @CFLAGS@
169CHECKSTYLE = @CHECKSTYLE@ 170CHECKSTYLE = @CHECKSTYLE@
170COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 171COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -223,6 +224,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
223JAVADOC = @JAVADOC@ 224JAVADOC = @JAVADOC@
224JAVAH = @JAVAH@ 225JAVAH = @JAVAH@
225JAVASCI_ENABLE = @JAVASCI_ENABLE@ 226JAVASCI_ENABLE = @JAVASCI_ENABLE@
227JAVA_CUP = @JAVA_CUP@
226JAVA_ENABLE = @JAVA_ENABLE@ 228JAVA_ENABLE = @JAVA_ENABLE@
227JAVA_G = @JAVA_G@ 229JAVA_G = @JAVA_G@
228JAVA_HOME = @JAVA_HOME@ 230JAVA_HOME = @JAVA_HOME@
@@ -315,6 +317,7 @@ SED = @SED@
315SET_MAKE = @SET_MAKE@ 317SET_MAKE = @SET_MAKE@
316SET_RELOCATABLE = @SET_RELOCATABLE@ 318SET_RELOCATABLE = @SET_RELOCATABLE@
317SHELL = @SHELL@ 319SHELL = @SHELL@
320SIMULINK = @SIMULINK@
318SKINLF = @SKINLF@ 321SKINLF = @SKINLF@
319SPLINT = @SPLINT@ 322SPLINT = @SPLINT@
320STRIP = @STRIP@ 323STRIP = @STRIP@
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index 5ef0c29..bb5bf59 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -202,6 +202,7 @@ BLAS_LIBS = @BLAS_LIBS@
202BSH = @BSH@ 202BSH = @BSH@
203CC = @CC@ 203CC = @CC@
204CCDEPMODE = @CCDEPMODE@ 204CCDEPMODE = @CCDEPMODE@
205CCSM = @CCSM@
205CFLAGS = @CFLAGS@ 206CFLAGS = @CFLAGS@
206CHECKSTYLE = @CHECKSTYLE@ 207CHECKSTYLE = @CHECKSTYLE@
207COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 208COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -260,6 +261,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
260JAVADOC = @JAVADOC@ 261JAVADOC = @JAVADOC@
261JAVAH = @JAVAH@ 262JAVAH = @JAVAH@
262JAVASCI_ENABLE = @JAVASCI_ENABLE@ 263JAVASCI_ENABLE = @JAVASCI_ENABLE@
264JAVA_CUP = @JAVA_CUP@
263JAVA_ENABLE = @JAVA_ENABLE@ 265JAVA_ENABLE = @JAVA_ENABLE@
264JAVA_G = @JAVA_G@ 266JAVA_G = @JAVA_G@
265JAVA_HOME = @JAVA_HOME@ 267JAVA_HOME = @JAVA_HOME@
@@ -352,6 +354,7 @@ SED = @SED@
352SET_MAKE = @SET_MAKE@ 354SET_MAKE = @SET_MAKE@
353SET_RELOCATABLE = @SET_RELOCATABLE@ 355SET_RELOCATABLE = @SET_RELOCATABLE@
354SHELL = @SHELL@ 356SHELL = @SHELL@
357SIMULINK = @SIMULINK@
355SKINLF = @SKINLF@ 358SKINLF = @SKINLF@
356SPLINT = @SPLINT@ 359SPLINT = @SPLINT@
357STRIP = @STRIP@ 360STRIP = @STRIP@
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index c6bd237..efcce02 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -537,6 +537,7 @@ BLAS_LIBS = @BLAS_LIBS@
537BSH = @BSH@ 537BSH = @BSH@
538CC = @CC@ 538CC = @CC@
539CCDEPMODE = @CCDEPMODE@ 539CCDEPMODE = @CCDEPMODE@
540CCSM = @CCSM@
540CFLAGS = @CFLAGS@ 541CFLAGS = @CFLAGS@
541CHECKSTYLE = @CHECKSTYLE@ 542CHECKSTYLE = @CHECKSTYLE@
542COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 543COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -595,6 +596,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
595JAVADOC = @JAVADOC@ 596JAVADOC = @JAVADOC@
596JAVAH = @JAVAH@ 597JAVAH = @JAVAH@
597JAVASCI_ENABLE = @JAVASCI_ENABLE@ 598JAVASCI_ENABLE = @JAVASCI_ENABLE@
599JAVA_CUP = @JAVA_CUP@
598JAVA_ENABLE = @JAVA_ENABLE@ 600JAVA_ENABLE = @JAVA_ENABLE@
599JAVA_G = @JAVA_G@ 601JAVA_G = @JAVA_G@
600JAVA_HOME = @JAVA_HOME@ 602JAVA_HOME = @JAVA_HOME@
@@ -687,6 +689,7 @@ SED = @SED@
687SET_MAKE = @SET_MAKE@ 689SET_MAKE = @SET_MAKE@
688SET_RELOCATABLE = @SET_RELOCATABLE@ 690SET_RELOCATABLE = @SET_RELOCATABLE@
689SHELL = @SHELL@ 691SHELL = @SHELL@
692SIMULINK = @SIMULINK@
690SKINLF = @SKINLF@ 693SKINLF = @SKINLF@
691SPLINT = @SPLINT@ 694SPLINT = @SPLINT@
692STRIP = @STRIP@ 695STRIP = @STRIP@
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 76b48b6..3a41b18 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -292,6 +292,7 @@ BLAS_LIBS = @BLAS_LIBS@
292BSH = @BSH@ 292BSH = @BSH@
293CC = @CC@ 293CC = @CC@
294CCDEPMODE = @CCDEPMODE@ 294CCDEPMODE = @CCDEPMODE@
295CCSM = @CCSM@
295CFLAGS = @CFLAGS@ 296CFLAGS = @CFLAGS@
296CHECKSTYLE = @CHECKSTYLE@ 297CHECKSTYLE = @CHECKSTYLE@
297COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 298COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -350,6 +351,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
350JAVADOC = @JAVADOC@ 351JAVADOC = @JAVADOC@
351JAVAH = @JAVAH@ 352JAVAH = @JAVAH@
352JAVASCI_ENABLE = @JAVASCI_ENABLE@ 353JAVASCI_ENABLE = @JAVASCI_ENABLE@
354JAVA_CUP = @JAVA_CUP@
353JAVA_ENABLE = @JAVA_ENABLE@ 355JAVA_ENABLE = @JAVA_ENABLE@
354JAVA_G = @JAVA_G@ 356JAVA_G = @JAVA_G@
355JAVA_HOME = @JAVA_HOME@ 357JAVA_HOME = @JAVA_HOME@
@@ -442,6 +444,7 @@ SED = @SED@
442SET_MAKE = @SET_MAKE@ 444SET_MAKE = @SET_MAKE@
443SET_RELOCATABLE = @SET_RELOCATABLE@ 445SET_RELOCATABLE = @SET_RELOCATABLE@
444SHELL = @SHELL@ 446SHELL = @SHELL@
447SIMULINK = @SIMULINK@
445SKINLF = @SKINLF@ 448SKINLF = @SKINLF@
446SPLINT = @SPLINT@ 449SPLINT = @SPLINT@
447STRIP = @STRIP@ 450STRIP = @STRIP@
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index 773051c..2230a3a 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -217,6 +217,7 @@ BLAS_LIBS = @BLAS_LIBS@
217BSH = @BSH@ 217BSH = @BSH@
218CC = @CC@ 218CC = @CC@
219CCDEPMODE = @CCDEPMODE@ 219CCDEPMODE = @CCDEPMODE@
220CCSM = @CCSM@
220CFLAGS = @CFLAGS@ 221CFLAGS = @CFLAGS@
221CHECKSTYLE = @CHECKSTYLE@ 222CHECKSTYLE = @CHECKSTYLE@
222COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 223COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -275,6 +276,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
275JAVADOC = @JAVADOC@ 276JAVADOC = @JAVADOC@
276JAVAH = @JAVAH@ 277JAVAH = @JAVAH@
277JAVASCI_ENABLE = @JAVASCI_ENABLE@ 278JAVASCI_ENABLE = @JAVASCI_ENABLE@
279JAVA_CUP = @JAVA_CUP@
278JAVA_ENABLE = @JAVA_ENABLE@ 280JAVA_ENABLE = @JAVA_ENABLE@
279JAVA_G = @JAVA_G@ 281JAVA_G = @JAVA_G@
280JAVA_HOME = @JAVA_HOME@ 282JAVA_HOME = @JAVA_HOME@
@@ -367,6 +369,7 @@ SED = @SED@
367SET_MAKE = @SET_MAKE@ 369SET_MAKE = @SET_MAKE@
368SET_RELOCATABLE = @SET_RELOCATABLE@ 370SET_RELOCATABLE = @SET_RELOCATABLE@
369SHELL = @SHELL@ 371SHELL = @SHELL@
372SIMULINK = @SIMULINK@
370SKINLF = @SKINLF@ 373SKINLF = @SKINLF@
371SPLINT = @SPLINT@ 374SPLINT = @SPLINT@
372STRIP = @STRIP@ 375STRIP = @STRIP@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index 46edfd3..d9dbab8 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -192,6 +192,7 @@ BLAS_LIBS = @BLAS_LIBS@
192BSH = @BSH@ 192BSH = @BSH@
193CC = @CC@ 193CC = @CC@
194CCDEPMODE = @CCDEPMODE@ 194CCDEPMODE = @CCDEPMODE@
195CCSM = @CCSM@
195CFLAGS = @CFLAGS@ 196CFLAGS = @CFLAGS@
196CHECKSTYLE = @CHECKSTYLE@ 197CHECKSTYLE = @CHECKSTYLE@
197COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 198COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -250,6 +251,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
250JAVADOC = @JAVADOC@ 251JAVADOC = @JAVADOC@
251JAVAH = @JAVAH@ 252JAVAH = @JAVAH@
252JAVASCI_ENABLE = @JAVASCI_ENABLE@ 253JAVASCI_ENABLE = @JAVASCI_ENABLE@
254JAVA_CUP = @JAVA_CUP@
253JAVA_ENABLE = @JAVA_ENABLE@ 255JAVA_ENABLE = @JAVA_ENABLE@
254JAVA_G = @JAVA_G@ 256JAVA_G = @JAVA_G@
255JAVA_HOME = @JAVA_HOME@ 257JAVA_HOME = @JAVA_HOME@
@@ -342,6 +344,7 @@ SED = @SED@
342SET_MAKE = @SET_MAKE@ 344SET_MAKE = @SET_MAKE@
343SET_RELOCATABLE = @SET_RELOCATABLE@ 345SET_RELOCATABLE = @SET_RELOCATABLE@
344SHELL = @SHELL@ 346SHELL = @SHELL@
347SIMULINK = @SIMULINK@
345SKINLF = @SKINLF@ 348SKINLF = @SKINLF@
346SPLINT = @SPLINT@ 349SPLINT = @SPLINT@
347STRIP = @STRIP@ 350STRIP = @STRIP@
diff --git a/scilab/modules/history_browser/Makefile.in b/scilab/modules/history_browser/Makefile.in
index 634c99f..d3c973c 100644
--- a/scilab/modules/history_browser/Makefile.in
+++ b/scilab/modules/history_browser/Makefile.in
@@ -196,6 +196,7 @@ BLAS_LIBS = @BLAS_LIBS@
196BSH = @BSH@ 196BSH = @BSH@
197CC = @CC@ 197CC = @CC@
198CCDEPMODE = @CCDEPMODE@ 198CCDEPMODE = @CCDEPMODE@
199CCSM = @CCSM@
199CFLAGS = @CFLAGS@ 200CFLAGS = @CFLAGS@
200CHECKSTYLE = @CHECKSTYLE@ 201CHECKSTYLE = @CHECKSTYLE@
201COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 202COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -254,6 +255,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
254JAVADOC = @JAVADOC@ 255JAVADOC = @JAVADOC@
255JAVAH = @JAVAH@ 256JAVAH = @JAVAH@
256JAVASCI_ENABLE = @JAVASCI_ENABLE@ 257JAVASCI_ENABLE = @JAVASCI_ENABLE@
258JAVA_CUP = @JAVA_CUP@
257JAVA_ENABLE = @JAVA_ENABLE@ 259JAVA_ENABLE = @JAVA_ENABLE@
258JAVA_G = @JAVA_G@ 260JAVA_G = @JAVA_G@
259JAVA_HOME = @JAVA_HOME@ 261JAVA_HOME = @JAVA_HOME@
@@ -346,6 +348,7 @@ SED = @SED@
346SET_MAKE = @SET_MAKE@ 348SET_MAKE = @SET_MAKE@
347SET_RELOCATABLE = @SET_RELOCATABLE@ 349SET_RELOCATABLE = @SET_RELOCATABLE@
348SHELL = @SHELL@ 350SHELL = @SHELL@
351SIMULINK = @SIMULINK@
349SKINLF = @SKINLF@ 352SKINLF = @SKINLF@
350SPLINT = @SPLINT@ 353SPLINT = @SPLINT@
351STRIP = @STRIP@ 354STRIP = @STRIP@
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 4b77305..c98c52c 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -213,6 +213,7 @@ BLAS_LIBS = @BLAS_LIBS@
213BSH = @BSH@ 213BSH = @BSH@
214CC = @CC@ 214CC = @CC@
215CCDEPMODE = @CCDEPMODE@ 215CCDEPMODE = @CCDEPMODE@
216CCSM = @CCSM@
216CFLAGS = @CFLAGS@ 217CFLAGS = @CFLAGS@
217CHECKSTYLE = @CHECKSTYLE@ 218CHECKSTYLE = @CHECKSTYLE@
218COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 219COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -271,6 +272,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
271JAVADOC = @JAVADOC@ 272JAVADOC = @JAVADOC@
272JAVAH = @JAVAH@ 273JAVAH = @JAVAH@
273JAVASCI_ENABLE = @JAVASCI_ENABLE@ 274JAVASCI_ENABLE = @JAVASCI_ENABLE@
275JAVA_CUP = @JAVA_CUP@
274JAVA_ENABLE = @JAVA_ENABLE@ 276JAVA_ENABLE = @JAVA_ENABLE@
275JAVA_G = @JAVA_G@ 277JAVA_G = @JAVA_G@
276JAVA_HOME = @JAVA_HOME@ 278JAVA_HOME = @JAVA_HOME@
@@ -363,6 +365,7 @@ SED = @SED@
363SET_MAKE = @SET_MAKE@ 365SET_MAKE = @SET_MAKE@
364SET_RELOCATABLE = @SET_RELOCATABLE@ 366SET_RELOCATABLE = @SET_RELOCATABLE@
365SHELL = @SHELL@ 367SHELL = @SHELL@
368SIMULINK = @SIMULINK@
366SKINLF = @SKINLF@ 369SKINLF = @SKINLF@
367SPLINT = @SPLINT@ 370SPLINT = @SPLINT@
368STRIP = @STRIP@ 371STRIP = @STRIP@
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index f2d3a44..d21d552 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -200,6 +200,7 @@ BLAS_LIBS = @BLAS_LIBS@
200BSH = @BSH@ 200BSH = @BSH@
201CC = @CC@ 201CC = @CC@
202CCDEPMODE = @CCDEPMODE@ 202CCDEPMODE = @CCDEPMODE@
203CCSM = @CCSM@
203CFLAGS = @CFLAGS@ 204CFLAGS = @CFLAGS@
204CHECKSTYLE = @CHECKSTYLE@ 205CHECKSTYLE = @CHECKSTYLE@
205COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 206COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -258,6 +259,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
258JAVADOC = @JAVADOC@ 259JAVADOC = @JAVADOC@
259JAVAH = @JAVAH@ 260JAVAH = @JAVAH@
260JAVASCI_ENABLE = @JAVASCI_ENABLE@ 261JAVASCI_ENABLE = @JAVASCI_ENABLE@
262JAVA_CUP = @JAVA_CUP@
261JAVA_ENABLE = @JAVA_ENABLE@ 263JAVA_ENABLE = @JAVA_ENABLE@
262JAVA_G = @JAVA_G@ 264JAVA_G = @JAVA_G@
263JAVA_HOME = @JAVA_HOME@ 265JAVA_HOME = @JAVA_HOME@
@@ -350,6 +352,7 @@ SED = @SED@
350SET_MAKE = @SET_MAKE@ 352SET_MAKE = @SET_MAKE@
351SET_RELOCATABLE = @SET_RELOCATABLE@ 353SET_RELOCATABLE = @SET_RELOCATABLE@
352SHELL = @SHELL@ 354SHELL = @SHELL@
355SIMULINK = @SIMULINK@
353SKINLF = @SKINLF@ 356SKINLF = @SKINLF@
354SPLINT = @SPLINT@ 357SPLINT = @SPLINT@
355STRIP = @STRIP@ 358STRIP = @STRIP@
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index ddd47a7..db92c4e 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -182,6 +182,7 @@ BLAS_LIBS = @BLAS_LIBS@
182BSH = @BSH@ 182BSH = @BSH@
183CC = @CC@ 183CC = @CC@
184CCDEPMODE = @CCDEPMODE@ 184CCDEPMODE = @CCDEPMODE@
185CCSM = @CCSM@
185CFLAGS = @CFLAGS@ 186CFLAGS = @CFLAGS@
186CHECKSTYLE = @CHECKSTYLE@ 187CHECKSTYLE = @CHECKSTYLE@
187COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 188COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -240,6 +241,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
240JAVADOC = @JAVADOC@ 241JAVADOC = @JAVADOC@
241JAVAH = @JAVAH@ 242JAVAH = @JAVAH@
242JAVASCI_ENABLE = @JAVASCI_ENABLE@ 243JAVASCI_ENABLE = @JAVASCI_ENABLE@
244JAVA_CUP = @JAVA_CUP@
243JAVA_ENABLE = @JAVA_ENABLE@ 245JAVA_ENABLE = @JAVA_ENABLE@
244JAVA_G = @JAVA_G@ 246JAVA_G = @JAVA_G@
245JAVA_HOME = @JAVA_HOME@ 247JAVA_HOME = @JAVA_HOME@
@@ -332,6 +334,7 @@ SED = @SED@
332SET_MAKE = @SET_MAKE@ 334SET_MAKE = @SET_MAKE@
333SET_RELOCATABLE = @SET_RELOCATABLE@ 335SET_RELOCATABLE = @SET_RELOCATABLE@
334SHELL = @SHELL@ 336SHELL = @SHELL@
337SIMULINK = @SIMULINK@
335SKINLF = @SKINLF@ 338SKINLF = @SKINLF@
336SPLINT = @SPLINT@ 339SPLINT = @SPLINT@
337STRIP = @STRIP@ 340STRIP = @STRIP@
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 2a8e00c..4f54491 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -167,6 +167,7 @@ BLAS_LIBS = @BLAS_LIBS@
167BSH = @BSH@ 167BSH = @BSH@
168CC = @CC@ 168CC = @CC@
169CCDEPMODE = @CCDEPMODE@ 169CCDEPMODE = @CCDEPMODE@
170CCSM = @CCSM@
170CFLAGS = @CFLAGS@ 171CFLAGS = @CFLAGS@
171CHECKSTYLE = @CHECKSTYLE@ 172CHECKSTYLE = @CHECKSTYLE@
172COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 173COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -225,6 +226,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
225JAVADOC = @JAVADOC@ 226JAVADOC = @JAVADOC@
226JAVAH = @JAVAH@ 227JAVAH = @JAVAH@
227JAVASCI_ENABLE = @JAVASCI_ENABLE@ 228JAVASCI_ENABLE = @JAVASCI_ENABLE@
229JAVA_CUP = @JAVA_CUP@
228JAVA_ENABLE = @JAVA_ENABLE@ 230JAVA_ENABLE = @JAVA_ENABLE@
229JAVA_G = @JAVA_G@ 231JAVA_G = @JAVA_G@
230JAVA_HOME = @JAVA_HOME@ 232JAVA_HOME = @JAVA_HOME@
@@ -317,6 +319,7 @@ SED = @SED@
317SET_MAKE = @SET_MAKE@ 319SET_MAKE = @SET_MAKE@
318SET_RELOCATABLE = @SET_RELOCATABLE@ 320SET_RELOCATABLE = @SET_RELOCATABLE@
319SHELL = @SHELL@ 321SHELL = @SHELL@
322SIMULINK = @SIMULINK@
320SKINLF = @SKINLF@ 323SKINLF = @SKINLF@
321SPLINT = @SPLINT@ 324SPLINT = @SPLINT@
322STRIP = @STRIP@ 325STRIP = @STRIP@
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 66c0cc7..39a3414 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -179,6 +179,7 @@ BLAS_LIBS = @BLAS_LIBS@
179BSH = @BSH@ 179BSH = @BSH@
180CC = @CC@ 180CC = @CC@
181CCDEPMODE = @CCDEPMODE@ 181CCDEPMODE = @CCDEPMODE@
182CCSM = @CCSM@
182CFLAGS = @CFLAGS@ 183CFLAGS = @CFLAGS@
183CHECKSTYLE = @CHECKSTYLE@ 184CHECKSTYLE = @CHECKSTYLE@
184COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 185COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -237,6 +238,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
237JAVADOC = @JAVADOC@ 238JAVADOC = @JAVADOC@
238JAVAH = @JAVAH@ 239JAVAH = @JAVAH@
239JAVASCI_ENABLE = @JAVASCI_ENABLE@ 240JAVASCI_ENABLE = @JAVASCI_ENABLE@
241JAVA_CUP = @JAVA_CUP@
240JAVA_ENABLE = @JAVA_ENABLE@ 242JAVA_ENABLE = @JAVA_ENABLE@
241JAVA_G = @JAVA_G@ 243JAVA_G = @JAVA_G@
242JAVA_HOME = @JAVA_HOME@ 244JAVA_HOME = @JAVA_HOME@
@@ -329,6 +331,7 @@ SED = @SED@
329SET_MAKE = @SET_MAKE@ 331SET_MAKE = @SET_MAKE@
330SET_RELOCATABLE = @SET_RELOCATABLE@ 332SET_RELOCATABLE = @SET_RELOCATABLE@
331SHELL = @SHELL@ 333SHELL = @SHELL@
334SIMULINK = @SIMULINK@
332SKINLF = @SKINLF@ 335SKINLF = @SKINLF@
333SPLINT = @SPLINT@ 336SPLINT = @SPLINT@
334STRIP = @STRIP@ 337STRIP = @STRIP@
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index d519dc5..0983325 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -193,6 +193,7 @@ BLAS_LIBS = @BLAS_LIBS@
193BSH = @BSH@ 193BSH = @BSH@
194CC = @CC@ 194CC = @CC@
195CCDEPMODE = @CCDEPMODE@ 195CCDEPMODE = @CCDEPMODE@
196CCSM = @CCSM@
196CFLAGS = @CFLAGS@ 197CFLAGS = @CFLAGS@
197CHECKSTYLE = @CHECKSTYLE@ 198CHECKSTYLE = @CHECKSTYLE@
198COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 199COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -251,6 +252,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
251JAVADOC = @JAVADOC@ 252JAVADOC = @JAVADOC@
252JAVAH = @JAVAH@ 253JAVAH = @JAVAH@
253JAVASCI_ENABLE = @JAVASCI_ENABLE@ 254JAVASCI_ENABLE = @JAVASCI_ENABLE@
255JAVA_CUP = @JAVA_CUP@
254JAVA_ENABLE = @JAVA_ENABLE@ 256JAVA_ENABLE = @JAVA_ENABLE@
255JAVA_G = @JAVA_G@ 257JAVA_G = @JAVA_G@
256JAVA_HOME = @JAVA_HOME@ 258JAVA_HOME = @JAVA_HOME@
@@ -343,6 +345,7 @@ SED = @SED@
343SET_MAKE = @SET_MAKE@ 345SET_MAKE = @SET_MAKE@
344SET_RELOCATABLE = @SET_RELOCATABLE@ 346SET_RELOCATABLE = @SET_RELOCATABLE@
345SHELL = @SHELL@ 347SHELL = @SHELL@
348SIMULINK = @SIMULINK@
346SKINLF = @SKINLF@ 349SKINLF = @SKINLF@
347SPLINT = @SPLINT@ 350SPLINT = @SPLINT@
348STRIP = @STRIP@ 351STRIP = @STRIP@
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index b6e7100..fc9bd04 100644
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -194,6 +194,7 @@ BLAS_LIBS = @BLAS_LIBS@
194BSH = @BSH@ 194BSH = @BSH@
195CC = @CC@ 195CC = @CC@
196CCDEPMODE = @CCDEPMODE@ 196CCDEPMODE = @CCDEPMODE@
197CCSM = @CCSM@
197CFLAGS = @CFLAGS@ 198CFLAGS = @CFLAGS@
198CHECKSTYLE = @CHECKSTYLE@ 199CHECKSTYLE = @CHECKSTYLE@
199COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 200COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -252,6 +253,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
252JAVADOC = @JAVADOC@ 253JAVADOC = @JAVADOC@
253JAVAH = @JAVAH@ 254JAVAH = @JAVAH@
254JAVASCI_ENABLE = @JAVASCI_ENABLE@ 255JAVASCI_ENABLE = @JAVASCI_ENABLE@
256JAVA_CUP = @JAVA_CUP@
255JAVA_ENABLE = @JAVA_ENABLE@ 257JAVA_ENABLE = @JAVA_ENABLE@
256JAVA_G = @JAVA_G@ 258JAVA_G = @JAVA_G@
257JAVA_HOME = @JAVA_HOME@ 259JAVA_HOME = @JAVA_HOME@
@@ -344,6 +346,7 @@ SED = @SED@
344SET_MAKE = @SET_MAKE@ 346SET_MAKE = @SET_MAKE@
345SET_RELOCATABLE = @SET_RELOCATABLE@ 347SET_RELOCATABLE = @SET_RELOCATABLE@
346SHELL = @SHELL@ 348SHELL = @SHELL@
349SIMULINK = @SIMULINK@
347SKINLF = @SKINLF@ 350SKINLF = @SKINLF@
348SPLINT = @SPLINT@ 351SPLINT = @SPLINT@
349STRIP = @STRIP@ 352STRIP = @STRIP@
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index e1863be..c0ca44d 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -203,6 +203,7 @@ BLAS_LIBS = @BLAS_LIBS@
203BSH = @BSH@ 203BSH = @BSH@
204CC = @CC@ 204CC = @CC@
205CCDEPMODE = @CCDEPMODE@ 205CCDEPMODE = @CCDEPMODE@
206CCSM = @CCSM@
206CFLAGS = @CFLAGS@ 207CFLAGS = @CFLAGS@
207CHECKSTYLE = @CHECKSTYLE@ 208CHECKSTYLE = @CHECKSTYLE@
208COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 209COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -261,6 +262,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
261JAVADOC = @JAVADOC@ 262JAVADOC = @JAVADOC@
262JAVAH = @JAVAH@ 263JAVAH = @JAVAH@
263JAVASCI_ENABLE = @JAVASCI_ENABLE@ 264JAVASCI_ENABLE = @JAVASCI_ENABLE@
265JAVA_CUP = @JAVA_CUP@
264JAVA_ENABLE = @JAVA_ENABLE@ 266JAVA_ENABLE = @JAVA_ENABLE@
265JAVA_G = @JAVA_G@ 267JAVA_G = @JAVA_G@
266JAVA_HOME = @JAVA_HOME@ 268JAVA_HOME = @JAVA_HOME@
@@ -353,6 +355,7 @@ SED = @SED@
353SET_MAKE = @SET_MAKE@ 355SET_MAKE = @SET_MAKE@
354SET_RELOCATABLE = @SET_RELOCATABLE@ 356SET_RELOCATABLE = @SET_RELOCATABLE@
355SHELL = @SHELL@ 357SHELL = @SHELL@
358SIMULINK = @SIMULINK@
356SKINLF = @SKINLF@ 359SKINLF = @SKINLF@
357SPLINT = @SPLINT@ 360SPLINT = @SPLINT@
358STRIP = @STRIP@ 361STRIP = @STRIP@
diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index cc3d05c..0120461 100644
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -196,6 +196,7 @@ BLAS_LIBS = @BLAS_LIBS@
196BSH = @BSH@ 196BSH = @BSH@
197CC = @CC@ 197CC = @CC@
198CCDEPMODE = @CCDEPMODE@ 198CCDEPMODE = @CCDEPMODE@
199CCSM = @CCSM@
199CFLAGS = @CFLAGS@ 200CFLAGS = @CFLAGS@
200CHECKSTYLE = @CHECKSTYLE@ 201CHECKSTYLE = @CHECKSTYLE@
201COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 202COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -254,6 +255,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
254JAVADOC = @JAVADOC@ 255JAVADOC = @JAVADOC@
255JAVAH = @JAVAH@ 256JAVAH = @JAVAH@
256JAVASCI_ENABLE = @JAVASCI_ENABLE@ 257JAVASCI_ENABLE = @JAVASCI_ENABLE@
258JAVA_CUP = @JAVA_CUP@
257JAVA_ENABLE = @JAVA_ENABLE@ 259JAVA_ENABLE = @JAVA_ENABLE@
258JAVA_G = @JAVA_G@ 260JAVA_G = @JAVA_G@
259JAVA_HOME = @JAVA_HOME@ 261JAVA_HOME = @JAVA_HOME@
@@ -346,6 +348,7 @@ SED = @SED@
346SET_MAKE = @SET_MAKE@ 348SET_MAKE = @SET_MAKE@
347SET_RELOCATABLE = @SET_RELOCATABLE@ 349SET_RELOCATABLE = @SET_RELOCATABLE@
348SHELL = @SHELL@ 350SHELL = @SHELL@
351SIMULINK = @SIMULINK@
349SKINLF = @SKINLF@ 352SKINLF = @SKINLF@
350SPLINT = @SPLINT@ 353SPLINT = @SPLINT@
351STRIP = @STRIP@ 354STRIP = @STRIP@
diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index 22fb7b0..abb5222 100644
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -124,6 +124,7 @@ BLAS_LIBS = @BLAS_LIBS@
124BSH = @BSH@ 124BSH = @BSH@
125CC = @CC@ 125CC = @CC@
126CCDEPMODE = @CCDEPMODE@ 126CCDEPMODE = @CCDEPMODE@
127CCSM = @CCSM@
127CFLAGS = @CFLAGS@ 128CFLAGS = @CFLAGS@
128CHECKSTYLE = @CHECKSTYLE@ 129CHECKSTYLE = @CHECKSTYLE@
129COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 130COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -182,6 +183,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
182JAVADOC = @JAVADOC@ 183JAVADOC = @JAVADOC@
183JAVAH = @JAVAH@ 184JAVAH = @JAVAH@
184JAVASCI_ENABLE = @JAVASCI_ENABLE@ 185JAVASCI_ENABLE = @JAVASCI_ENABLE@
186JAVA_CUP = @JAVA_CUP@
185JAVA_ENABLE = @JAVA_ENABLE@ 187JAVA_ENABLE = @JAVA_ENABLE@
186JAVA_G = @JAVA_G@ 188JAVA_G = @JAVA_G@
187JAVA_HOME = @JAVA_HOME@ 189JAVA_HOME = @JAVA_HOME@
@@ -274,6 +276,7 @@ SED = @SED@
274SET_MAKE = @SET_MAKE@ 276SET_MAKE = @SET_MAKE@
275SET_RELOCATABLE = @SET_RELOCATABLE@ 277SET_RELOCATABLE = @SET_RELOCATABLE@
276SHELL = @SHELL@ 278SHELL = @SHELL@
279SIMULINK = @SIMULINK@
277SKINLF = @SKINLF@ 280SKINLF = @SKINLF@
278SPLINT = @SPLINT@ 281SPLINT = @SPLINT@
279STRIP = @STRIP@ 282STRIP = @STRIP@
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index 41a44b8..03b7e41 100644
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -124,6 +124,7 @@ BLAS_LIBS = @BLAS_LIBS@
124BSH = @BSH@ 124BSH = @BSH@
125CC = @CC@ 125CC = @CC@
126CCDEPMODE = @CCDEPMODE@ 126CCDEPMODE = @CCDEPMODE@
127CCSM = @CCSM@
127CFLAGS = @CFLAGS@ 128CFLAGS = @CFLAGS@
128CHECKSTYLE = @CHECKSTYLE@ 129CHECKSTYLE = @CHECKSTYLE@
129COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 130COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -182,6 +183,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
182JAVADOC = @JAVADOC@ 183JAVADOC = @JAVADOC@
183JAVAH = @JAVAH@ 184JAVAH = @JAVAH@
184JAVASCI_ENABLE = @JAVASCI_ENABLE@ 185JAVASCI_ENABLE = @JAVASCI_ENABLE@
186JAVA_CUP = @JAVA_CUP@
185JAVA_ENABLE = @JAVA_ENABLE@ 187JAVA_ENABLE = @JAVA_ENABLE@
186JAVA_G = @JAVA_G@ 188JAVA_G = @JAVA_G@
187JAVA_HOME = @JAVA_HOME@ 189JAVA_HOME = @JAVA_HOME@
@@ -274,6 +276,7 @@ SED = @SED@
274SET_MAKE = @SET_MAKE@ 276SET_MAKE = @SET_MAKE@
275SET_RELOCATABLE = @SET_RELOCATABLE@ 277SET_RELOCATABLE = @SET_RELOCATABLE@
276SHELL = @SHELL@ 278SHELL = @SHELL@
279SIMULINK = @SIMULINK@
277SKINLF = @SKINLF@ 280SKINLF = @SKINLF@
278SPLINT = @SPLINT@ 281SPLINT = @SPLINT@
279STRIP = @STRIP@ 282STRIP = @STRIP@
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in
index ff87475..9506c3b 100644
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -191,6 +191,7 @@ BLAS_LIBS = @BLAS_LIBS@
191BSH = @BSH@ 191BSH = @BSH@
192CC = @CC@ 192CC = @CC@
193CCDEPMODE = @CCDEPMODE@ 193CCDEPMODE = @CCDEPMODE@
194CCSM = @CCSM@
194CFLAGS = @CFLAGS@ 195CFLAGS = @CFLAGS@
195CHECKSTYLE = @CHECKSTYLE@ 196CHECKSTYLE = @CHECKSTYLE@
196COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 197COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -249,6 +250,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
249JAVADOC = @JAVADOC@ 250JAVADOC = @JAVADOC@
250JAVAH = @JAVAH@ 251JAVAH = @JAVAH@
251JAVASCI_ENABLE = @JAVASCI_ENABLE@ 252JAVASCI_ENABLE = @JAVASCI_ENABLE@
253JAVA_CUP = @JAVA_CUP@
252JAVA_ENABLE = @JAVA_ENABLE@ 254JAVA_ENABLE = @JAVA_ENABLE@
253JAVA_G = @JAVA_G@ 255JAVA_G = @JAVA_G@
254JAVA_HOME = @JAVA_HOME@ 256JAVA_HOME = @JAVA_HOME@
@@ -341,6 +343,7 @@ SED = @SED@
341SET_MAKE = @SET_MAKE@ 343SET_MAKE = @SET_MAKE@
342SET_RELOCATABLE = @SET_RELOCATABLE@ 344SET_RELOCATABLE = @SET_RELOCATABLE@
343SHELL = @SHELL@ 345SHELL = @SHELL@
346SIMULINK = @SIMULINK@
344SKINLF = @SKINLF@ 347SKINLF = @SKINLF@
345SPLINT = @SPLINT@ 348SPLINT = @SPLINT@
346STRIP = @STRIP@ 349STRIP = @STRIP@
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index b7bbafe..0421f7f 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -168,6 +168,7 @@ BLAS_LIBS = @BLAS_LIBS@
168BSH = @BSH@ 168BSH = @BSH@
169CC = @CC@ 169CC = @CC@
170CCDEPMODE = @CCDEPMODE@ 170CCDEPMODE = @CCDEPMODE@
171CCSM = @CCSM@
171CFLAGS = @CFLAGS@ 172CFLAGS = @CFLAGS@
172CHECKSTYLE = @CHECKSTYLE@ 173CHECKSTYLE = @CHECKSTYLE@
173COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 174COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -226,6 +227,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
226JAVADOC = @JAVADOC@ 227JAVADOC = @JAVADOC@
227JAVAH = @JAVAH@ 228JAVAH = @JAVAH@
228JAVASCI_ENABLE = @JAVASCI_ENABLE@ 229JAVASCI_ENABLE = @JAVASCI_ENABLE@
230JAVA_CUP = @JAVA_CUP@
229JAVA_ENABLE = @JAVA_ENABLE@ 231JAVA_ENABLE = @JAVA_ENABLE@
230JAVA_G = @JAVA_G@ 232JAVA_G = @JAVA_G@
231JAVA_HOME = @JAVA_HOME@ 233JAVA_HOME = @JAVA_HOME@
@@ -318,6 +320,7 @@ SED = @SED@
318SET_MAKE = @SET_MAKE@ 320SET_MAKE = @SET_MAKE@
319SET_RELOCATABLE = @SET_RELOCATABLE@ 321SET_RELOCATABLE = @SET_RELOCATABLE@
320SHELL = @SHELL@ 322SHELL = @SHELL@
323SIMULINK = @SIMULINK@
321SKINLF = @SKINLF@ 324SKINLF = @SKINLF@
322SPLINT = @SPLINT@ 325SPLINT = @SPLINT@
323STRIP = @STRIP@ 326STRIP = @STRIP@
diff --git a/scilab/modules/modules_manager/Makefile.in b/scilab/modules/modules_manager/Makefile.in
index 47de085..ef4949c 100644
--- a/scilab/modules/modules_manager/Makefile.in
+++ b/scilab/modules/modules_manager/Makefile.in
@@ -125,6 +125,7 @@ BLAS_LIBS = @BLAS_LIBS@
125BSH = @BSH@ 125BSH = @BSH@
126CC = @CC@ 126CC = @CC@
127CCDEPMODE = @CCDEPMODE@ 127CCDEPMODE = @CCDEPMODE@
128CCSM = @CCSM@
128CFLAGS = @CFLAGS@ 129CFLAGS = @CFLAGS@
129CHECKSTYLE = @CHECKSTYLE@ 130CHECKSTYLE = @CHECKSTYLE@
130COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 131COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -183,6 +184,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
183JAVADOC = @JAVADOC@ 184JAVADOC = @JAVADOC@
184JAVAH = @JAVAH@ 185JAVAH = @JAVAH@
185JAVASCI_ENABLE = @JAVASCI_ENABLE@ 186JAVASCI_ENABLE = @JAVASCI_ENABLE@
187JAVA_CUP = @JAVA_CUP@
186JAVA_ENABLE = @JAVA_ENABLE@ 188JAVA_ENABLE = @JAVA_ENABLE@
187JAVA_G = @JAVA_G@ 189JAVA_G = @JAVA_G@
188JAVA_HOME = @JAVA_HOME@ 190JAVA_HOME = @JAVA_HOME@
@@ -275,6 +277,7 @@ SED = @SED@
275SET_MAKE = @SET_MAKE@ 277SET_MAKE = @SET_MAKE@
276SET_RELOCATABLE = @SET_RELOCATABLE@ 278SET_RELOCATABLE = @SET_RELOCATABLE@
277SHELL = @SHELL@ 279SHELL = @SHELL@
280SIMULINK = @SIMULINK@
278SKINLF = @SKINLF@ 281SKINLF = @SKINLF@
279SPLINT = @SPLINT@ 282SPLINT = @SPLINT@
280STRIP = @STRIP@ 283STRIP = @STRIP@
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index edf9328..f1d5357 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -193,6 +193,7 @@ BLAS_LIBS = @BLAS_LIBS@
193BSH = @BSH@ 193BSH = @BSH@
194CC = @CC@ 194CC = @CC@
195CCDEPMODE = @CCDEPMODE@ 195CCDEPMODE = @CCDEPMODE@
196CCSM = @CCSM@
196CFLAGS = @CFLAGS@ 197CFLAGS = @CFLAGS@
197CHECKSTYLE = @CHECKSTYLE@ 198CHECKSTYLE = @CHECKSTYLE@
198COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 199COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -251,6 +252,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
251JAVADOC = @JAVADOC@ 252JAVADOC = @JAVADOC@
252JAVAH = @JAVAH@ 253JAVAH = @JAVAH@
253JAVASCI_ENABLE = @JAVASCI_ENABLE@ 254JAVASCI_ENABLE = @JAVASCI_ENABLE@
255JAVA_CUP = @JAVA_CUP@
254JAVA_ENABLE = @JAVA_ENABLE@ 256JAVA_ENABLE = @JAVA_ENABLE@
255JAVA_G = @JAVA_G@ 257JAVA_G = @JAVA_G@
256JAVA_HOME = @JAVA_HOME@ 258JAVA_HOME = @JAVA_HOME@
@@ -343,6 +345,7 @@ SED = @SED@
343SET_MAKE = @SET_MAKE@ 345SET_MAKE = @SET_MAKE@
344SET_RELOCATABLE = @SET_RELOCATABLE@ 346SET_RELOCATABLE = @SET_RELOCATABLE@
345SHELL = @SHELL@ 347SHELL = @SHELL@
348SIMULINK = @SIMULINK@
346SKINLF = @SKINLF@ 349SKINLF = @SKINLF@
347SPLINT = @SPLINT@ 350SPLINT = @SPLINT@
348STRIP = @STRIP@ 351STRIP = @STRIP@
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index de9e105..5187e02 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -210,6 +210,7 @@ BLAS_LIBS = @BLAS_LIBS@
210BSH = @BSH@ 210BSH = @BSH@
211CC = @CC@ 211CC = @CC@
212CCDEPMODE = @CCDEPMODE@ 212CCDEPMODE = @CCDEPMODE@
213CCSM = @CCSM@
213CFLAGS = @CFLAGS@ 214CFLAGS = @CFLAGS@
214CHECKSTYLE = @CHECKSTYLE@ 215CHECKSTYLE = @CHECKSTYLE@
215COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 216COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -268,6 +269,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
268JAVADOC = @JAVADOC@ 269JAVADOC = @JAVADOC@
269JAVAH = @JAVAH@ 270JAVAH = @JAVAH@
270JAVASCI_ENABLE = @JAVASCI_ENABLE@ 271JAVASCI_ENABLE = @JAVASCI_ENABLE@
272JAVA_CUP = @JAVA_CUP@
271JAVA_ENABLE = @JAVA_ENABLE@ 273JAVA_ENABLE = @JAVA_ENABLE@
272JAVA_G = @JAVA_G@ 274JAVA_G = @JAVA_G@
273JAVA_HOME = @JAVA_HOME@ 275JAVA_HOME = @JAVA_HOME@
@@ -360,6 +362,7 @@ SED = @SED@
360SET_MAKE = @SET_MAKE@ 362SET_MAKE = @SET_MAKE@
361SET_RELOCATABLE = @SET_RELOCATABLE@ 363SET_RELOCATABLE = @SET_RELOCATABLE@
362SHELL = @SHELL@ 364SHELL = @SHELL@
365SIMULINK = @SIMULINK@
363SKINLF = @SKINLF@ 366SKINLF = @SKINLF@
364SPLINT = @SPLINT@ 367SPLINT = @SPLINT@
365STRIP = @STRIP@ 368STRIP = @STRIP@
diff --git a/scilab/modules/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index 4cf09a5..5faa80c 100644
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -125,6 +125,7 @@ BLAS_LIBS = @BLAS_LIBS@
125BSH = @BSH@ 125BSH = @BSH@
126CC = @CC@ 126CC = @CC@
127CCDEPMODE = @CCDEPMODE@ 127CCDEPMODE = @CCDEPMODE@
128CCSM = @CCSM@
128CFLAGS = @CFLAGS@ 129CFLAGS = @CFLAGS@
129CHECKSTYLE = @CHECKSTYLE@ 130CHECKSTYLE = @CHECKSTYLE@
130COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 131COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -183,6 +184,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
183JAVADOC = @JAVADOC@ 184JAVADOC = @JAVADOC@
184JAVAH = @JAVAH@ 185JAVAH = @JAVAH@
185JAVASCI_ENABLE = @JAVASCI_ENABLE@ 186JAVASCI_ENABLE = @JAVASCI_ENABLE@
187JAVA_CUP = @JAVA_CUP@
186JAVA_ENABLE = @JAVA_ENABLE@ 188JAVA_ENABLE = @JAVA_ENABLE@
187JAVA_G = @JAVA_G@ 189JAVA_G = @JAVA_G@
188JAVA_HOME = @JAVA_HOME@ 190JAVA_HOME = @JAVA_HOME@
@@ -275,6 +277,7 @@ SED = @SED@
275SET_MAKE = @SET_MAKE@ 277SET_MAKE = @SET_MAKE@
276SET_RELOCATABLE = @SET_RELOCATABLE@ 278SET_RELOCATABLE = @SET_RELOCATABLE@
277SHELL = @SHELL@ 279SHELL = @SHELL@
280SIMULINK = @SIMULINK@
278SKINLF = @SKINLF@ 281SKINLF = @SKINLF@
279SPLINT = @SPLINT@ 282SPLINT = @SPLINT@
280STRIP = @STRIP@ 283STRIP = @STRIP@
diff --git a/scilab/modules/parallel/Makefile.in b/scilab/modules/parallel/Makefile.in
index 67e17d9..ac02db2 100644
--- a/scilab/modules/parallel/Makefile.in
+++ b/scilab/modules/parallel/Makefile.in
@@ -179,6 +179,7 @@ BLAS_LIBS = @BLAS_LIBS@
179BSH = @BSH@ 179BSH = @BSH@
180CC = @CC@ 180CC = @CC@
181CCDEPMODE = @CCDEPMODE@ 181CCDEPMODE = @CCDEPMODE@
182CCSM = @CCSM@
182CFLAGS = @CFLAGS@ 183CFLAGS = @CFLAGS@
183CHECKSTYLE = @CHECKSTYLE@ 184CHECKSTYLE = @CHECKSTYLE@
184COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 185COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -237,6 +238,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
237JAVADOC = @JAVADOC@ 238JAVADOC = @JAVADOC@
238JAVAH = @JAVAH@ 239JAVAH = @JAVAH@
239JAVASCI_ENABLE = @JAVASCI_ENABLE@ 240JAVASCI_ENABLE = @JAVASCI_ENABLE@
241JAVA_CUP = @JAVA_CUP@
240JAVA_ENABLE = @JAVA_ENABLE@ 242JAVA_ENABLE = @JAVA_ENABLE@
241JAVA_G = @JAVA_G@ 243JAVA_G = @JAVA_G@
242JAVA_HOME = @JAVA_HOME@ 244JAVA_HOME = @JAVA_HOME@
@@ -329,6 +331,7 @@ SED = @SED@
329SET_MAKE = @SET_MAKE@ 331SET_MAKE = @SET_MAKE@
330SET_RELOCATABLE = @SET_RELOCATABLE@ 332SET_RELOCATABLE = @SET_RELOCATABLE@
331SHELL = @SHELL@ 333SHELL = @SHELL@
334SIMULINK = @SIMULINK@
332SKINLF = @SKINLF@ 335SKINLF = @SKINLF@
333SPLINT = @SPLINT@ 336SPLINT = @SPLINT@
334STRIP = @STRIP@ 337STRIP = @STRIP@
diff --git a/scilab/modules/parameters/Makefile.in b/scilab/modules/parameters/Makefile.in
index 2ff78c5..0cb9ffb 100644
--- a/scilab/modules/parameters/Makefile.in
+++ b/scilab/modules/parameters/Makefile.in
@@ -157,6 +157,7 @@ BLAS_LIBS = @BLAS_LIBS@
157BSH = @BSH@ 157BSH = @BSH@
158CC = @CC@ 158CC = @CC@
159CCDEPMODE = @CCDEPMODE@ 159CCDEPMODE = @CCDEPMODE@
160CCSM = @CCSM@
160CFLAGS = @CFLAGS@ 161CFLAGS = @CFLAGS@
161CHECKSTYLE = @CHECKSTYLE@ 162CHECKSTYLE = @CHECKSTYLE@
162COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 163COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -215,6 +216,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
215JAVADOC = @JAVADOC@ 216JAVADOC = @JAVADOC@
216JAVAH = @JAVAH@ 217JAVAH = @JAVAH@
217JAVASCI_ENABLE = @JAVASCI_ENABLE@ 218JAVASCI_ENABLE = @JAVASCI_ENABLE@
219JAVA_CUP = @JAVA_CUP@
218JAVA_ENABLE = @JAVA_ENABLE@ 220JAVA_ENABLE = @JAVA_ENABLE@
219JAVA_G = @JAVA_G@ 221JAVA_G = @JAVA_G@
220JAVA_HOME = @JAVA_HOME@ 222JAVA_HOME = @JAVA_HOME@
@@ -307,6 +309,7 @@ SED = @SED@
307SET_MAKE = @SET_MAKE@ 309SET_MAKE = @SET_MAKE@
308SET_RELOCATABLE = @SET_RELOCATABLE@ 310SET_RELOCATABLE = @SET_RELOCATABLE@
309SHELL = @SHELL@ 311SHELL = @SHELL@
312SIMULINK = @SIMULINK@
310SKINLF = @SKINLF@ 313SKINLF = @SKINLF@
311SPLINT = @SPLINT@ 314SPLINT = @SPLINT@
312STRIP = @STRIP@ 315STRIP = @STRIP@
diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index 5d8f44c..3a94e25 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -197,6 +197,7 @@ BLAS_LIBS = @BLAS_LIBS@
197BSH = @BSH@ 197BSH = @BSH@
198CC = @CC@ 198CC = @CC@
199CCDEPMODE = @CCDEPMODE@ 199CCDEPMODE = @CCDEPMODE@
200CCSM = @CCSM@
200CFLAGS = @CFLAGS@ 201CFLAGS = @CFLAGS@
201CHECKSTYLE = @CHECKSTYLE@ 202CHECKSTYLE = @CHECKSTYLE@
202COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 203COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -255,6 +256,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
255JAVADOC = @JAVADOC@ 256JAVADOC = @JAVADOC@
256JAVAH = @JAVAH@ 257JAVAH = @JAVAH@
257JAVASCI_ENABLE = @JAVASCI_ENABLE@ 258JAVASCI_ENABLE = @JAVASCI_ENABLE@
259JAVA_CUP = @JAVA_CUP@
258JAVA_ENABLE = @JAVA_ENABLE@ 260JAVA_ENABLE = @JAVA_ENABLE@
259JAVA_G = @JAVA_G@ 261JAVA_G = @JAVA_G@
260JAVA_HOME = @JAVA_HOME@ 262JAVA_HOME = @JAVA_HOME@
@@ -347,6 +349,7 @@ SED = @SED@
347SET_MAKE = @SET_MAKE@ 349SET_MAKE = @SET_MAKE@
348SET_RELOCATABLE = @SET_RELOCATABLE@ 350SET_RELOCATABLE = @SET_RELOCATABLE@
349SHELL = @SHELL@ 351SHELL = @SHELL@
352SIMULINK = @SIMULINK@
350SKINLF = @SKINLF@ 353SKINLF = @SKINLF@
351SPLINT = @SPLINT@ 354SPLINT = @SPLINT@
352STRIP = @STRIP@ 355STRIP = @STRIP@
diff --git a/scilab/modules/pvm/Makefile.in b/scilab/modules/pvm/Makefile.in
index 8f5f2f9..7027642 100644
--- a/scilab/modules/pvm/Makefile.in
+++ b/scilab/modules/pvm/Makefile.in
@@ -237,6 +237,7 @@ BLAS_LIBS = @BLAS_LIBS@
237BSH = @BSH@ 237BSH = @BSH@
238CC = @CC@ 238CC = @CC@
239CCDEPMODE = @CCDEPMODE@ 239CCDEPMODE = @CCDEPMODE@
240CCSM = @CCSM@
240CFLAGS = @CFLAGS@ 241CFLAGS = @CFLAGS@
241CHECKSTYLE = @CHECKSTYLE@ 242CHECKSTYLE = @CHECKSTYLE@
242COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 243COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -295,6 +296,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
295JAVADOC = @JAVADOC@ 296JAVADOC = @JAVADOC@
296JAVAH = @JAVAH@ 297JAVAH = @JAVAH@
297JAVASCI_ENABLE = @JAVASCI_ENABLE@ 298JAVASCI_ENABLE = @JAVASCI_ENABLE@
299JAVA_CUP = @JAVA_CUP@
298JAVA_ENABLE = @JAVA_ENABLE@ 300JAVA_ENABLE = @JAVA_ENABLE@
299JAVA_G = @JAVA_G@ 301JAVA_G = @JAVA_G@
300JAVA_HOME = @JAVA_HOME@ 302JAVA_HOME = @JAVA_HOME@
@@ -387,6 +389,7 @@ SED = @SED@
387SET_MAKE = @SET_MAKE@ 389SET_MAKE = @SET_MAKE@
388SET_RELOCATABLE = @SET_RELOCATABLE@ 390SET_RELOCATABLE = @SET_RELOCATABLE@
389SHELL = @SHELL@ 391SHELL = @SHELL@
392SIMULINK = @SIMULINK@
390SKINLF = @SKINLF@ 393SKINLF = @SKINLF@
391SPLINT = @SPLINT@ 394SPLINT = @SPLINT@
392STRIP = @STRIP@ 395STRIP = @STRIP@
diff --git a/scilab/modules/randlib/Makefile.in b/scilab/modules/randlib/Makefile.in
index 18c8094..c79fde8 100644
--- a/scilab/modules/randlib/Makefile.in
+++ b/scilab/modules/randlib/Makefile.in
@@ -171,6 +171,7 @@ BLAS_LIBS = @BLAS_LIBS@
171BSH = @BSH@ 171BSH = @BSH@
172CC = @CC@ 172CC = @CC@
173CCDEPMODE = @CCDEPMODE@ 173CCDEPMODE = @CCDEPMODE@
174CCSM = @CCSM@
174CFLAGS = @CFLAGS@ 175CFLAGS = @CFLAGS@
175CHECKSTYLE = @CHECKSTYLE@ 176CHECKSTYLE = @CHECKSTYLE@
176COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 177COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -229,6 +230,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
229JAVADOC = @JAVADOC@ 230JAVADOC = @JAVADOC@
230JAVAH = @JAVAH@ 231JAVAH = @JAVAH@
231JAVASCI_ENABLE = @JAVASCI_ENABLE@ 232JAVASCI_ENABLE = @JAVASCI_ENABLE@
233JAVA_CUP = @JAVA_CUP@
232JAVA_ENABLE = @JAVA_ENABLE@ 234JAVA_ENABLE = @JAVA_ENABLE@
233JAVA_G = @JAVA_G@ 235JAVA_G = @JAVA_G@
234JAVA_HOME = @JAVA_HOME@ 236JAVA_HOME = @JAVA_HOME@
@@ -321,6 +323,7 @@ SED = @SED@
321SET_MAKE = @SET_MAKE@ 323SET_MAKE = @SET_MAKE@
322SET_RELOCATABLE = @SET_RELOCATABLE@ 324SET_RELOCATABLE = @SET_RELOCATABLE@
323SHELL = @SHELL@ 325SHELL = @SHELL@
326SIMULINK = @SIMULINK@
324SKINLF = @SKINLF@ 327SKINLF = @SKINLF@
325SPLINT = @SPLINT@ 328SPLINT = @SPLINT@
326STRIP = @STRIP@ 329STRIP = @STRIP@
diff --git a/scilab/modules/renderer/Makefile.in b/scilab/modules/renderer/Makefile.in
index 3a2933c..76806ab 100644
--- a/scilab/modules/renderer/Makefile.in
+++ b/scilab/modules/renderer/Makefile.in
@@ -421,6 +421,7 @@ BLAS_LIBS = @BLAS_LIBS@
421BSH = @BSH@ 421BSH = @BSH@
422CC = @CC@ 422CC = @CC@
423CCDEPMODE = @CCDEPMODE@ 423CCDEPMODE = @CCDEPMODE@
424CCSM = @CCSM@
424CFLAGS = @CFLAGS@ 425CFLAGS = @CFLAGS@
425CHECKSTYLE = @CHECKSTYLE@ 426CHECKSTYLE = @CHECKSTYLE@
426COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 427COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -479,6 +480,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
479JAVADOC = @JAVADOC@ 480JAVADOC = @JAVADOC@
480JAVAH = @JAVAH@ 481JAVAH = @JAVAH@
481JAVASCI_ENABLE = @JAVASCI_ENABLE@ 482JAVASCI_ENABLE = @JAVASCI_ENABLE@
483JAVA_CUP = @JAVA_CUP@
482JAVA_ENABLE = @JAVA_ENABLE@ 484JAVA_ENABLE = @JAVA_ENABLE@
483JAVA_G = @JAVA_G@ 485JAVA_G = @JAVA_G@
484JAVA_HOME = @JAVA_HOME@ 486JAVA_HOME = @JAVA_HOME@
@@ -571,6 +573,7 @@ SED = @SED@
571SET_MAKE = @SET_MAKE@ 573SET_MAKE = @SET_MAKE@
572SET_RELOCATABLE = @SET_RELOCATABLE@ 574SET_RELOCATABLE = @SET_RELOCATABLE@
573SHELL = @SHELL@ 575SHELL = @SHELL@
576SIMULINK = @SIMULINK@
574SKINLF = @SKINLF@ 577SKINLF = @SKINLF@
575SPLINT = @SPLINT@ 578SPLINT = @SPLINT@
576STRIP = @STRIP@ 579STRIP = @STRIP@
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index fdaba4a..d4a8aa9 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -406,6 +406,7 @@ BLAS_LIBS = @BLAS_LIBS@
406BSH = @BSH@ 406BSH = @BSH@
407CC = @CC@ 407CC = @CC@
408CCDEPMODE = @CCDEPMODE@ 408CCDEPMODE = @CCDEPMODE@
409CCSM = @CCSM@
409CFLAGS = @CFLAGS@ 410CFLAGS = @CFLAGS@
410CHECKSTYLE = @CHECKSTYLE@ 411CHECKSTYLE = @CHECKSTYLE@
411COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 412COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -464,6 +465,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
464JAVADOC = @JAVADOC@ 465JAVADOC = @JAVADOC@
465JAVAH = @JAVAH@ 466JAVAH = @JAVAH@
466JAVASCI_ENABLE = @JAVASCI_ENABLE@ 467JAVASCI_ENABLE = @JAVASCI_ENABLE@
468JAVA_CUP = @JAVA_CUP@
467JAVA_ENABLE = @JAVA_ENABLE@ 469JAVA_ENABLE = @JAVA_ENABLE@
468JAVA_G = @JAVA_G@ 470JAVA_G = @JAVA_G@
469JAVA_HOME = @JAVA_HOME@ 471JAVA_HOME = @JAVA_HOME@
@@ -556,6 +558,7 @@ SED = @SED@
556SET_MAKE = @SET_MAKE@ 558SET_MAKE = @SET_MAKE@
557SET_RELOCATABLE = @SET_RELOCATABLE@ 559SET_RELOCATABLE = @SET_RELOCATABLE@
558SHELL = @SHELL@ 560SHELL = @SHELL@
561SIMULINK = @SIMULINK@
559SKINLF = @SKINLF@ 562SKINLF = @SKINLF@
560SPLINT = @SPLINT@ 563SPLINT = @SPLINT@
561STRIP = @STRIP@ 564STRIP = @STRIP@
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 613fa4f..784f286 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -666,6 +666,7 @@ BLAS_LIBS = @BLAS_LIBS@
666BSH = @BSH@ 666BSH = @BSH@
667CC = @CC@ 667CC = @CC@
668CCDEPMODE = @CCDEPMODE@ 668CCDEPMODE = @CCDEPMODE@
669CCSM = @CCSM@
669CFLAGS = @CFLAGS@ 670CFLAGS = @CFLAGS@
670CHECKSTYLE = @CHECKSTYLE@ 671CHECKSTYLE = @CHECKSTYLE@
671COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 672COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -724,6 +725,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
724JAVADOC = @JAVADOC@ 725JAVADOC = @JAVADOC@
725JAVAH = @JAVAH@ 726JAVAH = @JAVAH@
726JAVASCI_ENABLE = @JAVASCI_ENABLE@ 727JAVASCI_ENABLE = @JAVASCI_ENABLE@
728JAVA_CUP = @JAVA_CUP@
727JAVA_ENABLE = @JAVA_ENABLE@ 729JAVA_ENABLE = @JAVA_ENABLE@
728JAVA_G = @JAVA_G@ 730JAVA_G = @JAVA_G@
729JAVA_HOME = @JAVA_HOME@ 731JAVA_HOME = @JAVA_HOME@
@@ -816,6 +818,7 @@ SED = @SED@
816SET_MAKE = @SET_MAKE@ 818SET_MAKE = @SET_MAKE@
817SET_RELOCATABLE = @SET_RELOCATABLE@ 819SET_RELOCATABLE = @SET_RELOCATABLE@
818SHELL = @SHELL@ 820SHELL = @SHELL@
821SIMULINK = @SIMULINK@
819SKINLF = @SKINLF@ 822SKINLF = @SKINLF@
820SPLINT = @SPLINT@ 823SPLINT = @SPLINT@
821STRIP = @STRIP@ 824STRIP = @STRIP@
diff --git a/scilab/modules/scinotes/Makefile.in b/scilab/modules/scinotes/Makefile.in
index ed984eb..2deaad3 100644
--- a/scilab/modules/scinotes/Makefile.in
+++ b/scilab/modules/scinotes/Makefile.in
@@ -190,6 +190,7 @@ BLAS_LIBS = @BLAS_LIBS@
190BSH = @BSH@ 190BSH = @BSH@
191CC = @CC@ 191CC = @CC@
192CCDEPMODE = @CCDEPMODE@ 192CCDEPMODE = @CCDEPMODE@
193CCSM = @CCSM@
193CFLAGS = @CFLAGS@ 194CFLAGS = @CFLAGS@
194CHECKSTYLE = @CHECKSTYLE@ 195CHECKSTYLE = @CHECKSTYLE@
195COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 196COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -248,6 +249,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
248JAVADOC = @JAVADOC@ 249JAVADOC = @JAVADOC@
249JAVAH = @JAVAH@ 250JAVAH = @JAVAH@
250JAVASCI_ENABLE = @JAVASCI_ENABLE@ 251JAVASCI_ENABLE = @JAVASCI_ENABLE@
252JAVA_CUP = @JAVA_CUP@
251JAVA_ENABLE = @JAVA_ENABLE@ 253JAVA_ENABLE = @JAVA_ENABLE@
252JAVA_G = @JAVA_G@ 254JAVA_G = @JAVA_G@
253JAVA_HOME = @JAVA_HOME@ 255JAVA_HOME = @JAVA_HOME@
@@ -340,6 +342,7 @@ SED = @SED@
340SET_MAKE = @SET_MAKE@ 342SET_MAKE = @SET_MAKE@
341SET_RELOCATABLE = @SET_RELOCATABLE@ 343SET_RELOCATABLE = @SET_RELOCATABLE@
342SHELL = @SHELL@ 344SHELL = @SHELL@
345SIMULINK = @SIMULINK@
343SKINLF = @SKINLF@ 346SKINLF = @SKINLF@
344SPLINT = @SPLINT@ 347SPLINT = @SPLINT@
345STRIP = @STRIP@ 348STRIP = @STRIP@
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index 9f7afee..98fba97 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -180,6 +180,7 @@ BLAS_LIBS = @BLAS_LIBS@
180BSH = @BSH@ 180BSH = @BSH@
181CC = @CC@ 181CC = @CC@
182CCDEPMODE = @CCDEPMODE@ 182CCDEPMODE = @CCDEPMODE@
183CCSM = @CCSM@
183CFLAGS = @CFLAGS@ 184CFLAGS = @CFLAGS@
184CHECKSTYLE = @CHECKSTYLE@ 185CHECKSTYLE = @CHECKSTYLE@
185COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 186COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -238,6 +239,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
238JAVADOC = @JAVADOC@ 239JAVADOC = @JAVADOC@
239JAVAH = @JAVAH@ 240JAVAH = @JAVAH@
240JAVASCI_ENABLE = @JAVASCI_ENABLE@ 241JAVASCI_ENABLE = @JAVASCI_ENABLE@
242JAVA_CUP = @JAVA_CUP@
241JAVA_ENABLE = @JAVA_ENABLE@ 243JAVA_ENABLE = @JAVA_ENABLE@
242JAVA_G = @JAVA_G@ 244JAVA_G = @JAVA_G@
243JAVA_HOME = @JAVA_HOME@ 245JAVA_HOME = @JAVA_HOME@
@@ -330,6 +332,7 @@ SED = @SED@
330SET_MAKE = @SET_MAKE@ 332SET_MAKE = @SET_MAKE@
331SET_RELOCATABLE = @SET_RELOCATABLE@ 333SET_RELOCATABLE = @SET_RELOCATABLE@
332SHELL = @SHELL@ 334SHELL = @SHELL@
335SIMULINK = @SIMULINK@
333SKINLF = @SKINLF@ 336SKINLF = @SKINLF@
334SPLINT = @SPLINT@ 337SPLINT = @SPLINT@
335STRIP = @STRIP@ 338STRIP = @STRIP@
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index 8e40cd3..a12072c 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -189,6 +189,7 @@ BLAS_LIBS = @BLAS_LIBS@
189BSH = @BSH@ 189BSH = @BSH@
190CC = @CC@ 190CC = @CC@
191CCDEPMODE = @CCDEPMODE@ 191CCDEPMODE = @CCDEPMODE@
192CCSM = @CCSM@
192CFLAGS = @CFLAGS@ 193CFLAGS = @CFLAGS@
193CHECKSTYLE = @CHECKSTYLE@ 194CHECKSTYLE = @CHECKSTYLE@
194COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 195COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -247,6 +248,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
247JAVADOC = @JAVADOC@ 248JAVADOC = @JAVADOC@
248JAVAH = @JAVAH@ 249JAVAH = @JAVAH@
249JAVASCI_ENABLE = @JAVASCI_ENABLE@ 250JAVASCI_ENABLE = @JAVASCI_ENABLE@
251JAVA_CUP = @JAVA_CUP@
250JAVA_ENABLE = @JAVA_ENABLE@ 252JAVA_ENABLE = @JAVA_ENABLE@
251JAVA_G = @JAVA_G@ 253JAVA_G = @JAVA_G@
252JAVA_HOME = @JAVA_HOME@ 254JAVA_HOME = @JAVA_HOME@
@@ -339,6 +341,7 @@ SED = @SED@
339SET_MAKE = @SET_MAKE@ 341SET_MAKE = @SET_MAKE@
340SET_RELOCATABLE = @SET_RELOCATABLE@ 342SET_RELOCATABLE = @SET_RELOCATABLE@
341SHELL = @SHELL@ 343SHELL = @SHELL@
344SIMULINK = @SIMULINK@
342SKINLF = @SKINLF@ 345SKINLF = @SKINLF@
343SPLINT = @SPLINT@ 346SPLINT = @SPLINT@
344STRIP = @STRIP@ 347STRIP = @STRIP@
diff --git a/scilab/modules/simulated_annealing/Makefile.in b/scilab/modules/simulated_annealing/Makefile.in
index 755f790..4e2713a 100644
--- a/scilab/modules/simulated_annealing/Makefile.in
+++ b/scilab/modules/simulated_annealing/Makefile.in
@@ -129,6 +129,7 @@ BLAS_LIBS = @BLAS_LIBS@
129BSH = @BSH@ 129BSH = @BSH@
130CC = @CC@ 130CC = @CC@
131CCDEPMODE = @CCDEPMODE@ 131CCDEPMODE = @CCDEPMODE@
132CCSM = @CCSM@
132CFLAGS = @CFLAGS@ 133CFLAGS = @CFLAGS@
133CHECKSTYLE = @CHECKSTYLE@ 134CHECKSTYLE = @CHECKSTYLE@
134COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 135COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -187,6 +188,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
187JAVADOC = @JAVADOC@ 188JAVADOC = @JAVADOC@
188JAVAH = @JAVAH@ 189JAVAH = @JAVAH@
189JAVASCI_ENABLE = @JAVASCI_ENABLE@ 190JAVASCI_ENABLE = @JAVASCI_ENABLE@
191JAVA_CUP = @JAVA_CUP@
190JAVA_ENABLE = @JAVA_ENABLE@ 192JAVA_ENABLE = @JAVA_ENABLE@
191JAVA_G = @JAVA_G@ 193JAVA_G = @JAVA_G@
192JAVA_HOME = @JAVA_HOME@ 194JAVA_HOME = @JAVA_HOME@
@@ -279,6 +281,7 @@ SED = @SED@
279SET_MAKE = @SET_MAKE@ 281SET_MAKE = @SET_MAKE@
280SET_RELOCATABLE = @SET_RELOCATABLE@ 282SET_RELOCATABLE = @SET_RELOCATABLE@
281SHELL = @SHELL@ 283SHELL = @SHELL@
284SIMULINK = @SIMULINK@
282SKINLF = @SKINLF@ 285SKINLF = @SKINLF@
283SPLINT = @SPLINT@ 286SPLINT = @SPLINT@
284STRIP = @STRIP@ 287STRIP = @STRIP@
diff --git a/scilab/modules/sound/Makefile.in b/scilab/modules/sound/Makefile.in
index 8e04579..6d23ea8 100644
--- a/scilab/modules/sound/Makefile.in
+++ b/scilab/modules/sound/Makefile.in
@@ -154,6 +154,7 @@ BLAS_LIBS = @BLAS_LIBS@
154BSH = @BSH@ 154BSH = @BSH@
155CC = @CC@ 155CC = @CC@
156CCDEPMODE = @CCDEPMODE@ 156CCDEPMODE = @CCDEPMODE@
157CCSM = @CCSM@
157CFLAGS = @CFLAGS@ 158CFLAGS = @CFLAGS@
158CHECKSTYLE = @CHECKSTYLE@ 159CHECKSTYLE = @CHECKSTYLE@
159COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 160COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -212,6 +213,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
212JAVADOC = @JAVADOC@ 213JAVADOC = @JAVADOC@
213JAVAH = @JAVAH@ 214JAVAH = @JAVAH@
214JAVASCI_ENABLE = @JAVASCI_ENABLE@ 215JAVASCI_ENABLE = @JAVASCI_ENABLE@
216JAVA_CUP = @JAVA_CUP@
215JAVA_ENABLE = @JAVA_ENABLE@ 217JAVA_ENABLE = @JAVA_ENABLE@
216JAVA_G = @JAVA_G@ 218JAVA_G = @JAVA_G@
217JAVA_HOME = @JAVA_HOME@ 219JAVA_HOME = @JAVA_HOME@
@@ -304,6 +306,7 @@ SED = @SED@
304SET_MAKE = @SET_MAKE@ 306SET_MAKE = @SET_MAKE@
305SET_RELOCATABLE = @SET_RELOCATABLE@ 307SET_RELOCATABLE = @SET_RELOCATABLE@
306SHELL = @SHELL@ 308SHELL = @SHELL@
309SIMULINK = @SIMULINK@
307SKINLF = @SKINLF@ 310SKINLF = @SKINLF@
308SPLINT = @SPLINT@ 311SPLINT = @SPLINT@
309STRIP = @STRIP@ 312STRIP = @STRIP@
diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index fcca6de..b327503 100644
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -204,6 +204,7 @@ BLAS_LIBS = @BLAS_LIBS@
204BSH = @BSH@ 204BSH = @BSH@
205CC = @CC@ 205CC = @CC@
206CCDEPMODE = @CCDEPMODE@ 206CCDEPMODE = @CCDEPMODE@
207CCSM = @CCSM@
207CFLAGS = @CFLAGS@ 208CFLAGS = @CFLAGS@
208CHECKSTYLE = @CHECKSTYLE@ 209CHECKSTYLE = @CHECKSTYLE@
209COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 210COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -262,6 +263,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
262JAVADOC = @JAVADOC@ 263JAVADOC = @JAVADOC@
263JAVAH = @JAVAH@ 264JAVAH = @JAVAH@
264JAVASCI_ENABLE = @JAVASCI_ENABLE@ 265JAVASCI_ENABLE = @JAVASCI_ENABLE@
266JAVA_CUP = @JAVA_CUP@
265JAVA_ENABLE = @JAVA_ENABLE@ 267JAVA_ENABLE = @JAVA_ENABLE@
266JAVA_G = @JAVA_G@ 268JAVA_G = @JAVA_G@
267JAVA_HOME = @JAVA_HOME@ 269JAVA_HOME = @JAVA_HOME@
@@ -354,6 +356,7 @@ SED = @SED@
354SET_MAKE = @SET_MAKE@ 356SET_MAKE = @SET_MAKE@
355SET_RELOCATABLE = @SET_RELOCATABLE@ 357SET_RELOCATABLE = @SET_RELOCATABLE@
356SHELL = @SHELL@ 358SHELL = @SHELL@
359SIMULINK = @SIMULINK@
357SKINLF = @SKINLF@ 360SKINLF = @SKINLF@
358SPLINT = @SPLINT@ 361SPLINT = @SPLINT@
359STRIP = @STRIP@ 362STRIP = @STRIP@
diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index f817066..2888f41 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -178,6 +178,7 @@ BLAS_LIBS = @BLAS_LIBS@
178BSH = @BSH@ 178BSH = @BSH@
179CC = @CC@ 179CC = @CC@
180CCDEPMODE = @CCDEPMODE@ 180CCDEPMODE = @CCDEPMODE@
181CCSM = @CCSM@
181CFLAGS = @CFLAGS@ 182CFLAGS = @CFLAGS@
182CHECKSTYLE = @CHECKSTYLE@ 183CHECKSTYLE = @CHECKSTYLE@
183COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 184COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -236,6 +237,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
236JAVADOC = @JAVADOC@ 237JAVADOC = @JAVADOC@
237JAVAH = @JAVAH@ 238JAVAH = @JAVAH@
238JAVASCI_ENABLE = @JAVASCI_ENABLE@ 239JAVASCI_ENABLE = @JAVASCI_ENABLE@
240JAVA_CUP = @JAVA_CUP@
239JAVA_ENABLE = @JAVA_ENABLE@ 241JAVA_ENABLE = @JAVA_ENABLE@
240JAVA_G = @JAVA_G@ 242JAVA_G = @JAVA_G@
241JAVA_HOME = @JAVA_HOME@ 243JAVA_HOME = @JAVA_HOME@
@@ -328,6 +330,7 @@ SED = @SED@
328SET_MAKE = @SET_MAKE@ 330SET_MAKE = @SET_MAKE@
329SET_RELOCATABLE = @SET_RELOCATABLE@ 331SET_RELOCATABLE = @SET_RELOCATABLE@
330SHELL = @SHELL@ 332SHELL = @SHELL@
333SIMULINK = @SIMULINK@
331SKINLF = @SKINLF@ 334SKINLF = @SKINLF@
332SPLINT = @SPLINT@ 335SPLINT = @SPLINT@
333STRIP = @STRIP@ 336STRIP = @STRIP@
diff --git a/scilab/modules/spreadsheet/Makefile.in b/scilab/modules/spreadsheet/Makefile.in
index 6fc7ae4..6e751a0 100644
--- a/scilab/modules/spreadsheet/Makefile.in
+++ b/scilab/modules/spreadsheet/Makefile.in
@@ -165,6 +165,7 @@ BLAS_LIBS = @BLAS_LIBS@
165BSH = @BSH@ 165BSH = @BSH@
166CC = @CC@ 166CC = @CC@
167CCDEPMODE = @CCDEPMODE@ 167CCDEPMODE = @CCDEPMODE@
168CCSM = @CCSM@
168CFLAGS = @CFLAGS@ 169CFLAGS = @CFLAGS@
169CHECKSTYLE = @CHECKSTYLE@ 170CHECKSTYLE = @CHECKSTYLE@
170COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 171COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -223,6 +224,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
223JAVADOC = @JAVADOC@ 224JAVADOC = @JAVADOC@
224JAVAH = @JAVAH@ 225JAVAH = @JAVAH@
225JAVASCI_ENABLE = @JAVASCI_ENABLE@ 226JAVASCI_ENABLE = @JAVASCI_ENABLE@
227JAVA_CUP = @JAVA_CUP@
226JAVA_ENABLE = @JAVA_ENABLE@ 228JAVA_ENABLE = @JAVA_ENABLE@
227JAVA_G = @JAVA_G@ 229JAVA_G = @JAVA_G@
228JAVA_HOME = @JAVA_HOME@ 230JAVA_HOME = @JAVA_HOME@
@@ -315,6 +317,7 @@ SED = @SED@
315SET_MAKE = @SET_MAKE@ 317SET_MAKE = @SET_MAKE@
316SET_RELOCATABLE = @SET_RELOCATABLE@ 318SET_RELOCATABLE = @SET_RELOCATABLE@
317SHELL = @SHELL@ 319SHELL = @SHELL@
320SIMULINK = @SIMULINK@
318SKINLF = @SKINLF@ 321SKINLF = @SKINLF@
319SPLINT = @SPLINT@ 322SPLINT = @SPLINT@
320STRIP = @STRIP@ 323STRIP = @STRIP@
diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index 240186f..2900e39 100644
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -185,6 +185,7 @@ BLAS_LIBS = @BLAS_LIBS@
185BSH = @BSH@ 185BSH = @BSH@
186CC = @CC@ 186CC = @CC@
187CCDEPMODE = @CCDEPMODE@ 187CCDEPMODE = @CCDEPMODE@
188CCSM = @CCSM@
188CFLAGS = @CFLAGS@ 189CFLAGS = @CFLAGS@
189CHECKSTYLE = @CHECKSTYLE@ 190CHECKSTYLE = @CHECKSTYLE@
190COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 191COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -243,6 +244,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
243JAVADOC = @JAVADOC@ 244JAVADOC = @JAVADOC@
244JAVAH = @JAVAH@ 245JAVAH = @JAVAH@
245JAVASCI_ENABLE = @JAVASCI_ENABLE@ 246JAVASCI_ENABLE = @JAVASCI_ENABLE@
247JAVA_CUP = @JAVA_CUP@
246JAVA_ENABLE = @JAVA_ENABLE@ 248JAVA_ENABLE = @JAVA_ENABLE@
247JAVA_G = @JAVA_G@ 249JAVA_G = @JAVA_G@
248JAVA_HOME = @JAVA_HOME@ 250JAVA_HOME = @JAVA_HOME@
@@ -335,6 +337,7 @@ SED = @SED@
335SET_MAKE = @SET_MAKE@ 337SET_MAKE = @SET_MAKE@
336SET_RELOCATABLE = @SET_RELOCATABLE@ 338SET_RELOCATABLE = @SET_RELOCATABLE@
337SHELL = @SHELL@ 339SHELL = @SHELL@
340SIMULINK = @SIMULINK@
338SKINLF = @SKINLF@ 341SKINLF = @SKINLF@
339SPLINT = @SPLINT@ 342SPLINT = @SPLINT@
340STRIP = @STRIP@ 343STRIP = @STRIP@
diff --git a/scilab/modules/string/Makefile.in b/scilab/modules/string/Makefile.in
index ac70887..981f4c5 100644
--- a/scilab/modules/string/Makefile.in
+++ b/scilab/modules/string/Makefile.in
@@ -197,6 +197,7 @@ BLAS_LIBS = @BLAS_LIBS@
197BSH = @BSH@ 197BSH = @BSH@
198CC = @CC@ 198CC = @CC@
199CCDEPMODE = @CCDEPMODE@ 199CCDEPMODE = @CCDEPMODE@
200CCSM = @CCSM@
200CFLAGS = @CFLAGS@ 201CFLAGS = @CFLAGS@
201CHECKSTYLE = @CHECKSTYLE@ 202CHECKSTYLE = @CHECKSTYLE@
202COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 203COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -255,6 +256,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
255JAVADOC = @JAVADOC@ 256JAVADOC = @JAVADOC@
256JAVAH = @JAVAH@ 257JAVAH = @JAVAH@
257JAVASCI_ENABLE = @JAVASCI_ENABLE@ 258JAVASCI_ENABLE = @JAVASCI_ENABLE@
259JAVA_CUP = @JAVA_CUP@
258JAVA_ENABLE = @JAVA_ENABLE@ 260JAVA_ENABLE = @JAVA_ENABLE@
259JAVA_G = @JAVA_G@ 261JAVA_G = @JAVA_G@
260JAVA_HOME = @JAVA_HOME@ 262JAVA_HOME = @JAVA_HOME@
@@ -347,6 +349,7 @@ SED = @SED@
347SET_MAKE = @SET_MAKE@ 349SET_MAKE = @SET_MAKE@
348SET_RELOCATABLE = @SET_RELOCATABLE@ 350SET_RELOCATABLE = @SET_RELOCATABLE@
349SHELL = @SHELL@ 351SHELL = @SHELL@
352SIMULINK = @SIMULINK@
350SKINLF = @SKINLF@ 353SKINLF = @SKINLF@
351SPLINT = @SPLINT@ 354SPLINT = @SPLINT@
352STRIP = @STRIP@ 355STRIP = @STRIP@
diff --git a/scilab/modules/symbolic/Makefile.in b/scilab/modules/symbolic/Makefile.in
index 832b534..a3633fa 100644
--- a/scilab/modules/symbolic/Makefile.in
+++ b/scilab/modules/symbolic/Makefile.in
@@ -169,6 +169,7 @@ BLAS_LIBS = @BLAS_LIBS@
169BSH = @BSH@ 169BSH = @BSH@
170CC = @CC@ 170CC = @CC@
171CCDEPMODE = @CCDEPMODE@ 171CCDEPMODE = @CCDEPMODE@
172CCSM = @CCSM@
172CFLAGS = @CFLAGS@ 173CFLAGS = @CFLAGS@
173CHECKSTYLE = @CHECKSTYLE@ 174CHECKSTYLE = @CHECKSTYLE@
174COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 175COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -227,6 +228,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
227JAVADOC = @JAVADOC@ 228JAVADOC = @JAVADOC@
228JAVAH = @JAVAH@ 229JAVAH = @JAVAH@
229JAVASCI_ENABLE = @JAVASCI_ENABLE@ 230JAVASCI_ENABLE = @JAVASCI_ENABLE@
231JAVA_CUP = @JAVA_CUP@
230JAVA_ENABLE = @JAVA_ENABLE@ 232JAVA_ENABLE = @JAVA_ENABLE@
231JAVA_G = @JAVA_G@ 233JAVA_G = @JAVA_G@
232JAVA_HOME = @JAVA_HOME@ 234JAVA_HOME = @JAVA_HOME@
@@ -319,6 +321,7 @@ SED = @SED@
319SET_MAKE = @SET_MAKE@ 321SET_MAKE = @SET_MAKE@
320SET_RELOCATABLE = @SET_RELOCATABLE@ 322SET_RELOCATABLE = @SET_RELOCATABLE@
321SHELL = @SHELL@ 323SHELL = @SHELL@
324SIMULINK = @SIMULINK@
322SKINLF = @SKINLF@ 325SKINLF = @SKINLF@
323SPLINT = @SPLINT@ 326SPLINT = @SPLINT@
324STRIP = @STRIP@ 327STRIP = @STRIP@
diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index d65839e..d771e30 100644
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -203,6 +203,7 @@ BLAS_LIBS = @BLAS_LIBS@
203BSH = @BSH@ 203BSH = @BSH@
204CC = @CC@ 204CC = @CC@
205CCDEPMODE = @CCDEPMODE@ 205CCDEPMODE = @CCDEPMODE@
206CCSM = @CCSM@
206CFLAGS = @CFLAGS@ 207CFLAGS = @CFLAGS@
207CHECKSTYLE = @CHECKSTYLE@ 208CHECKSTYLE = @CHECKSTYLE@
208COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 209COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -261,6 +262,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
261JAVADOC = @JAVADOC@ 262JAVADOC = @JAVADOC@
262JAVAH = @JAVAH@ 263JAVAH = @JAVAH@
263JAVASCI_ENABLE = @JAVASCI_ENABLE@ 264JAVASCI_ENABLE = @JAVASCI_ENABLE@
265JAVA_CUP = @JAVA_CUP@
264JAVA_ENABLE = @JAVA_ENABLE@ 266JAVA_ENABLE = @JAVA_ENABLE@
265JAVA_G = @JAVA_G@ 267JAVA_G = @JAVA_G@
266JAVA_HOME = @JAVA_HOME@ 268JAVA_HOME = @JAVA_HOME@
@@ -353,6 +355,7 @@ SED = @SED@
353SET_MAKE = @SET_MAKE@ 355SET_MAKE = @SET_MAKE@
354SET_RELOCATABLE = @SET_RELOCATABLE@ 356SET_RELOCATABLE = @SET_RELOCATABLE@
355SHELL = @SHELL@ 357SHELL = @SHELL@
358SIMULINK = @SIMULINK@
356SKINLF = @SKINLF@ 359SKINLF = @SKINLF@
357SPLINT = @SPLINT@ 360SPLINT = @SPLINT@
358STRIP = @STRIP@ 361STRIP = @STRIP@
diff --git a/scilab/modules/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index 2d56318..3f37b1d 100644
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -124,6 +124,7 @@ BLAS_LIBS = @BLAS_LIBS@
124BSH = @BSH@ 124BSH = @BSH@
125CC = @CC@ 125CC = @CC@
126CCDEPMODE = @CCDEPMODE@ 126CCDEPMODE = @CCDEPMODE@
127CCSM = @CCSM@
127CFLAGS = @CFLAGS@ 128CFLAGS = @CFLAGS@
128CHECKSTYLE = @CHECKSTYLE@ 129CHECKSTYLE = @CHECKSTYLE@
129COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 130COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -182,6 +183,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
182JAVADOC = @JAVADOC@ 183JAVADOC = @JAVADOC@
183JAVAH = @JAVAH@ 184JAVAH = @JAVAH@
184JAVASCI_ENABLE = @JAVASCI_ENABLE@ 185JAVASCI_ENABLE = @JAVASCI_ENABLE@
186JAVA_CUP = @JAVA_CUP@
185JAVA_ENABLE = @JAVA_ENABLE@ 187JAVA_ENABLE = @JAVA_ENABLE@
186JAVA_G = @JAVA_G@ 188JAVA_G = @JAVA_G@
187JAVA_HOME = @JAVA_HOME@ 189JAVA_HOME = @JAVA_HOME@
@@ -274,6 +276,7 @@ SED = @SED@
274SET_MAKE = @SET_MAKE@ 276SET_MAKE = @SET_MAKE@
275SET_RELOCATABLE = @SET_RELOCATABLE@ 277SET_RELOCATABLE = @SET_RELOCATABLE@
276SHELL = @SHELL@ 278SHELL = @SHELL@
279SIMULINK = @SIMULINK@
277SKINLF = @SKINLF@ 280SKINLF = @SKINLF@
278SPLINT = @SPLINT@ 281SPLINT = @SPLINT@
279STRIP = @STRIP@ 282STRIP = @STRIP@
diff --git a/scilab/modules/time/Makefile.in b/scilab/modules/time/Makefile.in
index 37d5ae7..0f67bfe 100644
--- a/scilab/modules/time/Makefile.in
+++ b/scilab/modules/time/Makefile.in
@@ -161,6 +161,7 @@ BLAS_LIBS = @BLAS_LIBS@
161BSH = @BSH@ 161BSH = @BSH@
162CC = @CC@ 162CC = @CC@
163CCDEPMODE = @CCDEPMODE@ 163CCDEPMODE = @CCDEPMODE@
164CCSM = @CCSM@
164CFLAGS = @CFLAGS@ 165CFLAGS = @CFLAGS@
165CHECKSTYLE = @CHECKSTYLE@ 166CHECKSTYLE = @CHECKSTYLE@
166COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 167COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -219,6 +220,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
219JAVADOC = @JAVADOC@ 220JAVADOC = @JAVADOC@
220JAVAH = @JAVAH@ 221JAVAH = @JAVAH@
221JAVASCI_ENABLE = @JAVASCI_ENABLE@ 222JAVASCI_ENABLE = @JAVASCI_ENABLE@
223JAVA_CUP = @JAVA_CUP@
222JAVA_ENABLE = @JAVA_ENABLE@ 224JAVA_ENABLE = @JAVA_ENABLE@
223JAVA_G = @JAVA_G@ 225JAVA_G = @JAVA_G@
224JAVA_HOME = @JAVA_HOME@ 226JAVA_HOME = @JAVA_HOME@
@@ -311,6 +313,7 @@ SED = @SED@
311SET_MAKE = @SET_MAKE@ 313SET_MAKE = @SET_MAKE@
312SET_RELOCATABLE = @SET_RELOCATABLE@ 314SET_RELOCATABLE = @SET_RELOCATABLE@
313SHELL = @SHELL@ 315SHELL = @SHELL@
316SIMULINK = @SIMULINK@
314SKINLF = @SKINLF@ 317SKINLF = @SKINLF@
315SPLINT = @SPLINT@ 318SPLINT = @SPLINT@
316STRIP = @STRIP@ 319STRIP = @STRIP@
diff --git a/scilab/modules/types/Makefile.in b/scilab/modules/types/Makefile.in
index fda03d2..23ac3ea 100644
--- a/scilab/modules/types/Makefile.in
+++ b/scilab/modules/types/Makefile.in
@@ -165,6 +165,7 @@ BLAS_LIBS = @BLAS_LIBS@
165BSH = @BSH@ 165BSH = @BSH@
166CC = @CC@ 166CC = @CC@
167CCDEPMODE = @CCDEPMODE@ 167CCDEPMODE = @CCDEPMODE@
168CCSM = @CCSM@
168CFLAGS = @CFLAGS@ 169CFLAGS = @CFLAGS@
169CHECKSTYLE = @CHECKSTYLE@ 170CHECKSTYLE = @CHECKSTYLE@
170COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 171COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -223,6 +224,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
223JAVADOC = @JAVADOC@ 224JAVADOC = @JAVADOC@
224JAVAH = @JAVAH@ 225JAVAH = @JAVAH@
225JAVASCI_ENABLE = @JAVASCI_ENABLE@ 226JAVASCI_ENABLE = @JAVASCI_ENABLE@
227JAVA_CUP = @JAVA_CUP@
226JAVA_ENABLE = @JAVA_ENABLE@ 228JAVA_ENABLE = @JAVA_ENABLE@
227JAVA_G = @JAVA_G@ 229JAVA_G = @JAVA_G@
228JAVA_HOME = @JAVA_HOME@ 230JAVA_HOME = @JAVA_HOME@
@@ -315,6 +317,7 @@ SED = @SED@
315SET_MAKE = @SET_MAKE@ 317SET_MAKE = @SET_MAKE@
316SET_RELOCATABLE = @SET_RELOCATABLE@ 318SET_RELOCATABLE = @SET_RELOCATABLE@
317SHELL = @SHELL@ 319SHELL = @SHELL@
320SIMULINK = @SIMULINK@
318SKINLF = @SKINLF@ 321SKINLF = @SKINLF@
319SPLINT = @SPLINT@ 322SPLINT = @SPLINT@
320STRIP = @STRIP@ 323STRIP = @STRIP@
diff --git a/scilab/modules/ui_data/Makefile.in b/scilab/modules/ui_data/Makefile.in
index 03fae80..650384f 100644
--- a/scilab/modules/ui_data/Makefile.in
+++ b/scilab/modules/ui_data/Makefile.in
@@ -190,6 +190,7 @@ BLAS_LIBS = @BLAS_LIBS@
190BSH = @BSH@ 190BSH = @BSH@
191CC = @CC@ 191CC = @CC@
192CCDEPMODE = @CCDEPMODE@ 192CCDEPMODE = @CCDEPMODE@
193CCSM = @CCSM@
193CFLAGS = @CFLAGS@ 194CFLAGS = @CFLAGS@
194CHECKSTYLE = @CHECKSTYLE@ 195CHECKSTYLE = @CHECKSTYLE@
195COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 196COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -248,6 +249,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
248JAVADOC = @JAVADOC@ 249JAVADOC = @JAVADOC@
249JAVAH = @JAVAH@ 250JAVAH = @JAVAH@
250JAVASCI_ENABLE = @JAVASCI_ENABLE@ 251JAVASCI_ENABLE = @JAVASCI_ENABLE@
252JAVA_CUP = @JAVA_CUP@
251JAVA_ENABLE = @JAVA_ENABLE@ 253JAVA_ENABLE = @JAVA_ENABLE@
252JAVA_G = @JAVA_G@ 254JAVA_G = @JAVA_G@
253JAVA_HOME = @JAVA_HOME@ 255JAVA_HOME = @JAVA_HOME@
@@ -340,6 +342,7 @@ SED = @SED@
340SET_MAKE = @SET_MAKE@ 342SET_MAKE = @SET_MAKE@
341SET_RELOCATABLE = @SET_RELOCATABLE@ 343SET_RELOCATABLE = @SET_RELOCATABLE@
342SHELL = @SHELL@ 344SHELL = @SHELL@
345SIMULINK = @SIMULINK@
343SKINLF = @SKINLF@ 346SKINLF = @SKINLF@
344SPLINT = @SPLINT@ 347SPLINT = @SPLINT@
345STRIP = @STRIP@ 348STRIP = @STRIP@
diff --git a/scilab/modules/umfpack/Makefile.in b/scilab/modules/umfpack/Makefile.in
index 1f97d08..a35b866 100644
--- a/scilab/modules/umfpack/Makefile.in
+++ b/scilab/modules/umfpack/Makefile.in
@@ -192,6 +192,7 @@ BLAS_LIBS = @BLAS_LIBS@
192BSH = @BSH@ 192BSH = @BSH@
193CC = @CC@ 193CC = @CC@
194CCDEPMODE = @CCDEPMODE@ 194CCDEPMODE = @CCDEPMODE@
195CCSM = @CCSM@
195CFLAGS = @CFLAGS@ 196CFLAGS = @CFLAGS@
196CHECKSTYLE = @CHECKSTYLE@ 197CHECKSTYLE = @CHECKSTYLE@
197COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 198COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -250,6 +251,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
250JAVADOC = @JAVADOC@ 251JAVADOC = @JAVADOC@
251JAVAH = @JAVAH@ 252JAVAH = @JAVAH@
252JAVASCI_ENABLE = @JAVASCI_ENABLE@ 253JAVASCI_ENABLE = @JAVASCI_ENABLE@
254JAVA_CUP = @JAVA_CUP@
253JAVA_ENABLE = @JAVA_ENABLE@ 255JAVA_ENABLE = @JAVA_ENABLE@
254JAVA_G = @JAVA_G@ 256JAVA_G = @JAVA_G@
255JAVA_HOME = @JAVA_HOME@ 257JAVA_HOME = @JAVA_HOME@
@@ -342,6 +344,7 @@ SED = @SED@
342SET_MAKE = @SET_MAKE@ 344SET_MAKE = @SET_MAKE@
343SET_RELOCATABLE = @SET_RELOCATABLE@ 345SET_RELOCATABLE = @SET_RELOCATABLE@
344SHELL = @SHELL@ 346SHELL = @SHELL@
347SIMULINK = @SIMULINK@
345SKINLF = @SKINLF@ 348SKINLF = @SKINLF@
346SPLINT = @SPLINT@ 349SPLINT = @SPLINT@
347STRIP = @STRIP@ 350STRIP = @STRIP@
diff --git a/scilab/modules/windows_tools/Makefile.in b/scilab/modules/windows_tools/Makefile.in
index 88e58e4..9d33390 100644
--- a/scilab/modules/windows_tools/Makefile.in
+++ b/scilab/modules/windows_tools/Makefile.in
@@ -154,6 +154,7 @@ BLAS_LIBS = @BLAS_LIBS@
154BSH = @BSH@ 154BSH = @BSH@
155CC = @CC@ 155CC = @CC@
156CCDEPMODE = @CCDEPMODE@ 156CCDEPMODE = @CCDEPMODE@
157CCSM = @CCSM@
157CFLAGS = @CFLAGS@ 158CFLAGS = @CFLAGS@
158CHECKSTYLE = @CHECKSTYLE@ 159CHECKSTYLE = @CHECKSTYLE@
159COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 160COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -212,6 +213,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
212JAVADOC = @JAVADOC@ 213JAVADOC = @JAVADOC@
213JAVAH = @JAVAH@ 214JAVAH = @JAVAH@
214JAVASCI_ENABLE = @JAVASCI_ENABLE@ 215JAVASCI_ENABLE = @JAVASCI_ENABLE@
216JAVA_CUP = @JAVA_CUP@
215JAVA_ENABLE = @JAVA_ENABLE@ 217JAVA_ENABLE = @JAVA_ENABLE@
216JAVA_G = @JAVA_G@ 218JAVA_G = @JAVA_G@
217JAVA_HOME = @JAVA_HOME@ 219JAVA_HOME = @JAVA_HOME@
@@ -304,6 +306,7 @@ SED = @SED@
304SET_MAKE = @SET_MAKE@ 306SET_MAKE = @SET_MAKE@
305SET_RELOCATABLE = @SET_RELOCATABLE@ 307SET_RELOCATABLE = @SET_RELOCATABLE@
306SHELL = @SHELL@ 308SHELL = @SHELL@
309SIMULINK = @SIMULINK@
307SKINLF = @SKINLF@ 310SKINLF = @SKINLF@
308SPLINT = @SPLINT@ 311SPLINT = @SPLINT@
309STRIP = @STRIP@ 312STRIP = @STRIP@
diff --git a/scilab/modules/xcos/Makefile.in b/scilab/modules/xcos/Makefile.in
index 5e4bd0f..3f5a5c8 100644
--- a/scilab/modules/xcos/Makefile.in
+++ b/scilab/modules/xcos/Makefile.in
@@ -202,6 +202,7 @@ BLAS_LIBS = @BLAS_LIBS@
202BSH = @BSH@ 202BSH = @BSH@
203CC = @CC@ 203CC = @CC@
204CCDEPMODE = @CCDEPMODE@ 204CCDEPMODE = @CCDEPMODE@
205CCSM = @CCSM@
205CFLAGS = @CFLAGS@ 206CFLAGS = @CFLAGS@
206CHECKSTYLE = @CHECKSTYLE@ 207CHECKSTYLE = @CHECKSTYLE@
207COMMONS_BEANUTILS = @COMMONS_BEANUTILS@ 208COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -260,6 +261,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
260JAVADOC = @JAVADOC@ 261JAVADOC = @JAVADOC@
261JAVAH = @JAVAH@ 262JAVAH = @JAVAH@
262JAVASCI_ENABLE = @JAVASCI_ENABLE@ 263JAVASCI_ENABLE = @JAVASCI_ENABLE@
264JAVA_CUP = @JAVA_CUP@
263JAVA_ENABLE = @JAVA_ENABLE@ 265JAVA_ENABLE = @JAVA_ENABLE@
264JAVA_G = @JAVA_G@ 266JAVA_G = @JAVA_G@
265JAVA_HOME = @JAVA_HOME@ 267JAVA_HOME = @JAVA_HOME@
@@ -352,6 +354,7 @@ SED = @SED@
352SET_MAKE = @SET_MAKE@ 354SET_MAKE = @SET_MAKE@
353SET_RELOCATABLE = @SET_RELOCATABLE@ 355SET_RELOCATABLE = @SET_RELOCATABLE@
354SHELL = @SHELL@ 356SHELL = @SHELL@
357SIMULINK = @SIMULINK@
355SKINLF = @SKINLF@ 358SKINLF = @SKINLF@
356SPLINT = @SPLINT@ 359SPLINT = @SPLINT@
357STRIP = @STRIP@ 360STRIP = @STRIP@
diff --git a/scilab/modules/xcos/build.xml b/scilab/modules/xcos/build.xml
index 82b8583..86c3a1f 100644
--- a/scilab/modules/xcos/build.xml
+++ b/scilab/modules/xcos/build.xml
@@ -34,6 +34,11 @@
34 <!-- Validate the palette configuration file --> 34 <!-- Validate the palette configuration file -->
35 <schemavalidate noNamespaceFile="etc/PaletteConfiguration.xsd" 35 <schemavalidate noNamespaceFile="etc/PaletteConfiguration.xsd"
36 file="etc/palettes.xml" /> 36 file="etc/palettes.xml" />
37
38 <!-- Validate the simulink to Xcos configuration file -->
39 <schemavalidate noNamespaceFile="etc/SimulinkImportConfiguration.xsd">
40 <fileset dir="etc" includes="simulinkImportBlocks.xml" />
41 </schemavalidate>
37 </target> 42 </target>
38 43
39</project> 44</project>
diff --git a/scilab/modules/xcos/etc/SimulinkImportConfiguration.xsd b/scilab/modules/xcos/etc/SimulinkImportConfiguration.xsd
new file mode 100644
index 0000000..0d160bc
--- /dev/null
+++ b/scilab/modules/xcos/etc/SimulinkImportConfiguration.xsd
@@ -0,0 +1,114 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
3 xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
4 jxb:version="2.0">
5
6 <!--Each Migration Schema, can consist of many blocks, and only one general parameters section -->
7 <!--<xsd:element name="generals" type="GeneralParameters"/> general section will be added as a block to BlockPalette-->
8 <xsd:element name="blocks" type="BlockPalette"/>
9
10 <xsd:complexType name="GeneralParameters">
11 <xsd:sequence>
12 <xsd:element name="string" type="StringParameters" minOccurs="0" maxOccurs="unbounded"/>
13 <xsd:element name="integer" type="IntegerParameters" minOccurs="0" maxOccurs="unbounded"/>
14 <xsd:element name="simple" type="SimpleParameter" minOccurs="0" maxOccurs="unbounded"/>
15 </xsd:sequence>
16 <xsd:attribute name="description" type="xsd:string" use="optional"/>
17 </xsd:complexType>
18
19 <xsd:complexType name="BlockPalette">
20 <xsd:sequence>
21 <xsd:element name="block" type="Block" minOccurs="0" maxOccurs="unbounded"/>
22 </xsd:sequence>
23 </xsd:complexType>
24 <!-- parameter won't be found in Block scope, It'll be searched among general parameters. This way it will be possible to shadow parameter -->
25 <xsd:complexType name="Block">
26 <xsd:sequence>
27 <xsd:element name="string" type="StringParameters" minOccurs="0" maxOccurs="unbounded"/>
28 <xsd:element name="integer" type="IntegerParameters" minOccurs="0" maxOccurs="unbounded"/>
29 <xsd:element name="simple" type="SimpleParameter" minOccurs="0" maxOccurs="unbounded"/>
30 <xsd:element name="str2int" type="Str2IntParameters" minOccurs="0" maxOccurs="unbounded"/>
31 <xsd:element name="int2str" type="Int2StrParameters" minOccurs="0" maxOccurs="unbounded"/>
32 <xsd:element name="real" type="RealParameters" minOccurs="0" maxOccurs="unbounded"/>
33 </xsd:sequence>
34 <xsd:attribute name="sim" type="xsd:string" use="required"/>
35 <xsd:attribute name="xcos" type="xsd:string" use="required"/>
36 <xsd:attribute name="description" type="xsd:string" use="optional"/>
37 </xsd:complexType>
38 <!-- parameters that differs only in parameter name ex:Constant Value -->
39 <xsd:complexType name="SimpleParameter">
40 <xsd:attribute name="sim" type="xsd:string" use="required"/>
41 <xsd:attribute name="xcos" type="xsd:string" use="required"/>
42 <xsd:attribute name="description" type="xsd:string" use="optional"/>
43 </xsd:complexType>
44 <!-- parameters that in name, and have different string values ex:CSCOPE SCOPE -->
45 <xsd:complexType name="StringParameters">
46 <xsd:sequence>
47 <xsd:element name="map" type="StringValueMap" minOccurs="1" maxOccurs="unbounded"/>
48 </xsd:sequence>
49 <xsd:attribute name="sim" type="xsd:string" use="required"/>
50 <xsd:attribute name="xcos" type="xsd:string" use="required"/>
51 <xsd:attribute name="description" type="xsd:string" use="optional"/>
52 </xsd:complexType>
53
54 <xsd:complexType name="StringValueMap">
55 <xsd:attribute name="simVal" type="xsd:string" use="required"/>
56 <xsd:attribute name="xcosVal" type="xsd:string" use="required"/>
57 </xsd:complexType>
58 <!-- parameters that needs to be calculated before setting -->
59 <xsd:complexType name="IntegerParameters">
60 <xsd:sequence>
61 <xsd:element name="map" type="IntegerValueMap" minOccurs="1" maxOccurs="unbounded"/>
62 </xsd:sequence>
63 <xsd:attribute name="sim" type="xsd:string" use="required"/>
64 <xsd:attribute name="xcos" type="xsd:string" use="required"/>
65 <xsd:attribute name="description" type="xsd:string" use="optional"/>
66 </xsd:complexType>
67
68 <xsd:complexType name="IntegerValueMap">
69 <xsd:attribute name="simVal" type="xsd:integer" use="required"/>
70 <xsd:attribute name="xcosVal" type="xsd:integer" use="required"/>
71 </xsd:complexType>
72
73 <xsd:complexType name="Str2IntParameters">
74 <xsd:sequence>
75 <xsd:element name="map" type="Str2IntValueMap" minOccurs="1" maxOccurs="unbounded"/>
76 </xsd:sequence>
77 <xsd:attribute name="sim" type="xsd:string" use="required"/>
78 <xsd:attribute name="xcos" type="xsd:string" use="required"/>
79 <xsd:attribute name="description" type="xsd:string" use="optional"/>
80 </xsd:complexType>
81
82 <xsd:complexType name="Str2IntValueMap">
83 <xsd:attribute name="simVal" type="xsd:string" use="required"/>
84 <xsd:attribute name="xcosVal" type="xsd:integer" use="required"/>
85 </xsd:complexType>
86
87 <xsd:complexType name="Int2StrParameters">
88 <xsd:sequence>
89 <xsd:element name="map" type="Int2StrValueMap" minOccurs="1" maxOccurs="unbounded"/>
90 </xsd:sequence>
91 <xsd:attribute name="sim" type="xsd:string" use="required"/>
92 <xsd:attribute name="xcos" type="xsd:string" use="required"/>
93 <xsd:attribute name="description" type="xsd:string" use="optional"/>
94 </xsd:complexType>
95 <xsd:complexType name="Int2StrValueMap">
96 <xsd:attribute name="simVal" type="xsd:integer" use="required"/>
97 <xsd:attribute name="xcosVal" type="xsd:string" use="required"/>
98 </xsd:complexType>
99
100 <xsd:complexType name="RealParameters">
101 <xsd:sequence>
102 <xsd:element name="map" type="RealValueMap" minOccurs="1" maxOccurs="unbounded"/>
103 </xsd:sequence>
104 <xsd:attribute name="sim" type="xsd:string" use="optional"/>
105 <xsd:attribute name="xcos" type="xsd:string" use="required"/>
106 <xsd:attribute name="description" type="xsd:string" use="optional"/>
107 </xsd:complexType>
108
109 <xsd:complexType name="RealValueMap">
110 <xsd:attribute name="simName" type="xsd:string" use="required"/>
111 <xsd:attribute name="index" type="xsd:string" use="required"/>
112 </xsd:complexType>
113 <!--Its possible that Ill have to add more parameter types, such as: boolean -->
114</xsd:schema>
diff --git a/scilab/modules/xcos/etc/simulinkImportBlocks.xml b/scilab/modules/xcos/etc/simulinkImportBlocks.xml
new file mode 100644
index 0000000..75e384c
--- /dev/null
+++ b/scilab/modules/xcos/etc/simulinkImportBlocks.xml
@@ -0,0 +1,576 @@
1<blocks>
2<!--Template-->
3 <block sim="string" xcos="string" description="string">
4 <!--Zero or more repetitions:-->
5 <string sim="string" xcos="string" description="string">
6 <!--1 or more repetitions:-->
7 <map simVal="string" xcosVal="string"/>
8 </string>
9 <!--Zero or more repetitions:-->
10 <integer sim="string" xcos="string" description="string">
11 <!--1 or more repetitions:-->
12 <map simVal="100" xcosVal="100"/>
13 </integer>
14 <!--Zero or more repetitions:-->
15 <simple sim="string" xcos="string" description="string"/>
16 </block>
17
18<!-- TODO: Zero Cross -->
19
20<!-- General parameters, common for many blocks -->
21<!-- Ports, ShowName, SID, BlockMirror, DropShadow, FontSize, BackgroundColor, BlockType, NamePlacement, ShowSaturationPort(?), FontName, ShowStatePort, FontWeigh, ContinuousStateAttributes, FontAngle, Name, ForegroundColor, BlockRotation, NumInputPorts, DataFormat -->
22
23 <block sim="general" xcos="general" description="">
24 <!--Zero or more repetitions:-->
25 <string sim="string" xcos="string" description="string">
26 <!--1 or more repetitions:-->
27 <map simVal="string" xcosVal="string"/>
28 </string>
29 <!--Zero or more repetitions:-->
30 <integer sim="string" xcos="string" description="string">
31 <!--1 or more repetitions:-->
32 <map simVal="100" xcosVal="100"/>
33 </integer>
34 <!--Zero or more repetitions:-->
35 <simple sim="string" xcos="string" description="string"/>
36 <str2int sim="ZeroCross" xcos="zero_crossing" description="Enable zero-crossing detection">
37 <map simVal="off" xcosVal="0"/>
38 <map simVal="on" xcosVal="1"/>
39 </str2int>
40 <!--
41 * - "interfaceFunctionName"
42 * - "simulationFunctionName"
43 * - "simulationFunctionType"
44 * - "exprs"
45 * - "realParameters"
46 * - "integerParameters"
47 * - "objectsParameters"
48 * - "nbZerosCrossing"
49 * - "nmode"
50 * - "state"
51 * - "dState"
52 * - "oDState"
53 * - "equations"
54 * - "dependsOnU"
55 * - "dependsOnT"
56 * - "blockType"
57 * - "ordering"
58 -->
59 </block>
60
61<!--Compatibility patterns for diagram parameters -->
62 <block sim="diagram" xcos="diagram" description="">
63 <!--
64 private double finalIntegrationTime;
65 private double integratorAbsoluteTolerance;
66 private double integratorRelativeTolerance;
67 private double toleranceOnTime;
68 private double maxIntegrationTimeInterval;
69 private double realTimeScaling;
70 private double solver;
71 private double maximumStepSize;
72 private int debugLevel;
73 private String[] context;
74 private String version;
75 -->
76 </block>
77
78<!-- Continuous Library Block Parameters -->
79 <!-- Derivative Block Compatibility Pattern -->
80 <block sim="Derivative" xcos="DERIV" description="
81 LinearizePole - not available;
82 ">
83 <simple sim="FunctionName" xcos="deriv"></simple>
84 <simple sim="FunctionType" xcos="4"></simple>
85 <simple sim="BlockType" xcos="x"></simple>
86
87 </block>
88
89 <!-- Integrator Block Compatibility Pattern -->
90 <block sim="Integrator" xcos="INTEGRAL_m" description="
91 ExternalReset - not available;
92 InitialConditionSource - external?internal (?);
93 LimitOutput - switched on by default;
94 ShowSaturationPort - N/A;
95 ShowStatePort - N/A;
96 AbsoluteTolerance- N/A;
97 IgnoreLimit - N/A;
98 ContinuousStateAttributes - N/A;"
99 >
100 <simple sim="FunctionName" xcos="integral_func"></simple>
101 <simple sim="FunctionType" xcos="4"></simple>
102 <simple sim="BlockType" xcos="c"></simple>
103
104 <str2int sim="ZeroCross" xcos="nzcross" description="Enable zero-crossing detection">
105 <map simVal="off" xcosVal="0"/>
106 <map simVal="on" xcosVal="1"/>
107 </str2int>
108 <str2int sim="ExternalReset" xcos="With re-initialization" description="">
109 <!-- TODO: {'none'} | 'rising' | 'falling' | 'either' | 'level' | 'level hold' -->
110 <map simVal="none" xcosVal="0"/>
111 </str2int>
112 <str2int sim="LimitOutput" xcos="rpar" description="">
113 <map simVal="off" xcosVal="0"/>
114 <map simVal="on" xcosVal="1"/>
115 </str2int>
116 <real xcos="exprs">
117 <map simName="InitialCondition" index="0,0"/>
118 <map simName="0" index="1,0"/> <!-- with reinitialization -->
119 <map simName="0" index="2,0"/> <!-- with saturation -->
120 <map simName="UpperSaturationLimit" index="3,0"/>
121 <map simName="LowerSaturationLimit" index="4,0"/>
122 </real>
123 <!--
124 <real xcos="rpar">
125 <map simName="UpperSaturationLimit" index="0,0"/>
126 <map simName="LowerSaturationLimit" index="1,0"/>
127 </real> -->
128 <real xcos="state">
129 <map simName="InitialCondition" index="0,0"/>
130 </real>
131 </block>
132
133 <!-- StateSpace Block compatibility pattern -->
134 <block sim="StateSpace" xcos="CLSS" description="">
135 <simple sim="FunctionName" xcos="csslti4"></simple>
136 <simple sim="FunctionType" xcos="4"></simple>
137 <simple sim="BlockType" xcos="c"></simple>
138 <real xcos="exprs">
139 <map simName="A" index="0,0"/>
140 <map simName="B" index="1,0"/>
141 <map simName="C" index="2,0"/>
142 <map simName="D" index="3,0"/>
143 <map simName="X0" index="4,0"/>
144 </real>
145 <real xcos="rpar">
146 <map simName="A" index="0,0"/>
147 <map simName="B" index="1,0"/>
148 <map simName="C" index="2,0"/>
149 <map simName="D" index="3,0"/>
150 </real>
151 <real xcos="state">
152 <map simName="X0" index="0,0"/>
153 </real>
154 </block>
155
156 <!-- Transport-Delay Block compatibility pattern -->
157 <block sim="TransportDelay" xcos="TIME_DELAY" description="">
158 <simple sim="FunctionName" xcos="time delay"></simple>
159 <simple sim="FunctionType" xcos="4"></simple>
160 <simple sim="BlockType" xcos="x"></simple>
161 <str2int sim="FixedBuffer" xcos="???" description="">
162 <map simVal="off" xcosVal="0"/>
163 <map simVal="on" xcosVal="1"/>
164 </str2int>
165 <real xcos="rpar">
166 <map simName="DelayTime" index="0,0"/>
167 <map simName="InitialOutput" index="1,0"/>
168 </real>
169 <!--
170 <integer xcos="ipar" count="1">
171 <map name="BufferSize" index="0,0">
172 </integer>
173 -->
174 </block>
175
176 <!-- Variable-Transpor/Time-Delay Block compatibility pattern -->
177 <block sim="VariableTimeDelay" xcos="Variable_DELAY" description="">
178 <simple sim="FunctionName" xcos="variable delay"></simple>
179 <simple sim="FunctionType" xcos="4"></simple>
180 <simple sim="BlockType" xcos="d"></simple>
181 <str2int sim="FixedBuffer" xcos="???" description="">
182 <map simVal="off" xcosVal="0"/>
183 <map simVal="on" xcosVal="1"/>
184 </str2int>
185 <real xcos="rpar">
186 <map simName="MaximumDelay" index="0,0"/>
187 <map simName="InitialOutput" index="1,0"/>
188 </real>
189 <!--
190 <integer xcos="ipar" count="1">
191 <map name="BufferSize" index="0,0">
192 </integer>
193 -->
194 </block>
195
196<!-- Math Operations Library Block Parameters -->
197 <!-- A -->
198 <!--Absolute Value Block Compatibility Pattern:-->
199 <block sim="Abs" xcos="ABSOLUTE_VALUE" description="
200 SampleTime - in xcos always inherited;
201 OutMax - output limiter not available;
202 OutDataTypeStr - always inherited(?);
203 RndMeth - rounding mode not available(?);
204 SaturateOnIntegerOverflow - always saturated(?);
205 ">
206 <!-- TODO: ZeroCross for the second time, create general parameter -->
207 <str2int sim="ZeroCross" xcos="zero_crossing" description="Enable zero-crossing detection">
208 <map simVal="off" xcosVal="0"/>
209 <map simVal="on" xcosVal="1"/>
210 </str2int>
211 </block>
212
213 <!--Add Block Compatibility Pattern:-->
214 <block sim="Add" xcos="SUMMATION" description="
215 IconShape - not available;
216 CollapseMode - not available;
217 CollapseDim - not available;
218 SampleTime - always inherited;
219 AccumDataTypeStr - always inherited;
220 OutMin, OutMax - limiters of in/out values not available;
221 OutputDataType - always inherited;
222 LockScale - (?);
223 RndMeth - integer rounding method, unneccesery as output is inherited from
224 ">
225 <!-- TODO: unavailable parameter of data type, should be inherited from inputs some special handling needed -->
226 <simple sim="unavailable" xcos="Datatype" description="should be inherited from inputs"/>
227 <!-- TODO: '++-' to [1 , 1 , -1], some special handling needed -->
228 <str2int sim="Inputs" xcos="Number of inputs or sign vector" description="String with +/- to vec [1/-1]">
229 <map simVal="+" xcosVal="1"/>
230 <map simVal="-" xcosVal="-1"/>
231 </str2int>
232 <str2int sim=" SaturateOnIntegerOverflow" xcos="Do on Overflow" description="">
233 <map simVal="on" xcosVal="1"/>
234 <map simVal="off" xcosVal="0"/>
235 </str2int>
236 </block>
237
238 <!--Algebraic Constraint Compatibility Pattern:-->
239 <block sim="Algebraic Constraint" xcos="CONSTRAINT_c" description="no description">
240 <simple sim="z0" xcos="initial guess values" description="no description"/>
241 </block>
242
243 <!--Assignment Compatibility Pattern:-->
244 <block sim="Assignment" xcos="Assignment" description="no description">
245 <integer sim="NumberOfDimensions" xcos="Number of output dimensions" description="">
246 <map simVal="1" xcosVal="1"/>
247 </integer>
248 <str2int sim="IndexMode" xcos="Index Base" description="">
249 <map simVal="Zero-based" xcosVal="0"/>
250 <map simVal="One-based" xcosVal="1"/>
251 </str2int>
252 <str2int sim="IndexOptionArray" xcos="Index Option" description="">
253 <map simVal="Zero-based" xcosVal="0"/>
254 <map simVal="One-based" xcosVal="1"/>
255 </str2int>
256 <!--TODO: IndexOptions: See IndexOptionArray parameter for more information.
257 'Assign all' | {'Index vector (dialog)'} | 'Index vector (port)' | 'Starting index (dialog)' | 'Starting index (port)'
258 FIXME: Is it available only in scicos?
259 -->
260 </block>
261
262 <!-- Gain Block Compatibility Pattern -->
263 <block sim="Gain" xcos="GAINBLK_f" description="4">
264 <simple sim="FunctionName" xcos="gain"></simple>
265 <simple sim="FunctionType" xcos="null"></simple>
266 <simple sim="BlockType" xcos="c"></simple>
267 <real xcos="exprs">
268 <map simName="Gain" index="0,0"/>
269 </real>
270 <real xcos="rpar">
271 <map simName="Gain" index="0,0"/>
272 </real>
273 </block>
274
275 <!-- B -->
276
277<!-- Sources Library Block Parameters -->
278 <!-- C -->
279 <!-- Constant Block Compatibility Pattern -->
280 <block sim="Constant" xcos="CONST_m" description="4">
281 <simple sim="FunctionName" xcos="cstblk4"></simple>
282 <simple sim="FunctionType" xcos="4"></simple>
283 <simple sim="BlockType" xcos="d"></simple>
284 <real xcos="exprs">
285 <map simName="Value" index="0,0"/>
286 </real>
287 <real xcos="rpar">
288 <map simName="Value" index="0,0"/>
289 </real>
290 </block>
291
292<!-- Sinks -->
293 <!-- Scop Block compatibility pattern -->
294 <!-- FIXME -->
295 <block sim="Scope" xcos="CSCOPE" description="">
296 <simple sim="FunctionName" xcos="cscope"></simple>
297 <simple sim="FunctionType" xcos="4"></simple>
298 <simple sim="BlockType" xcos="c"></simple>
299 <simple sim="ControlPort" xcos="1"></simple>
300 <simple sim="CommandPort" xcos="0"></simple>
301 <real xcos="exprs">
302 <map simName="1 3 5 7 9 11 13 15" index="0,0"/> <!-- Color, mark, vector 8 entries -->
303 <map simName="-1" index="1,0"/> <!-- Output window number (-1) default -->
304 <map simName="[]" index="2,0"/> <!-- Output Window position -->
305 <map simName="[600;400]" index="3,0"/> <!-- Output window size -->
306 <map simName="YMin" index="4,0"/>
307 <map simName="YMax" index="5,0"/>
308 <map simName="30" index="6,0"/> <!-- RefreshPeriod -->
309 <map simName="20" index="7,0"/> <!-- BufferSize -->
310 <map simName="0" index="8,0"/> <!-- Accept herited events -->
311 <map simName="Name of scope" index="9,0"/> <!-- Name of scope -->
312 </real>
313 <real xcos="rpar">
314 <map simName="0" index="0,0"/><!-- AcceptedHeritedEvents -->
315 <map simName="YMin" index="1,0"/>
316 <map simName="YMax" index="2,0"/>
317 <map simName="30" index="3,0"/> <!-- RefreshPeriod -->
318 </real>
319 <real xcos="ipar">
320 <map simName="-1" index="0,0"/> <!-- -->
321 <map simName="1" index="1,0"/> <!-- -->
322 <map simName="20" index="2,0"/> <!-- BufferSize -->
323 <map simName="1" index="3,0"/> <!-- Color -->
324 <map simName="3" index="4,0"/>
325 <map simName="5" index="5,0"/>
326 <map simName="7" index="6,0"/>
327 <map simName="9" index="7,0"/>
328 <map simName="11" index="8,0"/>
329 <map simName="13" index="9,0"/>
330 <map simName="15" index="10,0"/> <!-- mark -->
331 <map simName="-1" index="11,0"/>
332 <map simName="-1" index="12,0"/>
333 <map simName="600" index="13,0"/> <!-- Window width -->
334 <map simName="400" index="14,0"/> <!-- Height -->
335 </real>
336 </block>
337
338<!-- Math Library Block Parameters -->
339 <!-- Sin Block Compatibility Pattern -->
340 <block sim="Sin" xcos="GENSIN_f" description="
341 LinearizePole - not available;
342 ">
343 <simple sim="FunctionName" xcos="gensin"></simple>
344 <simple sim="FunctionType" xcos="null"></simple>
345 <simple sim="BlockType" xcos="c"></simple>
346 <real xcos="exprs">
347 <map simName="Amplitude" index="0,0"/><!-- AcceptedHeritedEvents -->
348 <map simName="Frequency" index="1,0"/>
349 <map simName="Phase" index="2,0"/>
350 </real>
351 <real xcos="rpar">
352 <map simName="Amplitude" index="0,0"/><!-- AcceptedHeritedEvents -->
353 <map simName="Frequency" index="1,0"/>
354 <map simName="Phase" index="2,0"/>
355 </real>
356 </block>
357
358 <!-- Gain Block Compatibility Pattern -->
359 <block sim="Saturation" xcos="SATURATION" description="4">
360 <!-- FIXME -->
361 <!-- Zero crossing? -->
362 <simple sim="FunctionName" xcos="satur"></simple>
363 <simple sim="FunctionType" xcos="4"></simple>
364 <simple sim="BlockType" xcos="c"></simple>
365 <real xcos="exprs">
366 <map simName="UpperLimit" index="0,0"/>
367 <map simName="LowerLimit" index="1,0"/>
368 <map simName="0" index="1,0"/> <!-- ZeroCrossing -->
369 </real>
370 <real xcos="rpar">
371 <map simName="UpperLimit" index="0,0"/>
372 <map simName="LowerLimit" index="1,0"/>
373 </real>
374 </block>
375
376 <!-- FIXME: -->
377 <!-- Product Block Compatibility Pattern -->
378 <block sim="Product" xcos="PRODUCT" description="4">
379 <simple sim="FunctionName" xcos="product"></simple>
380 <simple sim="FunctionType" xcos="4"></simple>
381 <simple sim="BlockType" xcos="c"></simple>
382 <real xcos="exprs">
383 <map simName="Inputs" index="0,0"/> <!-- Inputs -->
384 </real>
385 <real xcos="ipar">
386 <map simName="Inputs" index="0,0"/> <!-- Inputs -->
387 </real>
388 </block>
389 <!-- FIXME: -->
390 <!-- Sum Block Compatibility Pattern -->
391 <block sim="Sum" xcos="SUMMATION" description="4">
392 <simple sim="FunctionName" xcos="summation"></simple>
393 <simple sim="FunctionType" xcos="4"></simple>
394 <simple sim="BlockType" xcos="c"></simple>
395 <real xcos="exprs">
396 <map simName="OutDataTypeStr" index="0,0"/><!-- Datatype -->
397 <map simName="Inputs" index="1,0"/><!-- Number of inputs, sign vector -->
398 <map simName="SaturateOnIntegerOverflow" index="2,0"/><!-- Do on overflowe -->
399 </real>
400 <!-- FIXME: -->
401 <real xcos="ipar">
402 <map simName="Inputs" index="0,0"/><!-- Number of inputs, sign vector -->
403 </real>
404 </block>
405 <!-- FIXME: -->
406 <!-- Relay Block Compatibility Pattern -->
407 <block sim="Relay" xcos="RELAY_f" description="">
408 <simple sim="FunctionName" xcos="relay"></simple>
409 <simple sim="FunctionType" xcos="4"></simple>
410 <simple sim="BlockType" xcos="c"></simple>
411 <real xcos="exprs">
412 <map simName="1" index="0,0"/><!-- Number of inputs -->
413 <map simName="1" index="1,0"/><!-- Initially connected input -->
414 </real>
415 <real xcos="dstate">
416 <map simName="1" index="0,0"/> <!-- Initially connected input 0-based -->
417 </real>
418 </block>
419
420 <!-- FIXME: -->
421 <!-- SubSystem Block Compatibility Pattern -->
422 <block sim="SubSystem" xcos="SUPER_f" description="">
423 <simple sim="FunctionName" xcos="super"></simple>
424 <simple sim="FunctionType" xcos="null"></simple>
425 <simple sim="BlockType" xcos="c"></simple>
426 </block>
427
428 <!-- FIXME: -->
429 <!-- MultiPortSwitch Block Compatibility Pattern -->
430 <block sim="MultiPortSwitch" xcos="M_SWITCH" description="">
431 <!-- TODO: Zero Cross -->
432 <simple sim="FunctionName" xcos="mswitch"></simple>
433 <simple sim="FunctionType" xcos="4"></simple>
434 <simple sim="BlockType" xcos="c"></simple>
435 <real xcos="exprs">
436 <map simName="Inputs" index="0,0"/><!-- number of inputs -->
437 <map simName="1" index="1,0"/><!-- zero base indexind --> <!-- in matlab depracated -->
438 <map simName="RndMethod" index="2,0"/><!-- rounding rule -->
439 </real>
440 <real xcos="ipar">
441 <map simName="1" index="0,0"/> <!-- zero base indexind -->
442 <map simName="RndMethod" index="1,0"/> <!-- rounding rule -->
443 </real>
444 </block>
445
446 <!-- FIXME: -->
447 <!-- Switch Block Compatibility Pattern -->
448 <block sim="Switch" xcos="SWITCH2_m" description="">
449 <!-- TODO: Zero Cross -->
450 <simple sim="FunctionName" xcos="switch2_m"></simple>
451 <simple sim="FunctionType" xcos="4"></simple>
452 <simple sim="BlockType" xcos="c"></simple>
453 <real xcos="exprs">
454 <map simName="FIXME: OutDataTypeStr" index="0,0"/><!-- Datatype -->
455 <map simName="Criteria" index="1,0"/><!-- past first input if -->
456 <map simName="Threshold" index="2,0"/><!-- threshold -->
457 <map simName="1" index="3,0"/><!-- Use zero crossing -->
458 </real>
459 <real xcos="FIXME: ipar">
460 <map simName="Criteria" index="0,0"/> <!-- zero base indexind -->
461 </real>
462 <real xcos="FIXME: rpar">
463 <map simName="Threshold" index="0,0"/> <!-- zero base indexind -->
464 </real>
465
466 </block>
467
468 <!-- FIXME: -->
469 <!-- Mux Block Compatibility Pattern -->
470 <block sim="Mux" xcos="MUX" description="">
471 <simple sim="FunctionName" xcos="multiplex"></simple>
472 <simple sim="FunctionType" xcos="4"></simple>
473 <simple sim="BlockType" xcos="c"></simple>
474 <real xcos="exprs">
475 <map simName="Inputs" index="0,0"/><!-- Number of input ports -->
476 </real>
477 <real xcos="ipar">
478 <map simName="Inputs" index="0,0"/><!-- Number of input ports -->
479 </real>
480 </block>
481 <!-- FIXME: -->
482 <!-- Demux Block Compatibility Pattern -->
483 <block sim="Demux" xcos="DEMUX" description="">
484 <simple sim="FunctionName" xcos="multiplex"></simple>
485 <simple sim="FunctionType" xcos="4"></simple>
486 <simple sim="BlockType" xcos="c"></simple>
487 <real xcos="exprs">
488 <map simName="Inputs" index="0,0"/><!-- Number of output ports -->
489 </real>
490 <real xcos="ipar">
491 <map simName="Inputs" index="0,0"/><!-- Number of output ports -->
492 </real>
493 </block>
494
495 <!-- RelationalOperator Block Compatibility Pattern -->
496 <block sim="RelationalOperator" xcos="RELATIONALOP" description="">
497 <!-- FIXME: -->
498 <!-- Zero crossing? -->
499 <simple sim="FunctionName" xcos="relationalop"></simple>
500 <simple sim="FunctionType" xcos="4"></simple>
501 <simple sim="BlockType" xcos="c"></simple>
502 <real xcos="exprs">
503 <map simName="Operator" index="0,0"/><!-- Operator -->
504 <map simName="0" index="0,0"/><!-- Use zero crossing -->
505 <map simName="1" index="0,0"/><!-- Datatype -->
506 </real>
507 <real xcos="ipar">
508 <!--TODO: Translation of Operator: -->
509 <map simName="2" index="0,0"/><!-- Number of output ports -->
510 </real>
511 </block>
512
513 <!-- Inport Block Compatibility Pattern -->
514 <block sim="Inport" xcos="IN_f" description="">
515 <simple sim="Inport" xcos="input"></simple>
516 <simple sim="FunctionType" xcos="null"></simple>
517 <simple sim="BlockType" xcos="c"></simple>
518 <real xcos="exprs">
519 <map simName="Port" index="0,0"/><!-- Port Number -->
520 </real>
521 <real xcos="ipar">
522 <!--TODO: Translation of Operator: -->
523 <map simName="Port" index="0,0"/><!-- PortNumber -->
524 </real>
525 </block>
526
527 <!-- Outport Block Compatibility Pattern -->
528 <block sim="Outport" xcos="OUT_f" description="">
529 <!-- Zero crossing? -->
530 <simple sim="FunctionName" xcos="output"></simple>
531 <simple sim="FunctionType" xcos="null"></simple>
532 <simple sim="BlockType" xcos="c"></simple>
533 <real xcos="exprs">
534 <map simName="Port" index="0,0"/><!-- Port Number -->
535 </real>
536 <real xcos="ipar">
537 <!--TODO: Translation of Operator: -->
538 <map simName="Port" index="0,0"/><!-- PortNumber -->
539 </real>
540 </block>
541
542 <!-- TransferFcn Block Compatibility Pattern -->
543 <block sim="TransferFcn" xcos="CLR" description="">
544 <!-- FIXME: -->
545 <simple sim="FunctionName" xcos="clr"></simple>
546 <simple sim="FunctionType" xcos="4"></simple>
547 <simple sim="BlockType" xcos="c"></simple>
548 </block>
549
550 <!-- DiscreteTransferFcn Block Compatibility Pattern -->
551 <block sim="DiscreteTransferFcn" xcos="DLR" description="">
552 <!-- FIXME: -->
553 <simple sim="FunctionName" xcos="dlr"></simple>
554 <simple sim="FunctionType" xcos="4"></simple>
555 <simple sim="BlockType" xcos="c"></simple>
556 </block>
557
558 <!-- CombinatorialLogic Block Compatibility Pattern -->
559 <!-- FIXME: -->
560 <block sim="CombinatorialLogic" xcos="LOGIC" description="">
561 <!-- Zero crossing? -->
562 <simple sim="FunctionName" xcos="logic"></simple>
563 <simple sim="FunctionType" xcos="4"></simple>
564 <simple sim="BlockType" xcos="c"></simple>
565 <real xcos="exprs">
566 <map simName="TruthTable" index="0,0"/><!-- TruthTable -->
567 <map simName="0" index="0,0"/><!-- Inherit -->
568 <map simName="1" index="0,0"/><!-- Datatype -->
569 </real>
570 <real xcos="opar">
571 <!--TODO: Translation of Operator: -->
572 <map simName="TruthTable" index="0,0"/><!-- TruthTable -->
573 </real>
574 </block>
575
576</blocks>
diff --git a/scilab/modules/xcos/etc/simulinkImportGeneralParameters.xml b/scilab/modules/xcos/etc/simulinkImportGeneralParameters.xml
new file mode 100644
index 0000000..a506193
--- /dev/null
+++ b/scilab/modules/xcos/etc/simulinkImportGeneralParameters.xml
@@ -0,0 +1,14 @@
1<generals dsc="string">
2 <!--Zero or more repetitions:-->
3 <string sim="string" xCos="string" dsc="string">
4 <!--1 or more repetitions:-->
5 <parMap simVal="string" xCosVal="string"/>
6 </string>
7 <!--Zero or more repetitions:-->
8 <integer sim="string" xCos="string" dsc="string">
9 <!--1 or more repetitions:-->
10 <parMap simVal="100" xCosVal="100"/>
11 </integer>
12 <!--Zero or more repetitions:-->
13 <simple sim="string" xCos="string" dsc="string"/>
14</generals>
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
index 9e6b511..f8cec0a 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
@@ -62,6 +62,7 @@ import org.scilab.modules.xcos.actions.DebugLevelAction;
62import org.scilab.modules.xcos.actions.DiagramBackgroundAction; 62import org.scilab.modules.xcos.actions.DiagramBackgroundAction;
63import org.scilab.modules.xcos.actions.ExportAction; 63import org.scilab.modules.xcos.actions.ExportAction;
64import org.scilab.modules.xcos.actions.FitDiagramToViewAction; 64import org.scilab.modules.xcos.actions.FitDiagramToViewAction;
65import org.scilab.modules.xcos.simulink.ImportAction;
65import org.scilab.modules.xcos.actions.InitModelicaAction; 66import org.scilab.modules.xcos.actions.InitModelicaAction;
66import org.scilab.modules.xcos.actions.NewDiagramAction; 67import org.scilab.modules.xcos.actions.NewDiagramAction;
67import org.scilab.modules.xcos.actions.NormalViewAction; 68import org.scilab.modules.xcos.actions.NormalViewAction;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
index 28f2ca3..1f58238 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
@@ -357,7 +357,9 @@ public class BasicBlock extends ScilabGraphUniqueObject implements Serializable
357 */ 357 */
358 @Override 358 @Override
359 public void propertyChange(PropertyChangeEvent evt) { 359 public void propertyChange(PropertyChangeEvent evt) {
360 LOG.trace(evt.getPropertyName() + ": " + evt.getOldValue() + ", " + evt.getNewValue()); 360 if (LOG.isTraceEnabled()) {
361 LOG.trace(evt.getPropertyName() + ": " + evt.getOldValue() + ", " + evt.getNewValue());
362 }
361 } 363 }
362 } 364 }
363 365
@@ -969,7 +971,7 @@ public class BasicBlock extends ScilabGraphUniqueObject implements Serializable
969 setDependsOnT(modifiedBlock.isDependsOnT()); 971 setDependsOnT(modifiedBlock.isDependsOnT());
970 setDependsOnU(modifiedBlock.isDependsOnU()); 972 setDependsOnU(modifiedBlock.isDependsOnU());
971 setExprs(modifiedBlock.getExprs()); 973 setExprs(modifiedBlock.getExprs());
972 974
973 setRealParameters(modifiedBlock.getRealParameters()); 975 setRealParameters(modifiedBlock.getRealParameters());
974 setIntegerParameters(modifiedBlock.getIntegerParameters()); 976 setIntegerParameters(modifiedBlock.getIntegerParameters());
975 setObjectsParameters(modifiedBlock.getObjectsParameters()); 977 setObjectsParameters(modifiedBlock.getObjectsParameters());
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/ProdPortLabelingListener.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/ProdPortLabelingListener.java
index 3575e53..ae178db 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/ProdPortLabelingListener.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/ProdPortLabelingListener.java
@@ -18,10 +18,13 @@ import java.io.Serializable;
18import java.util.ArrayList; 18import java.util.ArrayList;
19import java.util.List; 19import java.util.List;
20 20
21import org.apache.commons.logging.Log;
22import org.apache.commons.logging.LogFactory;
21import org.scilab.modules.types.ScilabDouble; 23import org.scilab.modules.types.ScilabDouble;
22import org.scilab.modules.xcos.block.BasicBlock; 24import org.scilab.modules.xcos.block.BasicBlock;
23import org.scilab.modules.xcos.port.BasicPort; 25import org.scilab.modules.xcos.port.BasicPort;
24import org.scilab.modules.xcos.port.input.InputPort; 26import org.scilab.modules.xcos.port.input.InputPort;
27import org.scilab.modules.xcos.simulink.MatrixElement;
25 28
26import com.mxgraph.model.mxICell; 29import com.mxgraph.model.mxICell;
27 30
@@ -34,7 +37,7 @@ public class ProdPortLabelingListener implements PropertyChangeListener, Seriali
34 37
35 private static final String NOT_PRINTED_LABEL = "\u00d7"; 38 private static final String NOT_PRINTED_LABEL = "\u00d7";
36 private static ProdPortLabelingListener instance; 39 private static ProdPortLabelingListener instance;
37 40 private static final Log LOG = LogFactory.getLog(ProdPortLabelingListener.class);
38 /** 41 /**
39 * Default constructor 42 * Default constructor
40 */ 43 */
@@ -66,10 +69,12 @@ public class ProdPortLabelingListener implements PropertyChangeListener, Seriali
66 * Get the input port children 69 * Get the input port children
67 */ 70 */
68 final List<InputPort> ports = new ArrayList<InputPort>(); 71 final List<InputPort> ports = new ArrayList<InputPort>();
72 LOG.trace(source.getChildCount());
69 for (int i = 0; i < source.getChildCount(); i++) { 73 for (int i = 0; i < source.getChildCount(); i++) {
70 final mxICell port = source.getChildAt(i); 74 final mxICell port = source.getChildAt(i);
71 75
72 if (port instanceof InputPort) { 76 if (port instanceof InputPort) {
77 LOG.trace(port.getId());
73 ports.add((InputPort) port); 78 ports.add((InputPort) port);
74 } 79 }
75 } 80 }
@@ -87,6 +92,7 @@ public class ProdPortLabelingListener implements PropertyChangeListener, Seriali
87 } 92 }
88 93
89 port.setValue(getLabel(gain)); 94 port.setValue(getLabel(gain));
95 LOG.trace(port.getValue());
90 } 96 }
91 97
92 /** 98 /**
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/AbstractElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/AbstractElement.java
new file mode 100644
index 0000000..b48d123
--- /dev/null
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/AbstractElement.java
@@ -0,0 +1,20 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2010 - Jerzy Zagorski
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12
13package org.scilab.modules.xcos.simulink;
14
15public class AbstractElement<T> {
16 /**
17 * Default constructor
18 */
19 protected AbstractElement() { }
20}
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/AnnotationElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/AnnotationElement.java
new file mode 100644
index 0000000..f81c8eb
--- /dev/null
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/AnnotationElement.java
@@ -0,0 +1,42 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2010 - Jerzy Zagorski
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12
13package org.scilab.modules.xcos.simulink;
14
15import org.apache.commons.logging.LogFactory;
16import org.scilab.modules.xcos.block.BasicBlock;
17import org.scilab.modules.xcos.block.TextBlock;
18
19import edu.tum.cs.simulink.model.SimulinkAnnotation;
20import edu.tum.cs.simulink.model.SimulinkBlock;
21
22public class AnnotationElement extends AbstractElement<TextBlock>{
23
24 private BlockGraphicElement graphicElement = new BlockGraphicElement();
25
26 public boolean canDecode(SimulinkAnnotation data) {
27 // TODO Auto-generated method stub
28 return true;
29 }
30
31 public Object decode(SimulinkAnnotation from, Object object) {
32 // TODO Auto-generated method stub
33 TextBlock annotation;
34 LogFactory.getLog(AnnotationElement.class).trace("From " + from.getName() + ":");
35 LogFactory.getLog(AnnotationElement.class).trace(from.getParameterNames().toString());
36 annotation = new TextBlock();
37 annotation.setValue(from.getName());
38 graphicElement.decode(from, annotation);
39 return annotation;
40 }
41
42}
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/BlockElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/BlockElement.java
new file mode 100644
index 0000000..7985bb2
--- /dev/null
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/BlockElement.java
@@ -0,0 +1,175 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2010 - Jerzy Zagorski
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12
13package org.scilab.modules.xcos.simulink;
14
15import java.util.HashMap;
16import java.util.Iterator;
17import java.util.Map;
18
19import org.apache.commons.logging.Log;
20import org.apache.commons.logging.LogFactory;
21import org.scilab.modules.xcos.block.BasicBlock;
22import org.scilab.modules.xcos.block.BlockFactory;
23import org.scilab.modules.xcos.block.SuperBlock;
24import org.scilab.modules.xcos.graph.SuperBlockDiagram;
25import org.scilab.modules.xcos.graph.XcosDiagram;
26import org.scilab.modules.xcos.link.BasicLink;
27import org.scilab.modules.xcos.port.command.CommandPort;
28import org.scilab.modules.xcos.port.control.ControlPort;
29import org.scilab.modules.xcos.port.input.InputPort;
30import org.scilab.modules.xcos.port.output.OutputPort;
31import org.scilab.modules.xcos.utils.BlockPositioning;
32
33import com.mxgraph.model.mxCell;
34
35import edu.tum.cs.commons.collections.UnmodifiableIterator;
36import edu.tum.cs.simulink.model.SimulinkAnnotation;
37import edu.tum.cs.simulink.model.SimulinkBlock;
38import edu.tum.cs.simulink.model.SimulinkInPort;
39import edu.tum.cs.simulink.model.SimulinkLine;
40import edu.tum.cs.simulink.model.SimulinkOutPort;
41
42public class BlockElement extends AbstractElement<BasicBlock> {
43
44 private SimulinkBlock base;
45 private BlockGraphicElement graphicElement = new BlockGraphicElement();
46 private BlockSpecificElement specificElement = new BlockSpecificElement();
47 private BlockModelElement modelElement = new BlockModelElement();
48 private static final Log LOG = LogFactory.getLog(BlockElement.class);
49
50 /** Map from index to blocks */
51 private final Map<Integer, BasicBlock> blocks;
52 /**
53 * Default constructor
54 */
55 public BlockElement() {
56 blocks = new HashMap<Integer, BasicBlock>();
57 }
58 /**
59 * Current block ordering, the ordering change on each {@link BlockElement}
60 * instance so be careful when allocated a new {@link BlockElement}.
61 */
62 private int ordering;
63
64 /*
65 * here there will be some neccessery functions, checking if import is possible etc.
66 */
67
68 public BasicBlock decode(SimulinkBlock from, BasicBlock into, XcosDiagram diag) {
69 BasicBlock block = into;
70 base = from;
71 if (block == null) {
72 block = BlockFactory.createBlock(modelElement.getInterFunctionName(base));
73 LOG.trace(modelElement.getInterFunctionName(base));
74 }
75 block.setParentDiagram(diag);
76 /*
77 * TODO: SimulinkBlock decoding, parameters etc.
78 */
79 decodeParams(block);
80
81 return block;
82 }
83
84 private void decodeParams(BasicBlock block) {
85 // TODO Auto-generated method stub
86
87 OutputPortElement outElement = new OutputPortElement(base);
88 UnmodifiableIterator<SimulinkOutPort> portOutIter = base.getOutPorts().iterator();
89 OutputPort[] outPortTempTable= new OutputPort[base.getOutPorts().size() + 1];
90 while(portOutIter.hasNext()) {
91 OutputPort portAdd = outElement.decode(portOutIter.next(), null);
92 outPortTempTable[portAdd.getOrdering()] = portAdd;
93 }
94 for(int i = 1 ; i < outPortTempTable.length ; i++){
95 block.addPort(outPortTempTable[i]);
96 }
97
98 InputPortElement inElement = new InputPortElement(base);
99 UnmodifiableIterator<SimulinkInPort> portInIter = base.getInPorts().iterator();
100 InputPort[] inPortTempTable= new InputPort[base.getInPorts().size() + 1];
101 while(portInIter.hasNext()) {
102 InputPort portAdd = inElement.decode(portInIter.next(), null);
103 if (LOG.isDebugEnabled()) {
104 LOG.debug(inPortTempTable.length);
105 LOG.debug(portAdd.getOrdering());
106 LOG.debug(portAdd.getId().toString());
107 }
108 inPortTempTable[portAdd.getOrdering()] = portAdd;
109 }
110 for(int i = 1 ; i < inPortTempTable.length ; i++){
111 block.addPort(inPortTempTable[i]);
112 }
113 /*
114 * Add control and command ports
115 */
116 for(int i=0 ; i< modelElement.getControlPorts(base) ; i++ ){
117 ControlPort portAdd = inElement.decodeControlPort();
118 block.addPort(portAdd);
119 }
120
121 /*
122 * Add control and command ports
123 */
124 for(int i=0 ; i< modelElement.getCommandPorts(base) ; i++ ){
125 CommandPort portAdd = outElement.decodeCommandPort();
126 block.addPort(portAdd);
127 }
128 /*
129 * decode graphics elements of BasicBlock
130 */
131 graphicElement.decode(base, block);
132
133 try {
134 modelElement.decode(base, block);
135