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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -269,6 +270,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -361,6 +363,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -255,6 +256,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -347,6 +349,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -223,6 +224,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -315,6 +317,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -245,6 +246,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -337,6 +339,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -188,6 +189,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -280,6 +282,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -225,6 +226,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -317,6 +319,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -319,6 +320,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -411,6 +413,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -220,6 +221,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -312,6 +314,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -240,6 +241,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -332,6 +334,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -185,6 +186,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -277,6 +279,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -247,6 +248,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -339,6 +341,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -259,6 +260,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -351,6 +353,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -460,6 +461,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -552,6 +554,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -255,6 +256,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -347,6 +349,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -184,6 +185,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -276,6 +278,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -183,6 +184,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -275,6 +277,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -134,6 +135,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -226,6 +228,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -265,6 +266,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -357,6 +359,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -224,6 +225,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -316,6 +318,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -242,6 +243,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -334,6 +336,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -594,6 +595,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -686,6 +688,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -243,6 +244,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -335,6 +337,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -278,6 +279,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -370,6 +372,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -233,6 +234,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -325,6 +327,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -187,6 +188,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -279,6 +281,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -223,6 +224,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -315,6 +317,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -260,6 +261,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -352,6 +354,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -595,6 +596,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -687,6 +689,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -350,6 +351,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -442,6 +444,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -275,6 +276,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -367,6 +369,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -250,6 +251,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -342,6 +344,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -254,6 +255,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -346,6 +348,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -271,6 +272,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -363,6 +365,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -258,6 +259,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -350,6 +352,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -240,6 +241,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -332,6 +334,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -225,6 +226,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -317,6 +319,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -237,6 +238,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -329,6 +331,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -251,6 +252,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -343,6 +345,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -252,6 +253,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -344,6 +346,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -261,6 +262,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -353,6 +355,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -254,6 +255,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -346,6 +348,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -182,6 +183,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -274,6 +276,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -182,6 +183,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -274,6 +276,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -249,6 +250,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -341,6 +343,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -226,6 +227,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -318,6 +320,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -183,6 +184,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -275,6 +277,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -251,6 +252,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -343,6 +345,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -268,6 +269,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -360,6 +362,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -183,6 +184,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -275,6 +277,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -237,6 +238,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -329,6 +331,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -215,6 +216,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -307,6 +309,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -255,6 +256,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -347,6 +349,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -295,6 +296,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -387,6 +389,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -229,6 +230,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -321,6 +323,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -479,6 +480,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -571,6 +573,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -464,6 +465,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -556,6 +558,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -724,6 +725,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -816,6 +818,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -248,6 +249,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -340,6 +342,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -238,6 +239,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -330,6 +332,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -247,6 +248,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -339,6 +341,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -187,6 +188,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -279,6 +281,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -212,6 +213,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -304,6 +306,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -262,6 +263,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -354,6 +356,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -236,6 +237,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -328,6 +330,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -223,6 +224,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -315,6 +317,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -243,6 +244,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -335,6 +337,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -255,6 +256,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -347,6 +349,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -227,6 +228,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -319,6 +321,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -261,6 +262,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -353,6 +355,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -182,6 +183,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -274,6 +276,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -219,6 +220,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -311,6 +313,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -223,6 +224,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -315,6 +317,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -248,6 +249,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -340,6 +342,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -250,6 +251,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -342,6 +344,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -212,6 +213,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -304,6 +306,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -260,6 +261,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -352,6 +354,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @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 @@
     <!-- Validate the palette configuration file -->
     <schemavalidate noNamespaceFile="etc/PaletteConfiguration.xsd"
       file="etc/palettes.xml" />
+
+    <!-- Validate the simulink to Xcos configuration file -->
+    <schemavalidate noNamespaceFile="etc/SimulinkImportConfiguration.xsd">
+      <fileset dir="etc" includes="simulinkImportBlocks.xml" />
+    </schemavalidate>
   </target>
 
 </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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+            jxb:version="2.0">
+        
+        <!--Each Migration Schema, can consist of many blocks, and only one general parameters section -->
+        <!--<xsd:element name="generals" type="GeneralParameters"/> general section will be added as a block to BlockPalette-->
+        <xsd:element name="blocks" type="BlockPalette"/>        
+        
+        <xsd:complexType name="GeneralParameters">
+          <xsd:sequence>
+            <xsd:element name="string" type="StringParameters" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="integer" type="IntegerParameters" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="simple" type="SimpleParameter" minOccurs="0" maxOccurs="unbounded"/>
+          </xsd:sequence>
+            <xsd:attribute name="description" type="xsd:string" use="optional"/>
+        </xsd:complexType>
+
+        <xsd:complexType name="BlockPalette">
+          <xsd:sequence>
+            <xsd:element name="block" type="Block" minOccurs="0" maxOccurs="unbounded"/>
+          </xsd:sequence>
+        </xsd:complexType>
+        <!-- parameter won't be found in Block scope, It'll be searched among general parameters. This way it will be possible to shadow parameter -->
+        <xsd:complexType name="Block">
+          <xsd:sequence>
+            <xsd:element name="string" type="StringParameters" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="integer" type="IntegerParameters" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="simple" type="SimpleParameter" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="str2int" type="Str2IntParameters" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="int2str" type="Int2StrParameters" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="real" type="RealParameters" minOccurs="0" maxOccurs="unbounded"/>
+          </xsd:sequence>
+            <xsd:attribute name="sim" type="xsd:string" use="required"/>
+            <xsd:attribute name="xcos" type="xsd:string" use="required"/>       
+            <xsd:attribute name="description" type="xsd:string" use="optional"/>
+        </xsd:complexType>
+        <!-- parameters that differs only in parameter name ex:Constant Value -->
+        <xsd:complexType name="SimpleParameter">
+            <xsd:attribute name="sim" type="xsd:string" use="required"/>
+            <xsd:attribute name="xcos" type="xsd:string" use="required"/>
+            <xsd:attribute name="description" type="xsd:string" use="optional"/>
+         </xsd:complexType>
+        <!-- parameters that in name, and have different string values ex:CSCOPE SCOPE -->
+        <xsd:complexType name="StringParameters">
+          <xsd:sequence>
+            <xsd:element name="map" type="StringValueMap" minOccurs="1" maxOccurs="unbounded"/>
+          </xsd:sequence>
+            <xsd:attribute name="sim" type="xsd:string" use="required"/>
+            <xsd:attribute name="xcos" type="xsd:string" use="required"/>
+            <xsd:attribute name="description" type="xsd:string" use="optional"/>
+         </xsd:complexType>
+
+        <xsd:complexType name="StringValueMap">
+            <xsd:attribute name="simVal" type="xsd:string" use="required"/>
+            <xsd:attribute name="xcosVal" type="xsd:string" use="required"/>
+         </xsd:complexType>
+        <!-- parameters that needs to be calculated before setting -->
+        <xsd:complexType name="IntegerParameters">
+          <xsd:sequence>
+            <xsd:element name="map" type="IntegerValueMap" minOccurs="1" maxOccurs="unbounded"/>
+          </xsd:sequence>
+            <xsd:attribute name="sim" type="xsd:string" use="required"/>
+            <xsd:attribute name="xcos" type="xsd:string" use="required"/>
+            <xsd:attribute name="description" type="xsd:string" use="optional"/>
+         </xsd:complexType>
+
+        <xsd:complexType name="IntegerValueMap">
+            <xsd:attribute name="simVal" type="xsd:integer" use="required"/>
+            <xsd:attribute name="xcosVal" type="xsd:integer" use="required"/>
+         </xsd:complexType>
+
+        <xsd:complexType name="Str2IntParameters">
+          <xsd:sequence>
+            <xsd:element name="map" type="Str2IntValueMap" minOccurs="1" maxOccurs="unbounded"/>
+          </xsd:sequence>
+            <xsd:attribute name="sim" type="xsd:string" use="required"/>
+            <xsd:attribute name="xcos" type="xsd:string" use="required"/>
+            <xsd:attribute name="description" type="xsd:string" use="optional"/>
+         </xsd:complexType>
+
+        <xsd:complexType name="Str2IntValueMap">
+            <xsd:attribute name="simVal" type="xsd:string" use="required"/>
+            <xsd:attribute name="xcosVal" type="xsd:integer" use="required"/>
+         </xsd:complexType>
+
+        <xsd:complexType name="Int2StrParameters">
+          <xsd:sequence>
+            <xsd:element name="map" type="Int2StrValueMap" minOccurs="1" maxOccurs="unbounded"/>
+          </xsd:sequence>
+            <xsd:attribute name="sim" type="xsd:string" use="required"/>
+            <xsd:attribute name="xcos" type="xsd:string" use="required"/>
+            <xsd:attribute name="description" type="xsd:string" use="optional"/>
+         </xsd:complexType>
+        <xsd:complexType name="Int2StrValueMap">
+            <xsd:attribute name="simVal" type="xsd:integer" use="required"/>
+            <xsd:attribute name="xcosVal" type="xsd:string" use="required"/>
+         </xsd:complexType>
+         
+         <xsd:complexType name="RealParameters">
+          <xsd:sequence>
+            <xsd:element name="map" type="RealValueMap" minOccurs="1" maxOccurs="unbounded"/>
+          </xsd:sequence>
+            <xsd:attribute name="sim" type="xsd:string" use="optional"/>
+            <xsd:attribute name="xcos" type="xsd:string" use="required"/>
+            <xsd:attribute name="description" type="xsd:string" use="optional"/>
+         </xsd:complexType>
+
+        <xsd:complexType name="RealValueMap">
+            <xsd:attribute name="simName" type="xsd:string" use="required"/>
+            <xsd:attribute name="index" type="xsd:string" use="required"/>
+         </xsd:complexType>
+        <!--Its possible that Ill have to add more parameter types, such as: boolean -->
+</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 @@
+<blocks>
+<!--Template-->
+        <block sim="string" xcos="string" description="string">
+                <!--Zero or more repetitions:-->
+                <string sim="string" xcos="string" description="string">
+                        <!--1 or more repetitions:-->
+                        <map simVal="string" xcosVal="string"/>
+                </string>
+                <!--Zero or more repetitions:-->
+                <integer sim="string" xcos="string" description="string">
+                        <!--1 or more repetitions:-->
+                        <map simVal="100" xcosVal="100"/>
+                </integer>
+                <!--Zero or more repetitions:-->
+                <simple sim="string" xcos="string" description="string"/>
+        </block>
+        
+<!-- TODO: Zero Cross -->
+
+<!-- General parameters, common for many blocks -->
+<!-- Ports, ShowName, SID, BlockMirror, DropShadow, FontSize, BackgroundColor, BlockType, NamePlacement, ShowSaturationPort(?), FontName, ShowStatePort, FontWeigh, ContinuousStateAttributes, FontAngle, Name, ForegroundColor, BlockRotation, NumInputPorts, DataFormat -->
+
+        <block sim="general" xcos="general" description="">
+                <!--Zero or more repetitions:-->
+                <string sim="string" xcos="string" description="string">
+                        <!--1 or more repetitions:-->
+                        <map simVal="string" xcosVal="string"/>
+                </string>
+                <!--Zero or more repetitions:-->
+                <integer sim="string" xcos="string" description="string">
+                        <!--1 or more repetitions:-->
+                        <map simVal="100" xcosVal="100"/>
+                </integer>
+                <!--Zero or more repetitions:-->
+                <simple sim="string" xcos="string" description="string"/>
+                <str2int sim="ZeroCross" xcos="zero_crossing" description="Enable zero-crossing detection">
+                        <map simVal="off" xcosVal="0"/>
+                        <map simVal="on" xcosVal="1"/>
+                </str2int>
+        <!--
+                 *       - "interfaceFunctionName"
+                 *       - "simulationFunctionName"
+                 *       - "simulationFunctionType"
+                 *       - "exprs"
+                 *       - "realParameters"
+                 *       - "integerParameters"
+                 *       - "objectsParameters"
+                 *       - "nbZerosCrossing"
+                 *       - "nmode"
+                 *       - "state"
+                 *       - "dState"
+                 *       - "oDState"
+                 *       - "equations"
+                 *       - "dependsOnU"
+                 *       - "dependsOnT"
+                 *       - "blockType"
+                 *       - "ordering"
+        -->
+        </block>
+
+<!--Compatibility patterns for diagram parameters -->
+        <block sim="diagram" xcos="diagram" description="">
+        <!--    
+                private double finalIntegrationTime;
+                private double integratorAbsoluteTolerance;
+                private double integratorRelativeTolerance;
+                private double toleranceOnTime;
+                private double maxIntegrationTimeInterval;
+                private double realTimeScaling;
+                private double solver;
+                private double maximumStepSize;
+                private int debugLevel;
+                private String[] context;
+                private String version;
+        -->
+        </block>
+
+<!-- Continuous Library Block Parameters -->
+                <!--    Derivative Block Compatibility Pattern -->
+                <block sim="Derivative" xcos="DERIV" description="
+                        LinearizePole - not available;
+                        ">
+                        <simple sim="FunctionName" xcos="deriv"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="x"></simple>
+                        
+                </block>
+                
+                <!--    Integrator Block Compatibility Pattern -->
+                <block sim="Integrator" xcos="INTEGRAL_m" description="
+                        ExternalReset - not available;
+                        InitialConditionSource - external?internal (?);
+                        LimitOutput - switched on by default;
+                        ShowSaturationPort - N/A;
+                        ShowStatePort - N/A;
+                        AbsoluteTolerance- N/A;
+                        IgnoreLimit - N/A;
+                        ContinuousStateAttributes - N/A;"
+                        >
+                        <simple sim="FunctionName" xcos="integral_func"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        
+                        <str2int sim="ZeroCross" xcos="nzcross" description="Enable zero-crossing detection">
+                                <map simVal="off" xcosVal="0"/>
+                                <map simVal="on" xcosVal="1"/>
+                        </str2int>
+                        <str2int sim="ExternalReset" xcos="With re-initialization" description="">
+                                <!-- TODO: {'none'} | 'rising' | 'falling' | 'either' | 'level' | 'level hold' -->
+                                <map simVal="none" xcosVal="0"/>
+                        </str2int>
+                        <str2int sim="LimitOutput" xcos="rpar" description="">
+                                <map simVal="off" xcosVal="0"/>
+                                <map simVal="on" xcosVal="1"/>
+                        </str2int>
+                        <real xcos="exprs">
+                                <map simName="InitialCondition" index="0,0"/>
+                                <map simName="0" index="1,0"/> <!-- with reinitialization -->
+                                <map simName="0" index="2,0"/> <!-- with saturation -->
+                                <map simName="UpperSaturationLimit" index="3,0"/>
+                                <map simName="LowerSaturationLimit" index="4,0"/>
+                        </real>
+                        <!-- 
+                        <real xcos="rpar">
+                                <map simName="UpperSaturationLimit" index="0,0"/>
+                                <map simName="LowerSaturationLimit" index="1,0"/>
+                        </real> -->
+                        <real xcos="state">
+                                <map simName="InitialCondition" index="0,0"/>
+                        </real>
+                </block>
+                
+                <!-- StateSpace Block compatibility pattern -->
+                <block sim="StateSpace" xcos="CLSS" description="">
+                        <simple sim="FunctionName" xcos="csslti4"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="A" index="0,0"/>
+                                <map simName="B" index="1,0"/>
+                                <map simName="C" index="2,0"/>
+                                <map simName="D" index="3,0"/>
+                                <map simName="X0" index="4,0"/>
+                        </real>
+                        <real xcos="rpar">
+                                <map simName="A" index="0,0"/>
+                                <map simName="B" index="1,0"/>
+                                <map simName="C" index="2,0"/>
+                                <map simName="D" index="3,0"/>
+                        </real> 
+                        <real xcos="state">
+                                <map simName="X0" index="0,0"/>
+                        </real>
+                </block>
+                
+                <!-- Transport-Delay Block compatibility pattern -->
+                <block sim="TransportDelay" xcos="TIME_DELAY" description="">
+                        <simple sim="FunctionName" xcos="time delay"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="x"></simple>
+                        <str2int sim="FixedBuffer" xcos="???" description="">
+                                <map simVal="off" xcosVal="0"/>
+                                <map simVal="on" xcosVal="1"/>
+                        </str2int>
+                        <real xcos="rpar">
+                                <map simName="DelayTime" index="0,0"/>
+                                <map simName="InitialOutput" index="1,0"/>
+                        </real> 
+                        <!-- 
+                        <integer xcos="ipar" count="1">
+                                <map name="BufferSize" index="0,0">
+                        </integer>
+                        -->
+                </block>
+                
+                <!-- Variable-Transpor/Time-Delay Block compatibility pattern -->
+                <block sim="VariableTimeDelay" xcos="Variable_DELAY" description="">
+                        <simple sim="FunctionName" xcos="variable delay"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="d"></simple>
+                        <str2int sim="FixedBuffer" xcos="???" description="">
+                                <map simVal="off" xcosVal="0"/>
+                                <map simVal="on" xcosVal="1"/>
+                        </str2int>
+                        <real xcos="rpar">
+                                <map simName="MaximumDelay" index="0,0"/>
+                                <map simName="InitialOutput" index="1,0"/>
+                        </real> 
+                        <!-- 
+                        <integer xcos="ipar" count="1">
+                                <map name="BufferSize" index="0,0">
+                        </integer>
+                        -->
+                </block>
+                
+<!-- Math Operations Library Block Parameters -->
+        <!-- A -->
+                <!--Absolute Value Block Compatibility Pattern:-->
+                <block sim="Abs" xcos="ABSOLUTE_VALUE" description="
+                SampleTime - in xcos always inherited;
+                OutMax - output limiter not available;
+                OutDataTypeStr - always inherited(?);
+                RndMeth - rounding mode not available(?);
+                SaturateOnIntegerOverflow - always saturated(?);
+                ">
+                        <!-- TODO: ZeroCross for the second time, create general parameter -->
+                        <str2int sim="ZeroCross" xcos="zero_crossing" description="Enable zero-crossing detection">
+                                <map simVal="off" xcosVal="0"/>
+                                <map simVal="on" xcosVal="1"/>
+                        </str2int>
+                </block>
+                
+                <!--Add Block Compatibility Pattern:-->
+                <block sim="Add" xcos="SUMMATION" description="
+                        IconShape - not available;
+                        CollapseMode - not available;
+                        CollapseDim - not available;
+                        SampleTime - always inherited;
+                        AccumDataTypeStr - always inherited;
+                        OutMin, OutMax - limiters of in/out values not available;
+                        OutputDataType - always inherited;
+                        LockScale - (?);
+                        RndMeth - integer rounding method, unneccesery as output is inherited from
+                        ">
+                        <!-- TODO: unavailable parameter of data type, should be inherited from inputs some special handling needed -->
+                        <simple sim="unavailable" xcos="Datatype" description="should be inherited from inputs"/>
+                        <!-- TODO: '++-' to [1 , 1 , -1], some special handling needed -->
+                        <str2int sim="Inputs" xcos="Number of inputs or sign vector" description="String with +/- to vec [1/-1]">
+                                <map simVal="+" xcosVal="1"/>
+                                <map simVal="-" xcosVal="-1"/>
+                        </str2int>
+                        <str2int sim=" SaturateOnIntegerOverflow" xcos="Do on Overflow" description="">
+                                <map simVal="on" xcosVal="1"/>
+                                <map simVal="off" xcosVal="0"/>
+                        </str2int>
+                        </block>
+                        
+                <!--Algebraic Constraint Compatibility Pattern:-->
+                <block sim="Algebraic Constraint" xcos="CONSTRAINT_c" description="no description">
+                        <simple sim="z0" xcos="initial guess values" description="no description"/>
+                </block>
+                
+                <!--Assignment Compatibility Pattern:-->
+                <block sim="Assignment" xcos="Assignment" description="no description">
+                        <integer sim="NumberOfDimensions" xcos="Number of output dimensions" description="">
+                                <map simVal="1" xcosVal="1"/>
+                        </integer>
+                        <str2int sim="IndexMode" xcos="Index Base" description="">
+                                <map simVal="Zero-based" xcosVal="0"/>
+                                <map simVal="One-based" xcosVal="1"/>
+                        </str2int>
+                        <str2int sim="IndexOptionArray" xcos="Index Option" description="">
+                                <map simVal="Zero-based" xcosVal="0"/>
+                                <map simVal="One-based" xcosVal="1"/>
+                        </str2int>
+                <!--TODO: IndexOptions: See IndexOptionArray parameter for more information.
+                         'Assign all' | {'Index vector (dialog)'} | 'Index vector (port)' | 'Starting index (dialog)' | 'Starting index (port)' 
+                FIXME: Is it available only in scicos?  
+                        -->
+                </block>
+                
+                <!-- Gain Block Compatibility Pattern -->
+                <block sim="Gain" xcos="GAINBLK_f" description="4">
+                        <simple sim="FunctionName" xcos="gain"></simple>
+                        <simple sim="FunctionType" xcos="null"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="Gain" index="0,0"/>
+                        </real>
+                        <real xcos="rpar">
+                                <map simName="Gain" index="0,0"/>
+                        </real>
+                </block>
+                
+        <!-- B -->
+
+<!-- Sources Library Block Parameters -->
+        <!-- C -->
+                <!-- Constant Block Compatibility Pattern -->
+                <block sim="Constant" xcos="CONST_m" description="4">
+                        <simple sim="FunctionName" xcos="cstblk4"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="d"></simple>
+                        <real xcos="exprs">
+                                <map simName="Value" index="0,0"/>
+                        </real>
+                        <real xcos="rpar">
+                                <map simName="Value" index="0,0"/>
+                        </real>
+                </block>
+                
+<!-- Sinks -->
+                <!-- Scop Block compatibility pattern -->
+                <!-- FIXME -->
+                <block sim="Scope" xcos="CSCOPE" description="">
+                        <simple sim="FunctionName" xcos="cscope"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <simple sim="ControlPort" xcos="1"></simple>
+                        <simple sim="CommandPort" xcos="0"></simple>
+                        <real xcos="exprs">
+                                <map simName="1 3 5 7 9 11 13 15" index="0,0"/> <!-- Color, mark, vector 8 entries -->
+                                <map simName="-1" index="1,0"/> <!-- Output window number (-1) default -->
+                                <map simName="[]" index="2,0"/> <!-- Output Window position -->
+                                <map simName="[600;400]" index="3,0"/> <!-- Output window size -->
+                                <map simName="YMin" index="4,0"/>
+                                <map simName="YMax" index="5,0"/>
+                                <map simName="30" index="6,0"/> <!-- RefreshPeriod -->
+                                <map simName="20" index="7,0"/> <!-- BufferSize -->
+                                <map simName="0" index="8,0"/> <!-- Accept herited events -->
+                                <map simName="Name of scope" index="9,0"/> <!-- Name of scope -->
+                        </real> 
+                        <real xcos="rpar">
+                                <map simName="0" index="0,0"/><!-- AcceptedHeritedEvents -->
+                                <map simName="YMin" index="1,0"/>
+                                <map simName="YMax" index="2,0"/>
+                                <map simName="30" index="3,0"/> <!-- RefreshPeriod -->
+                        </real>
+                        <real xcos="ipar">
+                                <map simName="-1" index="0,0"/> <!--  -->
+                                <map simName="1" index="1,0"/> <!--  -->
+                                <map simName="20" index="2,0"/> <!-- BufferSize -->
+                                <map simName="1" index="3,0"/> <!-- Color -->
+                                <map simName="3" index="4,0"/>
+                                <map simName="5" index="5,0"/>
+                                <map simName="7" index="6,0"/>
+                                <map simName="9" index="7,0"/>
+                                <map simName="11" index="8,0"/>
+                                <map simName="13" index="9,0"/>
+                                <map simName="15" index="10,0"/> <!-- mark -->
+                                <map simName="-1" index="11,0"/>
+                                <map simName="-1" index="12,0"/>
+                                <map simName="600" index="13,0"/> <!-- Window width -->
+                                <map simName="400" index="14,0"/> <!-- Height -->
+                        </real>
+                </block>
+
+<!-- Math Library Block Parameters -->
+                <!--    Sin Block Compatibility Pattern -->
+                <block sim="Sin" xcos="GENSIN_f" description="
+                        LinearizePole - not available;
+                        ">
+                        <simple sim="FunctionName" xcos="gensin"></simple>
+                        <simple sim="FunctionType" xcos="null"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="Amplitude" index="0,0"/><!-- AcceptedHeritedEvents -->
+                                <map simName="Frequency" index="1,0"/>
+                                <map simName="Phase" index="2,0"/>
+                        </real>
+                        <real xcos="rpar">
+                                <map simName="Amplitude" index="0,0"/><!-- AcceptedHeritedEvents -->
+                                <map simName="Frequency" index="1,0"/>
+                                <map simName="Phase" index="2,0"/>
+                        </real>
+                </block>
+                
+                <!-- Gain Block Compatibility Pattern -->
+                <block sim="Saturation" xcos="SATURATION" description="4">
+                        <!-- FIXME -->
+                        <!-- Zero crossing? -->
+                        <simple sim="FunctionName" xcos="satur"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="UpperLimit" index="0,0"/>
+                                <map simName="LowerLimit" index="1,0"/>
+                                <map simName="0" index="1,0"/> <!-- ZeroCrossing -->
+                        </real>
+                        <real xcos="rpar">
+                                <map simName="UpperLimit" index="0,0"/>
+                                <map simName="LowerLimit" index="1,0"/>
+                        </real>
+                </block>
+                
+                <!-- FIXME: -->
+                <!-- Product Block Compatibility Pattern -->
+                <block sim="Product" xcos="PRODUCT" description="4">
+                        <simple sim="FunctionName" xcos="product"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="Inputs" index="0,0"/> <!-- Inputs -->
+                        </real>
+                        <real xcos="ipar">
+                                <map simName="Inputs" index="0,0"/> <!-- Inputs -->
+                        </real>
+                </block>
+                <!-- FIXME: -->
+                <!-- Sum Block Compatibility Pattern -->
+                <block sim="Sum" xcos="SUMMATION" description="4">
+                        <simple sim="FunctionName" xcos="summation"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="OutDataTypeStr" index="0,0"/><!-- Datatype -->
+                                <map simName="Inputs" index="1,0"/><!-- Number of inputs, sign vector -->
+                                <map simName="SaturateOnIntegerOverflow" index="2,0"/><!-- Do on overflowe -->
+                        </real>
+                        <!-- FIXME: -->
+                        <real xcos="ipar">
+                                <map simName="Inputs" index="0,0"/><!-- Number of inputs, sign vector -->
+                        </real>
+                </block>
+                <!-- FIXME: -->
+                <!-- Relay Block Compatibility Pattern -->
+                <block sim="Relay" xcos="RELAY_f" description="">
+                        <simple sim="FunctionName" xcos="relay"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="1" index="0,0"/><!-- Number of inputs -->
+                                <map simName="1" index="1,0"/><!-- Initially connected input -->
+                        </real>
+                        <real xcos="dstate">
+                                <map simName="1" index="0,0"/> <!-- Initially connected input 0-based -->
+                        </real>
+                </block>
+                
+                <!-- FIXME: -->
+                <!-- SubSystem Block Compatibility Pattern -->
+                <block sim="SubSystem" xcos="SUPER_f" description="">
+                        <simple sim="FunctionName" xcos="super"></simple>
+                        <simple sim="FunctionType" xcos="null"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                </block>
+                
+                <!-- FIXME: -->
+                <!-- MultiPortSwitch Block Compatibility Pattern -->
+                <block sim="MultiPortSwitch" xcos="M_SWITCH" description="">
+                <!-- TODO: Zero Cross -->
+                        <simple sim="FunctionName" xcos="mswitch"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="Inputs" index="0,0"/><!-- number of inputs -->
+                                <map simName="1" index="1,0"/><!-- zero base indexind --> <!-- in matlab depracated -->
+                                <map simName="RndMethod" index="2,0"/><!-- rounding rule -->
+                        </real>
+                        <real xcos="ipar">
+                                <map simName="1" index="0,0"/> <!-- zero base indexind -->
+                                <map simName="RndMethod" index="1,0"/> <!-- rounding rule -->
+                        </real>
+                </block>
+                
+                <!-- FIXME: -->
+                <!-- Switch Block Compatibility Pattern -->
+                <block sim="Switch" xcos="SWITCH2_m" description="">
+                <!-- TODO: Zero Cross -->
+                        <simple sim="FunctionName" xcos="switch2_m"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="FIXME: OutDataTypeStr" index="0,0"/><!-- Datatype -->
+                                <map simName="Criteria" index="1,0"/><!-- past first input if -->
+                                <map simName="Threshold" index="2,0"/><!-- threshold -->
+                                <map simName="1" index="3,0"/><!-- Use zero crossing -->
+                        </real>
+                        <real xcos="FIXME: ipar">
+                                <map simName="Criteria" index="0,0"/> <!-- zero base indexind -->
+                        </real>
+                        <real xcos="FIXME: rpar">
+                                <map simName="Threshold" index="0,0"/> <!-- zero base indexind -->
+                        </real>
+                        
+                </block>
+                
+                <!-- FIXME: -->
+                <!-- Mux Block Compatibility Pattern -->
+                <block sim="Mux" xcos="MUX" description="">
+                        <simple sim="FunctionName" xcos="multiplex"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="Inputs" index="0,0"/><!-- Number of input ports -->
+                        </real>
+                        <real xcos="ipar">
+                                <map simName="Inputs" index="0,0"/><!-- Number of input ports -->
+                        </real>
+                </block>
+                <!-- FIXME: -->
+                <!-- Demux Block Compatibility Pattern -->
+                <block sim="Demux" xcos="DEMUX" description="">
+                        <simple sim="FunctionName" xcos="multiplex"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="Inputs" index="0,0"/><!-- Number of output ports -->
+                        </real>
+                        <real xcos="ipar">
+                                <map simName="Inputs" index="0,0"/><!-- Number of output ports -->
+                        </real>
+                </block>
+                
+                <!-- RelationalOperator Block Compatibility Pattern -->
+                <block sim="RelationalOperator" xcos="RELATIONALOP" description="">
+                                        <!-- FIXME: -->
+                        <!-- Zero crossing? -->
+                        <simple sim="FunctionName" xcos="relationalop"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="Operator" index="0,0"/><!-- Operator -->
+                                <map simName="0" index="0,0"/><!-- Use zero crossing -->
+                                <map simName="1" index="0,0"/><!-- Datatype -->
+                        </real>
+                        <real xcos="ipar">
+                                <!--TODO: Translation of Operator: -->
+                                <map simName="2" index="0,0"/><!-- Number of output ports -->
+                        </real>
+                </block>
+                
+                <!-- Inport Block Compatibility Pattern -->
+                <block sim="Inport" xcos="IN_f" description="">
+                        <simple sim="Inport" xcos="input"></simple>
+                        <simple sim="FunctionType" xcos="null"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="Port" index="0,0"/><!-- Port Number -->
+                        </real>
+                        <real xcos="ipar">
+                                <!--TODO: Translation of Operator: -->
+                                <map simName="Port" index="0,0"/><!-- PortNumber -->
+                        </real>
+                </block>
+                
+                <!-- Outport Block Compatibility Pattern -->
+                <block sim="Outport" xcos="OUT_f" description="">
+                        <!-- Zero crossing? -->
+                        <simple sim="FunctionName" xcos="output"></simple>
+                        <simple sim="FunctionType" xcos="null"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="Port" index="0,0"/><!-- Port Number -->
+                        </real>
+                        <real xcos="ipar">
+                                <!--TODO: Translation of Operator: -->
+                                <map simName="Port" index="0,0"/><!-- PortNumber -->
+                        </real>
+                </block>
+                
+                <!-- TransferFcn Block Compatibility Pattern -->
+                <block sim="TransferFcn" xcos="CLR" description="">
+                <!-- FIXME: -->
+                        <simple sim="FunctionName" xcos="clr"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                </block>
+                
+                <!-- DiscreteTransferFcn Block Compatibility Pattern -->
+                <block sim="DiscreteTransferFcn" xcos="DLR" description="">
+                <!-- FIXME: -->
+                        <simple sim="FunctionName" xcos="dlr"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                </block>
+                
+                <!-- CombinatorialLogic Block Compatibility Pattern -->
+                <!-- FIXME: -->
+                <block sim="CombinatorialLogic" xcos="LOGIC" description="">
+                        <!-- Zero crossing? -->
+                        <simple sim="FunctionName" xcos="logic"></simple>
+                        <simple sim="FunctionType" xcos="4"></simple>
+                        <simple sim="BlockType" xcos="c"></simple>
+                        <real xcos="exprs">
+                                <map simName="TruthTable" index="0,0"/><!-- TruthTable -->
+                                <map simName="0" index="0,0"/><!-- Inherit -->
+                                <map simName="1" index="0,0"/><!-- Datatype -->
+                        </real>
+                        <real xcos="opar">
+                                <!--TODO: Translation of Operator: -->
+                                <map simName="TruthTable" index="0,0"/><!-- TruthTable -->
+                        </real>
+                </block>
+
+</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 @@
+<generals dsc="string">
+  <!--Zero or more repetitions:-->
+  <string sim="string" xCos="string" dsc="string">
+    <!--1 or more repetitions:-->
+    <parMap simVal="string" xCosVal="string"/>
+  </string>
+  <!--Zero or more repetitions:-->
+  <integer sim="string" xCos="string" dsc="string">
+    <!--1 or more repetitions:-->
+    <parMap simVal="100" xCosVal="100"/>
+  </integer>
+  <!--Zero or more repetitions:-->
+  <simple sim="string" xCos="string" dsc="string"/>
+</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;
 import org.scilab.modules.xcos.actions.DiagramBackgroundAction;
 import org.scilab.modules.xcos.actions.ExportAction;
 import org.scilab.modules.xcos.actions.FitDiagramToViewAction;
+import org.scilab.modules.xcos.simulink.ImportAction;
 import org.scilab.modules.xcos.actions.InitModelicaAction;
 import org.scilab.modules.xcos.actions.NewDiagramAction;
 import 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
                  */
                 @Override
                 public void propertyChange(PropertyChangeEvent evt) {
-                        LOG.trace(evt.getPropertyName() + ": " + evt.getOldValue() + ", " + evt.getNewValue());
+                        if (LOG.isTraceEnabled()) {
+                                LOG.trace(evt.getPropertyName() + ": " + evt.getOldValue() + ", " + evt.getNewValue());
+                        }
                 }
         }
         
@@ -969,7 +971,7 @@ public class BasicBlock extends ScilabGraphUniqueObject implements Serializable
                 setDependsOnT(modifiedBlock.isDependsOnT());
                 setDependsOnU(modifiedBlock.isDependsOnU());
                 setExprs(modifiedBlock.getExprs());
-
+                
                 setRealParameters(modifiedBlock.getRealParameters());
                 setIntegerParameters(modifiedBlock.getIntegerParameters());
                 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;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.scilab.modules.types.ScilabDouble;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.input.InputPort;
+import org.scilab.modules.xcos.simulink.MatrixElement;
 
 import com.mxgraph.model.mxICell;
 
@@ -34,7 +37,7 @@ public class ProdPortLabelingListener implements PropertyChangeListener, Seriali
         
         private static final String NOT_PRINTED_LABEL = "\u00d7";
         private static ProdPortLabelingListener instance;
-        
+        private static final Log LOG = LogFactory.getLog(ProdPortLabelingListener.class);
         /**
          * Default constructor 
          */
@@ -66,10 +69,12 @@ public class ProdPortLabelingListener implements PropertyChangeListener, Seriali
                  * Get the input port children
                  */
                 final List<InputPort> ports = new ArrayList<InputPort>();
+                LOG.trace(source.getChildCount());
                 for (int i = 0; i < source.getChildCount(); i++) {
                         final mxICell port = source.getChildAt(i);
-                        
+
                         if (port instanceof InputPort) {
+                                LOG.trace(port.getId());
                                 ports.add((InputPort) port);
                         }
                 }
@@ -87,6 +92,7 @@ public class ProdPortLabelingListener implements PropertyChangeListener, Seriali
                         }
                         
                         port.setValue(getLabel(gain));
+                        LOG.trace(port.getValue());
                 }
                 
                 /**
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 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - Jerzy Zagorski
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+package org.scilab.modules.xcos.simulink;
+
+public class AbstractElement<T> {
+        /**
+         * Default constructor
+         */
+        protected AbstractElement() { }
+}
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 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - Jerzy Zagorski
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+package org.scilab.modules.xcos.simulink;
+
+import org.apache.commons.logging.LogFactory;
+import org.scilab.modules.xcos.block.BasicBlock;
+import org.scilab.modules.xcos.block.TextBlock;
+
+import edu.tum.cs.simulink.model.SimulinkAnnotation;
+import edu.tum.cs.simulink.model.SimulinkBlock;
+
+public class AnnotationElement extends AbstractElement<TextBlock>{
+
+        private BlockGraphicElement graphicElement = new BlockGraphicElement();
+        
+        public boolean canDecode(SimulinkAnnotation data) {
+                // TODO Auto-generated method stub
+                return true;
+        }
+
+        public Object decode(SimulinkAnnotation from, Object object) {
+                // TODO Auto-generated method stub
+                TextBlock annotation;
+                LogFactory.getLog(AnnotationElement.class).trace("From " + from.getName() + ":");
+                LogFactory.getLog(AnnotationElement.class).trace(from.getParameterNames().toString());
+                annotation = new TextBlock();
+                annotation.setValue(from.getName());
+                graphicElement.decode(from, annotation);
+                return annotation;
+        }
+
+}
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 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - Jerzy Zagorski
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+package org.scilab.modules.xcos.simulink;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.scilab.modules.xcos.block.BasicBlock;
+import org.scilab.modules.xcos.block.BlockFactory;
+import org.scilab.modules.xcos.block.SuperBlock;
+import org.scilab.modules.xcos.graph.SuperBlockDiagram;
+import org.scilab.modules.xcos.graph.XcosDiagram;
+import org.scilab.modules.xcos.link.BasicLink;
+import org.scilab.modules.xcos.port.command.CommandPort;
+import org.scilab.modules.xcos.port.control.ControlPort;
+import org.scilab.modules.xcos.port.input.InputPort;
+import org.scilab.modules.xcos.port.output.OutputPort;
+import org.scilab.modules.xcos.utils.BlockPositioning;
+
+import com.mxgraph.model.mxCell;
+
+import edu.tum.cs.commons.collections.UnmodifiableIterator;
+import edu.tum.cs.simulink.model.SimulinkAnnotation;
+import edu.tum.cs.simulink.model.SimulinkBlock;
+import edu.tum.cs.simulink.model.SimulinkInPort;
+import edu.tum.cs.simulink.model.SimulinkLine;
+import edu.tum.cs.simulink.model.SimulinkOutPort;
+
+public class BlockElement extends AbstractElement<BasicBlock> {
+        
+        private SimulinkBlock base;
+        private BlockGraphicElement graphicElement = new BlockGraphicElement();
+        private BlockSpecificElement specificElement = new BlockSpecificElement();
+        private BlockModelElement modelElement = new BlockModelElement();
+        private static final Log LOG = LogFactory.getLog(BlockElement.class);
+        
+        /** Map from index to blocks */
+        private final Map<Integer, BasicBlock> blocks;
+        /**
+         * Default constructor
+         */
+        public BlockElement() {
+                blocks = new HashMap<Integer, BasicBlock>();
+        }
+        /**
+         * Current block ordering, the ordering change on each {@link BlockElement}
+         * instance so be careful when allocated a new {@link BlockElement}.
+         */
+        private int ordering;
+        
+        /* 
+         * here there will be some neccessery functions, checking if import is possible etc.
+         */
+        
+        public BasicBlock decode(SimulinkBlock from, BasicBlock into, XcosDiagram diag) {
+                BasicBlock block = into;
+                base = from;
+                if (block == null) {
+                        block = BlockFactory.createBlock(modelElement.getInterFunctionName(base));
+                        LOG.trace(modelElement.getInterFunctionName(base));
+                }
+                block.setParentDiagram(diag);
+                /*
+                 * TODO: SimulinkBlock decoding, parameters etc.
+                 */
+                decodeParams(block);
+                
+                return block;
+        }
+
+        private void decodeParams(BasicBlock block) {
+                // TODO Auto-generated method stub
+                
+                OutputPortElement outElement = new OutputPortElement(base);
+                UnmodifiableIterator<SimulinkOutPort> portOutIter = base.getOutPorts().iterator();
+                OutputPort[] outPortTempTable= new OutputPort[base.getOutPorts().size() + 1];
+                while(portOutIter.hasNext()) {
+                        OutputPort portAdd = outElement.decode(portOutIter.next(), null);
+                        outPortTempTable[portAdd.getOrdering()] = portAdd;
+                }
+                for(int i = 1 ; i < outPortTempTable.length ; i++){
+                        block.addPort(outPortTempTable[i]);
+                }
+                
+                InputPortElement inElement = new InputPortElement(base);
+                UnmodifiableIterator<SimulinkInPort> portInIter = base.getInPorts().iterator();
+                InputPort[] inPortTempTable= new InputPort[base.getInPorts().size() + 1];
+                while(portInIter.hasNext()) {
+                        InputPort portAdd = inElement.decode(portInIter.next(), null);
+                        if (LOG.isDebugEnabled()) {
+                                LOG.debug(inPortTempTable.length);
+                                LOG.debug(portAdd.getOrdering());
+                                LOG.debug(portAdd.getId().toString());
+                        }
+                        inPortTempTable[portAdd.getOrdering()] = portAdd;
+                }
+                for(int i = 1 ; i < inPortTempTable.length ; i++){
+                        block.addPort(inPortTempTable[i]);
+                }
+                /*
+                 * Add control and command ports
+                 */
+                for(int i=0 ; i< modelElement.getControlPorts(base) ; i++ ){
+                        ControlPort portAdd = inElement.decodeControlPort();
+                        block.addPort(portAdd);
+                }
+                
+                /*
+                 * Add control and command ports
+                 */
+                for(int i=0 ; i< modelElement.getCommandPorts(base) ; i++ ){
+                        CommandPort portAdd = outElement.decodeCommandPort();
+                        block.addPort(portAdd);
+                }
+                /*
+                 * decode graphics elements of BasicBlock
+                 */
+                graphicElement.decode(base, block);
+                
+                try {
+                        modelElement.decode(base, block);
+