Merge remote-tracking branch 'origin/master' into YaSp 17/13417/1
Bruno JOFRET [Wed, 8 Jan 2014 10:39:12 +0000 (11:39 +0100)]
Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/modules/startup/src/c/mainscic.cpp

Change-Id: Id51e9ebf7be0027c3902ba0e0c437c23083dc012

1  2 
scilab/Makefile.am
scilab/Makefile.in
scilab/modules/console/src/c/others/initMacOSXEnv.c
scilab/modules/startup/src/cpp/scilab.cpp
scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj
scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj.filters
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj.filters

@@@ -87,33 -69,15 +87,29 @@@ $(AM_CPPFLAGS
  # (causing issues on some platform)
  COMMON_LIBS = $(LTLIBINTL)
  
- scilab_bin_SOURCES = modules/others_tools/src/cpp/scilab.cpp
- if IS_MACOSX
- scilab_bin_SOURCES            += modules/others_tools/src/c/initMacOSXEnv.c
- endif
 -scilab_bin_SOURCES            = modules/startup/src/c/mainscic.cpp
++scilab_bin_SOURCES = modules/startup/src/cpp/scilab.cpp
 +
 +scilab_bin_LDADD              = $(COMMON_LIBS)
 +
 +if GUI
 +# Force the libscijvm to be linked first. Under Debian, this avoid some reordering issues during the link
 +scilab_bin_LDADD += $(top_builddir)/modules/jvm/libscijvm.la
 +endif
  
 -scilab_bin_LDADD              = $(COMMON_LIBS) $(top_builddir)/modules/libscilab.la $(FLIBS)
 +# BLAS_LIBS & LAPACK_LIBS are explicitly linked at the end. Unlike Scilab 5 in which the binary
 +# is in C, Scilab 6 main is in C++. For some reasons (ie, I don't know why), libtool places blas and
 +# lapack at the beginning of the order of the link. This caused some issues with the overload of the
 +# xerbla function
 +scilab_bin_LDADD += $(top_builddir)/modules/libscilab.la $(BLAS_LIBS) $(LAPACK_LIBS) $(FLIBS)
  
  # Match scilab -nwni (ie command line without graphics)
 -scilab_cli_bin_SOURCES        = modules/startup/src/c/mainscic.cpp
 +
- scilab_cli_bin_SOURCES        = modules/others_tools/src/cpp/scilab.cpp
++scilab_cli_bin_SOURCES        = modules/startup/src/cpp/scilab.cpp
  
  scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS)
 -scilab_cli_bin_LDADD  = $(COMMON_LIBS) $(top_builddir)/modules/libscilab-cli.la $(FLIBS)
 +
 +# See the comment about scilab_bin_LDADD (relative to BLAS_LIBS & LAPACK_LIBS)
 +scilab_cli_bin_LDADD  = $(COMMON_LIBS) $(top_builddir)/modules/libscilab-cli.la $(BLAS_LIBS) $(LAPACK_LIBS) $(FLIBS)
  
  if MPI
  CXX = $(OPENMPI_CXX)
@@@ -115,18 -115,14 +115,17 @@@ bin_PROGRAMS = scilab-bin$(EXEEXT) scil
  @USE_STATIC_SYSTEM_LIB_FALSE@am__append_5 = -lstdc++
  #-static-libgfortran
  @IS_MACOSX_TRUE@am__append_6 = -framework Cocoa
- @IS_MACOSX_TRUE@am__append_7 = modules/others_tools/src/c/initMacOSXEnv.c
 -@MPI_TRUE@am__append_7 = modules/startup/src/c/initMPI.c
 -@MPI_TRUE@am__append_8 = $(OPENMPI_CXXFLAGS)
 -@MPI_TRUE@am__append_9 = modules/startup/src/c/initMPI.c
 -@MPI_TRUE@am__append_10 = $(OPENMPI_CXXFLAGS)
 +
 +# Force the libscijvm to be linked first. Under Debian, this avoid some reordering issues during the link
- @GUI_TRUE@am__append_8 = $(top_builddir)/modules/jvm/libscijvm.la
- @MPI_TRUE@am__append_9 = modules/others_tools/src/c/initMPI.c
- @MPI_TRUE@am__append_10 = $(OPENMPI_CXXFLAGS)
- @MPI_TRUE@am__append_11 = modules/others_tools/src/c/initMPI.c
- @MPI_TRUE@am__append_12 = $(OPENMPI_CXXFLAGS)
++@GUI_TRUE@am__append_7 = $(top_builddir)/modules/jvm/libscijvm.la
++@MPI_TRUE@am__append_8 = modules/startup/src/c/initMPI.c
++@MPI_TRUE@am__append_9 = $(OPENMPI_CXXFLAGS)
++@MPI_TRUE@am__append_10 = modules/startup/src/c/initMPI.c
++@MPI_TRUE@am__append_11 = $(OPENMPI_CXXFLAGS)
  
  #  The user wants to compile the localization files
- @GENERATE_LOCALIZATION_FILES_TRUE@am__append_13 = localization
- @COMPILATION_TESTS_TRUE@am__append_14 = check-java
 -@GENERATE_LOCALIZATION_FILES_TRUE@am__append_11 = localization
 -@COMPILATION_TESTS_TRUE@am__append_12 = check-java
++@GENERATE_LOCALIZATION_FILES_TRUE@am__append_12 = localization
++@COMPILATION_TESTS_TRUE@am__append_13 = check-java
  DIST_COMMON = $(top_srcdir)/Makefile.call_scilab.am \
        $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(am__configure_deps) \
@@@ -261,34 -257,30 +260,32 @@@ call_scilab_readwritestring_LINK = $(LI
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(call_scilab_readwritestring_CFLAGS) $(CFLAGS) \
        $(call_scilab_readwritestring_LDFLAGS) $(LDFLAGS) -o $@
- am__scilab_bin_SOURCES_DIST = modules/others_tools/src/cpp/scilab.cpp \
-       modules/others_tools/src/c/initMacOSXEnv.c \
-       modules/others_tools/src/c/initMPI.c
- @IS_MACOSX_TRUE@am__objects_1 = modules/others_tools/src/c/scilab_bin-initMacOSXEnv.$(OBJEXT)
- @MPI_TRUE@am__objects_2 = modules/others_tools/src/c/scilab_bin-initMPI.$(OBJEXT)
 -am__scilab_bin_SOURCES_DIST = modules/startup/src/c/mainscic.cpp \
++am__scilab_bin_SOURCES_DIST = modules/startup/src/cpp/scilab.cpp \
+       modules/startup/src/c/initMPI.c
+ @MPI_TRUE@am__objects_1 =  \
+ @MPI_TRUE@    modules/startup/src/c/scilab_bin-initMPI.$(OBJEXT)
  am_scilab_bin_OBJECTS =  \
-       modules/others_tools/src/cpp/scilab_bin-scilab.$(OBJEXT) \
-       $(am__objects_1) $(am__objects_2)
 -      modules/startup/src/c/scilab_bin-mainscic.$(OBJEXT) \
++      modules/startup/src/cpp/scilab_bin-scilab.$(OBJEXT) \
+       $(am__objects_1)
  scilab_bin_OBJECTS = $(am_scilab_bin_OBJECTS)
  am__DEPENDENCIES_1 =
  am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
- scilab_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__append_8) \
 -scilab_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 -      $(top_builddir)/modules/libscilab.la $(am__DEPENDENCIES_1)
++scilab_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__append_7) \
 +      $(top_builddir)/modules/libscilab.la $(am__DEPENDENCIES_1) \
 +      $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  scilab_bin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
        $(CXXFLAGS) $(scilab_bin_LDFLAGS) $(LDFLAGS) -o $@
- am__scilab_cli_bin_SOURCES_DIST =  \
-       modules/others_tools/src/cpp/scilab.cpp \
-       modules/others_tools/src/c/initMPI.c
- @MPI_TRUE@am__objects_3 = modules/others_tools/src/c/scilab_cli_bin-initMPI.$(OBJEXT)
 -am__scilab_cli_bin_SOURCES_DIST = modules/startup/src/c/mainscic.cpp \
++am__scilab_cli_bin_SOURCES_DIST = modules/startup/src/cpp/scilab.cpp \
+       modules/startup/src/c/initMPI.c
+ @MPI_TRUE@am__objects_2 = modules/startup/src/c/scilab_cli_bin-initMPI.$(OBJEXT)
  am_scilab_cli_bin_OBJECTS =  \
-       modules/others_tools/src/cpp/scilab_cli_bin-scilab.$(OBJEXT) \
-       $(am__objects_3)
 -      modules/startup/src/c/scilab_cli_bin-mainscic.$(OBJEXT) \
++      modules/startup/src/cpp/scilab_cli_bin-scilab.$(OBJEXT) \
+       $(am__objects_2)
  scilab_cli_bin_OBJECTS = $(am_scilab_cli_bin_OBJECTS)
  scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 -      $(top_builddir)/modules/libscilab-cli.la $(am__DEPENDENCIES_1)
 +      $(top_builddir)/modules/libscilab-cli.la $(am__DEPENDENCIES_1) \
 +      $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  scilab_cli_bin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
        $(AM_CXXFLAGS) $(CXXFLAGS) $(scilab_cli_bin_LDFLAGS) \
@@@ -797,52 -782,27 +794,52 @@@ scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(OP
        $(am__append_4) $(am__append_6)
  scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(am__append_3) \
        $(am__append_5)
 -scilab_bin_CPPFLAGS = -I$(top_srcdir)/modules/io/includes/ \
 -      -I$(top_srcdir)/modules/console/includes/ \
 -      -I$(top_srcdir)/modules/localization/includes/ $(AM_CPPFLAGS) \
 -      $(am__append_8)
 +scilab_bin_CPPFLAGS = -I$(top_srcdir)/modules/console/includes/ \
 +      -I$(top_srcdir)/modules/output_stream/includes/ \
 +      -I$(top_srcdir)/modules/parse/includes/ \
 +      -I$(top_srcdir)/modules/ast/includes/ \
 +      -I$(top_srcdir)/modules/symbol/includes/ \
 +      -I$(top_srcdir)/modules/functions_manager/includes/ \
 +      -I$(top_srcdir)/modules/types/includes/ \
 +      -I$(top_srcdir)/modules/system_env/includes/ \
 +      -I$(top_srcdir)/modules/operations/includes/ \
 +      -I$(top_srcdir)/modules/elementary_functions/includes/ \
 +      -I$(top_srcdir)/modules/fileio/includes/ \
 +      -I$(top_srcdir)/modules/string/includes/ \
 +      -I$(top_srcdir)/modules/history_manager/includes/ \
 +      -I$(top_srcdir)/modules/threads/includes/ \
 +      -I$(top_srcdir)/modules/api_scilab/includes/ \
 +      -I$(top_srcdir)/modules/localization/includes/ \
 +      -I$(top_srcdir)/modules/core/src/c/ \
 +      -I$(top_srcdir)/modules/dynamic_link/includes/ \
-       $(EIGEN_CPPFLAGS) $(AM_CPPFLAGS) $(am__append_10)
++      $(EIGEN_CPPFLAGS) $(AM_CPPFLAGS) $(am__append_9)
 +
  # --no-undefined --relax
  
  # Localization dep already exists because of the `exportLocaleToSystem' symbol
  # (causing issues on some platform)
  COMMON_LIBS = $(LTLIBINTL)
- scilab_bin_SOURCES = modules/others_tools/src/cpp/scilab.cpp \
-       $(am__append_7) $(am__append_9)
 -scilab_bin_SOURCES = modules/startup/src/c/mainscic.cpp \
 -      $(am__append_7)
 -scilab_bin_LDADD = $(COMMON_LIBS) $(top_builddir)/modules/libscilab.la $(FLIBS)
++scilab_bin_SOURCES = modules/startup/src/cpp/scilab.cpp \
++      $(am__append_8)
 +
 +# BLAS_LIBS & LAPACK_LIBS are explicitly linked at the end. Unlike Scilab 5 in which the binary
 +# is in C, Scilab 6 main is in C++. For some reasons (ie, I don't know why), libtool places blas and
 +# lapack at the beginning of the order of the link. This caused some issues with the overload of the
 +# xerbla function
- scilab_bin_LDADD = $(COMMON_LIBS) $(am__append_8) \
++scilab_bin_LDADD = $(COMMON_LIBS) $(am__append_7) \
 +      $(top_builddir)/modules/libscilab.la $(BLAS_LIBS) \
 +      $(LAPACK_LIBS) $(FLIBS)
  
  # Match scilab -nwni (ie command line without graphics)
- scilab_cli_bin_SOURCES = modules/others_tools/src/cpp/scilab.cpp \
-       $(am__append_11)
 -scilab_cli_bin_SOURCES = modules/startup/src/c/mainscic.cpp \
 -      $(am__append_9)
 -scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS) \
++scilab_cli_bin_SOURCES = modules/startup/src/cpp/scilab.cpp \
+       $(am__append_10)
 -scilab_cli_bin_LDADD = $(COMMON_LIBS) $(top_builddir)/modules/libscilab-cli.la $(FLIBS)
 +scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS) \
-       $(am__append_12)
++      $(am__append_11)
 +
 +# See the comment about scilab_bin_LDADD (relative to BLAS_LIBS & LAPACK_LIBS)
 +scilab_cli_bin_LDADD = $(COMMON_LIBS) $(top_builddir)/modules/libscilab-cli.la $(BLAS_LIBS) $(LAPACK_LIBS) $(FLIBS)
  LANG_DOMAIN = scilab
- TARGETS_ALL = macros $(am__append_13) $(am__append_14)
 -TARGETS_ALL = macros $(am__append_11) $(am__append_12)
++TARGETS_ALL = macros $(am__append_12) $(am__append_13)
  
  # check is performed with scilab, so use the serial-tests on purpose
  TESTS_ENVIRONMENT = LANG=C $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -f
@@@ -1149,37 -1098,28 +1146,34 @@@ modules/call_scilab/examples/basicExamp
  call_scilab_readwritestring$(EXEEXT): $(call_scilab_readwritestring_OBJECTS) $(call_scilab_readwritestring_DEPENDENCIES) $(EXTRA_call_scilab_readwritestring_DEPENDENCIES) 
        @rm -f call_scilab_readwritestring$(EXEEXT)
        $(AM_V_CCLD)$(call_scilab_readwritestring_LINK) $(call_scilab_readwritestring_OBJECTS) $(call_scilab_readwritestring_LDADD) $(LIBS)
- modules/others_tools/src/cpp/$(am__dirstamp):
-       @$(MKDIR_P) modules/others_tools/src/cpp
-       @: > modules/others_tools/src/cpp/$(am__dirstamp)
- modules/others_tools/src/cpp/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) modules/others_tools/src/cpp/$(DEPDIR)
-       @: > modules/others_tools/src/cpp/$(DEPDIR)/$(am__dirstamp)
- modules/others_tools/src/cpp/scilab_bin-scilab.$(OBJEXT):  \
-       modules/others_tools/src/cpp/$(am__dirstamp) \
-       modules/others_tools/src/cpp/$(DEPDIR)/$(am__dirstamp)
- modules/others_tools/src/c/$(am__dirstamp):
-       @$(MKDIR_P) modules/others_tools/src/c
-       @: > modules/others_tools/src/c/$(am__dirstamp)
- modules/others_tools/src/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) modules/others_tools/src/c/$(DEPDIR)
-       @: > modules/others_tools/src/c/$(DEPDIR)/$(am__dirstamp)
- modules/others_tools/src/c/scilab_bin-initMacOSXEnv.$(OBJEXT):  \
-       modules/others_tools/src/c/$(am__dirstamp) \
-       modules/others_tools/src/c/$(DEPDIR)/$(am__dirstamp)
- modules/others_tools/src/c/scilab_bin-initMPI.$(OBJEXT):  \
-       modules/others_tools/src/c/$(am__dirstamp) \
-       modules/others_tools/src/c/$(DEPDIR)/$(am__dirstamp)
++modules/startup/src/cpp/$(am__dirstamp):
++      @$(MKDIR_P) modules/startup/src/cpp
++      @: > modules/startup/src/cpp/$(am__dirstamp)
++modules/startup/src/cpp/$(DEPDIR)/$(am__dirstamp):
++      @$(MKDIR_P) modules/startup/src/cpp/$(DEPDIR)
++      @: > modules/startup/src/cpp/$(DEPDIR)/$(am__dirstamp)
++modules/startup/src/cpp/scilab_bin-scilab.$(OBJEXT):  \
++      modules/startup/src/cpp/$(am__dirstamp) \
++      modules/startup/src/cpp/$(DEPDIR)/$(am__dirstamp)
+ modules/startup/src/c/$(am__dirstamp):
+       @$(MKDIR_P) modules/startup/src/c
+       @: > modules/startup/src/c/$(am__dirstamp)
+ modules/startup/src/c/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) modules/startup/src/c/$(DEPDIR)
+       @: > modules/startup/src/c/$(DEPDIR)/$(am__dirstamp)
 -modules/startup/src/c/scilab_bin-mainscic.$(OBJEXT):  \
 -      modules/startup/src/c/$(am__dirstamp) \
 -      modules/startup/src/c/$(DEPDIR)/$(am__dirstamp)
+ modules/startup/src/c/scilab_bin-initMPI.$(OBJEXT):  \
+       modules/startup/src/c/$(am__dirstamp) \
+       modules/startup/src/c/$(DEPDIR)/$(am__dirstamp)
  
  scilab-bin$(EXEEXT): $(scilab_bin_OBJECTS) $(scilab_bin_DEPENDENCIES) $(EXTRA_scilab_bin_DEPENDENCIES) 
        @rm -f scilab-bin$(EXEEXT)
        $(AM_V_CXXLD)$(scilab_bin_LINK) $(scilab_bin_OBJECTS) $(scilab_bin_LDADD) $(LIBS)
- modules/others_tools/src/cpp/scilab_cli_bin-scilab.$(OBJEXT):  \
-       modules/others_tools/src/cpp/$(am__dirstamp) \
-       modules/others_tools/src/cpp/$(DEPDIR)/$(am__dirstamp)
- modules/others_tools/src/c/scilab_cli_bin-initMPI.$(OBJEXT):  \
-       modules/others_tools/src/c/$(am__dirstamp) \
-       modules/others_tools/src/c/$(DEPDIR)/$(am__dirstamp)
 -modules/startup/src/c/scilab_cli_bin-mainscic.$(OBJEXT):  \
 -      modules/startup/src/c/$(am__dirstamp) \
 -      modules/startup/src/c/$(DEPDIR)/$(am__dirstamp)
++modules/startup/src/cpp/scilab_cli_bin-scilab.$(OBJEXT):  \
++      modules/startup/src/cpp/$(am__dirstamp) \
++      modules/startup/src/cpp/$(DEPDIR)/$(am__dirstamp)
+ modules/startup/src/c/scilab_cli_bin-initMPI.$(OBJEXT):  \
+       modules/startup/src/c/$(am__dirstamp) \
+       modules/startup/src/c/$(DEPDIR)/$(am__dirstamp)
  
  scilab-cli-bin$(EXEEXT): $(scilab_cli_bin_OBJECTS) $(scilab_cli_bin_DEPENDENCIES) $(EXTRA_scilab_cli_bin_DEPENDENCIES) 
        @rm -f scilab-cli-bin$(EXEEXT)
@@@ -1224,8 -1164,7 +1218,8 @@@ mostlyclean-compile
        -rm -f *.$(OBJEXT)
        -rm -f modules/call_scilab/examples/basicExamples/*.$(OBJEXT)
        -rm -f modules/call_scilab/examples/call_scilab/c/common/*.$(OBJEXT)
-       -rm -f modules/others_tools/src/c/*.$(OBJEXT)
-       -rm -f modules/others_tools/src/cpp/*.$(OBJEXT)
+       -rm -f modules/startup/src/c/*.$(OBJEXT)
++      -rm -f modules/startup/src/cpp/*.$(OBJEXT)
  
  distclean-compile:
        -rm -f *.tab.c
  @AMDEP_TRUE@@am__include@ @am__quote@modules/call_scilab/examples/basicExamples/$(DEPDIR)/call_scilab_readwritestring-readwritestring.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@modules/call_scilab/examples/call_scilab/c/common/$(DEPDIR)/call_scilab_c-myprog.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@modules/call_scilab/examples/call_scilab/c/common/$(DEPDIR)/call_scilab_c_simple-simple_call_scilab.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@modules/others_tools/src/c/$(DEPDIR)/scilab_bin-initMPI.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@modules/others_tools/src/c/$(DEPDIR)/scilab_bin-initMacOSXEnv.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-initMPI.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@modules/others_tools/src/cpp/$(DEPDIR)/scilab_bin-scilab.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@modules/others_tools/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@modules/startup/src/c/$(DEPDIR)/scilab_bin-initMPI.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@modules/startup/src/c/$(DEPDIR)/scilab_bin-mainscic.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@modules/startup/src/c/$(DEPDIR)/scilab_cli_bin-initMPI.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@modules/startup/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@modules/startup/src/cpp/$(DEPDIR)/scilab_bin-scilab.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@modules/startup/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Po@am__quote@
  
  .c.o:
  @am__fastdepCC_TRUE@  $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@@ -1446,33 -1370,33 +1425,33 @@@ modules/startup/src/c/scilab_cli_bin-in
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
  
- modules/others_tools/src/cpp/scilab_bin-scilab.o: modules/others_tools/src/cpp/scilab.cpp
- @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/others_tools/src/cpp/scilab_bin-scilab.o -MD -MP -MF modules/others_tools/src/cpp/$(DEPDIR)/scilab_bin-scilab.Tpo -c -o modules/others_tools/src/cpp/scilab_bin-scilab.o `test -f 'modules/others_tools/src/cpp/scilab.cpp' || echo '$(srcdir)/'`modules/others_tools/src/cpp/scilab.cpp
- @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/others_tools/src/cpp/$(DEPDIR)/scilab_bin-scilab.Tpo modules/others_tools/src/cpp/$(DEPDIR)/scilab_bin-scilab.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/others_tools/src/cpp/scilab.cpp' object='modules/others_tools/src/cpp/scilab_bin-scilab.o' libtool=no @AMDEPBACKSLASH@
 -modules/startup/src/c/scilab_bin-mainscic.o: modules/startup/src/c/mainscic.cpp
 -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/startup/src/c/scilab_bin-mainscic.o -MD -MP -MF modules/startup/src/c/$(DEPDIR)/scilab_bin-mainscic.Tpo -c -o modules/startup/src/c/scilab_bin-mainscic.o `test -f 'modules/startup/src/c/mainscic.cpp' || echo '$(srcdir)/'`modules/startup/src/c/mainscic.cpp
 -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/startup/src/c/$(DEPDIR)/scilab_bin-mainscic.Tpo modules/startup/src/c/$(DEPDIR)/scilab_bin-mainscic.Po
 -@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/startup/src/c/mainscic.cpp' object='modules/startup/src/c/scilab_bin-mainscic.o' libtool=no @AMDEPBACKSLASH@
++modules/startup/src/cpp/scilab_bin-scilab.o: modules/startup/src/cpp/scilab.cpp
++@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/startup/src/cpp/scilab_bin-scilab.o -MD -MP -MF modules/startup/src/cpp/$(DEPDIR)/scilab_bin-scilab.Tpo -c -o modules/startup/src/cpp/scilab_bin-scilab.o `test -f 'modules/startup/src/cpp/scilab.cpp' || echo '$(srcdir)/'`modules/startup/src/cpp/scilab.cpp
++@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/startup/src/cpp/$(DEPDIR)/scilab_bin-scilab.Tpo modules/startup/src/cpp/$(DEPDIR)/scilab_bin-scilab.Po
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/startup/src/cpp/scilab.cpp' object='modules/startup/src/cpp/scilab_bin-scilab.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/others_tools/src/cpp/scilab_bin-scilab.o `test -f 'modules/others_tools/src/cpp/scilab.cpp' || echo '$(srcdir)/'`modules/others_tools/src/cpp/scilab.cpp
 -@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/startup/src/c/scilab_bin-mainscic.o `test -f 'modules/startup/src/c/mainscic.cpp' || echo '$(srcdir)/'`modules/startup/src/c/mainscic.cpp
++@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/startup/src/cpp/scilab_bin-scilab.o `test -f 'modules/startup/src/cpp/scilab.cpp' || echo '$(srcdir)/'`modules/startup/src/cpp/scilab.cpp
  
- modules/others_tools/src/cpp/scilab_bin-scilab.obj: modules/others_tools/src/cpp/scilab.cpp
- @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/others_tools/src/cpp/scilab_bin-scilab.obj -MD -MP -MF modules/others_tools/src/cpp/$(DEPDIR)/scilab_bin-scilab.Tpo -c -o modules/others_tools/src/cpp/scilab_bin-scilab.obj `if test -f 'modules/others_tools/src/cpp/scilab.cpp'; then $(CYGPATH_W) 'modules/others_tools/src/cpp/scilab.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/cpp/scilab.cpp'; fi`
- @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/others_tools/src/cpp/$(DEPDIR)/scilab_bin-scilab.Tpo modules/others_tools/src/cpp/$(DEPDIR)/scilab_bin-scilab.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/others_tools/src/cpp/scilab.cpp' object='modules/others_tools/src/cpp/scilab_bin-scilab.obj' libtool=no @AMDEPBACKSLASH@
 -modules/startup/src/c/scilab_bin-mainscic.obj: modules/startup/src/c/mainscic.cpp
 -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/startup/src/c/scilab_bin-mainscic.obj -MD -MP -MF modules/startup/src/c/$(DEPDIR)/scilab_bin-mainscic.Tpo -c -o modules/startup/src/c/scilab_bin-mainscic.obj `if test -f 'modules/startup/src/c/mainscic.cpp'; then $(CYGPATH_W) 'modules/startup/src/c/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/startup/src/c/mainscic.cpp'; fi`
 -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/startup/src/c/$(DEPDIR)/scilab_bin-mainscic.Tpo modules/startup/src/c/$(DEPDIR)/scilab_bin-mainscic.Po
 -@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/startup/src/c/mainscic.cpp' object='modules/startup/src/c/scilab_bin-mainscic.obj' libtool=no @AMDEPBACKSLASH@
++modules/startup/src/cpp/scilab_bin-scilab.obj: modules/startup/src/cpp/scilab.cpp
++@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/startup/src/cpp/scilab_bin-scilab.obj -MD -MP -MF modules/startup/src/cpp/$(DEPDIR)/scilab_bin-scilab.Tpo -c -o modules/startup/src/cpp/scilab_bin-scilab.obj `if test -f 'modules/startup/src/cpp/scilab.cpp'; then $(CYGPATH_W) 'modules/startup/src/cpp/scilab.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/startup/src/cpp/scilab.cpp'; fi`
++@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/startup/src/cpp/$(DEPDIR)/scilab_bin-scilab.Tpo modules/startup/src/cpp/$(DEPDIR)/scilab_bin-scilab.Po
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/startup/src/cpp/scilab.cpp' object='modules/startup/src/cpp/scilab_bin-scilab.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/others_tools/src/cpp/scilab_bin-scilab.obj `if test -f 'modules/others_tools/src/cpp/scilab.cpp'; then $(CYGPATH_W) 'modules/others_tools/src/cpp/scilab.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/cpp/scilab.cpp'; fi`
 -@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/startup/src/c/scilab_bin-mainscic.obj `if test -f 'modules/startup/src/c/mainscic.cpp'; then $(CYGPATH_W) 'modules/startup/src/c/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/startup/src/c/mainscic.cpp'; fi`
++@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/startup/src/cpp/scilab_bin-scilab.obj `if test -f 'modules/startup/src/cpp/scilab.cpp'; then $(CYGPATH_W) 'modules/startup/src/cpp/scilab.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/startup/src/cpp/scilab.cpp'; fi`
  
- modules/others_tools/src/cpp/scilab_cli_bin-scilab.o: modules/others_tools/src/cpp/scilab.cpp
- @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/others_tools/src/cpp/scilab_cli_bin-scilab.o -MD -MP -MF modules/others_tools/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Tpo -c -o modules/others_tools/src/cpp/scilab_cli_bin-scilab.o `test -f 'modules/others_tools/src/cpp/scilab.cpp' || echo '$(srcdir)/'`modules/others_tools/src/cpp/scilab.cpp
- @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/others_tools/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Tpo modules/others_tools/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/others_tools/src/cpp/scilab.cpp' object='modules/others_tools/src/cpp/scilab_cli_bin-scilab.o' libtool=no @AMDEPBACKSLASH@
 -modules/startup/src/c/scilab_cli_bin-mainscic.o: modules/startup/src/c/mainscic.cpp
 -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/startup/src/c/scilab_cli_bin-mainscic.o -MD -MP -MF modules/startup/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo -c -o modules/startup/src/c/scilab_cli_bin-mainscic.o `test -f 'modules/startup/src/c/mainscic.cpp' || echo '$(srcdir)/'`modules/startup/src/c/mainscic.cpp
 -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/startup/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo modules/startup/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Po
 -@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/startup/src/c/mainscic.cpp' object='modules/startup/src/c/scilab_cli_bin-mainscic.o' libtool=no @AMDEPBACKSLASH@
++modules/startup/src/cpp/scilab_cli_bin-scilab.o: modules/startup/src/cpp/scilab.cpp
++@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/startup/src/cpp/scilab_cli_bin-scilab.o -MD -MP -MF modules/startup/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Tpo -c -o modules/startup/src/cpp/scilab_cli_bin-scilab.o `test -f 'modules/startup/src/cpp/scilab.cpp' || echo '$(srcdir)/'`modules/startup/src/cpp/scilab.cpp
++@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/startup/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Tpo modules/startup/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Po
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/startup/src/cpp/scilab.cpp' object='modules/startup/src/cpp/scilab_cli_bin-scilab.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/others_tools/src/cpp/scilab_cli_bin-scilab.o `test -f 'modules/others_tools/src/cpp/scilab.cpp' || echo '$(srcdir)/'`modules/others_tools/src/cpp/scilab.cpp
 -@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/startup/src/c/scilab_cli_bin-mainscic.o `test -f 'modules/startup/src/c/mainscic.cpp' || echo '$(srcdir)/'`modules/startup/src/c/mainscic.cpp
++@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/startup/src/cpp/scilab_cli_bin-scilab.o `test -f 'modules/startup/src/cpp/scilab.cpp' || echo '$(srcdir)/'`modules/startup/src/cpp/scilab.cpp
  
- modules/others_tools/src/cpp/scilab_cli_bin-scilab.obj: modules/others_tools/src/cpp/scilab.cpp
- @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/others_tools/src/cpp/scilab_cli_bin-scilab.obj -MD -MP -MF modules/others_tools/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Tpo -c -o modules/others_tools/src/cpp/scilab_cli_bin-scilab.obj `if test -f 'modules/others_tools/src/cpp/scilab.cpp'; then $(CYGPATH_W) 'modules/others_tools/src/cpp/scilab.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/cpp/scilab.cpp'; fi`
- @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/others_tools/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Tpo modules/others_tools/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/others_tools/src/cpp/scilab.cpp' object='modules/others_tools/src/cpp/scilab_cli_bin-scilab.obj' libtool=no @AMDEPBACKSLASH@
 -modules/startup/src/c/scilab_cli_bin-mainscic.obj: modules/startup/src/c/mainscic.cpp
 -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/startup/src/c/scilab_cli_bin-mainscic.obj -MD -MP -MF modules/startup/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo -c -o modules/startup/src/c/scilab_cli_bin-mainscic.obj `if test -f 'modules/startup/src/c/mainscic.cpp'; then $(CYGPATH_W) 'modules/startup/src/c/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/startup/src/c/mainscic.cpp'; fi`
 -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/startup/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo modules/startup/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Po
 -@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/startup/src/c/mainscic.cpp' object='modules/startup/src/c/scilab_cli_bin-mainscic.obj' libtool=no @AMDEPBACKSLASH@
++modules/startup/src/cpp/scilab_cli_bin-scilab.obj: modules/startup/src/cpp/scilab.cpp
++@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/startup/src/cpp/scilab_cli_bin-scilab.obj -MD -MP -MF modules/startup/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Tpo -c -o modules/startup/src/cpp/scilab_cli_bin-scilab.obj `if test -f 'modules/startup/src/cpp/scilab.cpp'; then $(CYGPATH_W) 'modules/startup/src/cpp/scilab.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/startup/src/cpp/scilab.cpp'; fi`
++@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) modules/startup/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Tpo modules/startup/src/cpp/$(DEPDIR)/scilab_cli_bin-scilab.Po
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='modules/startup/src/cpp/scilab.cpp' object='modules/startup/src/cpp/scilab_cli_bin-scilab.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/others_tools/src/cpp/scilab_cli_bin-scilab.obj `if test -f 'modules/others_tools/src/cpp/scilab.cpp'; then $(CYGPATH_W) 'modules/others_tools/src/cpp/scilab.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/cpp/scilab.cpp'; fi`
 -@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/startup/src/c/scilab_cli_bin-mainscic.obj `if test -f 'modules/startup/src/c/mainscic.cpp'; then $(CYGPATH_W) 'modules/startup/src/c/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/startup/src/c/mainscic.cpp'; fi`
++@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o modules/startup/src/cpp/scilab_cli_bin-scilab.obj `if test -f 'modules/startup/src/cpp/scilab.cpp'; then $(CYGPATH_W) 'modules/startup/src/cpp/scilab.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/startup/src/cpp/scilab.cpp'; fi`
  
  mostlyclean-libtool:
        -rm -f *.lo
@@@ -1991,10 -1915,8 +1970,10 @@@ distclean-generic
        -rm -f modules/call_scilab/examples/basicExamples/$(am__dirstamp)
        -rm -f modules/call_scilab/examples/call_scilab/c/common/$(DEPDIR)/$(am__dirstamp)
        -rm -f modules/call_scilab/examples/call_scilab/c/common/$(am__dirstamp)
-       -rm -f modules/others_tools/src/c/$(DEPDIR)/$(am__dirstamp)
-       -rm -f modules/others_tools/src/c/$(am__dirstamp)
-       -rm -f modules/others_tools/src/cpp/$(DEPDIR)/$(am__dirstamp)
-       -rm -f modules/others_tools/src/cpp/$(am__dirstamp)
+       -rm -f modules/startup/src/c/$(DEPDIR)/$(am__dirstamp)
+       -rm -f modules/startup/src/c/$(am__dirstamp)
++      -rm -f modules/startup/src/cpp/$(DEPDIR)/$(am__dirstamp)
++      -rm -f modules/startup/src/cpp/$(am__dirstamp)
  
  maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@@ -2007,7 -1929,7 +1986,7 @@@ clean-am: clean-binPROGRAMS clean-check
  
  distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf modules/call_scilab/examples/basicExamples/$(DEPDIR) modules/call_scilab/examples/call_scilab/c/common/$(DEPDIR) modules/others_tools/src/c/$(DEPDIR) modules/others_tools/src/cpp/$(DEPDIR)
 -      -rm -rf modules/call_scilab/examples/basicExamples/$(DEPDIR) modules/call_scilab/examples/call_scilab/c/common/$(DEPDIR) modules/startup/src/c/$(DEPDIR)
++      -rm -rf modules/call_scilab/examples/basicExamples/$(DEPDIR) modules/call_scilab/examples/call_scilab/c/common/$(DEPDIR) modules/startup/src/c/$(DEPDIR) modules/startup/src/cpp/$(DEPDIR)
        -rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
        distclean-hdr distclean-libtool distclean-tags
@@@ -2056,7 -1978,7 +2035,7 @@@ installcheck-am
  maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf modules/call_scilab/examples/basicExamples/$(DEPDIR) modules/call_scilab/examples/call_scilab/c/common/$(DEPDIR) modules/others_tools/src/c/$(DEPDIR) modules/others_tools/src/cpp/$(DEPDIR)
 -      -rm -rf modules/call_scilab/examples/basicExamples/$(DEPDIR) modules/call_scilab/examples/call_scilab/c/common/$(DEPDIR) modules/startup/src/c/$(DEPDIR)
++      -rm -rf modules/call_scilab/examples/basicExamples/$(DEPDIR) modules/call_scilab/examples/call_scilab/c/common/$(DEPDIR) modules/startup/src/c/$(DEPDIR) modules/startup/src/cpp/$(DEPDIR)
        -rm -f Makefile
  maintainer-clean-am: distclean-am maintainer-clean-generic
  
@@@ -1,16 -1,16 +1,16 @@@
  /*
   * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
   * Copyright (C) 2007 - DIGITEO - Sylvestre LEDRU
++ * Copyright (C) 2010 - DIGITEO - Bruno JOFRET
   *
   * 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.1-en.txt
++ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
   *
   */
  #include <stdlib.h>
- #include "sci_mode.h"
 -#include "scilabmode.h"
  #include "realmain.h"
  #include "initMacOSXEnv.h"
  
  
  #if defined(__APPLE__) && !defined(WITHOUT_GUI)
  
--typedef struct
--{
--    int   no_startup_flag_l;
--    char  *initial_script;
--    InitScriptType initial_script_type;
--    int memory;
--} thread_parm_t;
--
  /*
  Some parts of the next three functions have been taken from simpleJavaLauncher.
  
@@@ -92,9 -92,9 +84,8 @@@ static void setAppName(const char * nam
   * @param param The structure containing the missing argument mandatory for realmain
   * @return the result of the operation (0 if OK ...)
   */
--static int launchMacOSXEnv(thread_parm_t *param)
++static int launchMacOSXEnv(ScilabEngineInfo* _pSEI)
  {
--    thread_parm_t *p = (thread_parm_t *)param;
      int ret = -1;
      {
          CFStringRef targetJVM = CFSTR("1.5");
  
      if (ret == 0)
      {
--        /* Call the actual startup script of Scilab */
--        ret = realmain(p->no_startup_flag_l, p->initial_script, p->initial_script_type, p->memory);
--        free(p);
++        StartScilabEngine(_pSEI);
++        ret = RunScilabEngine(_pSEI);
++        StopScilabEngine(_pSEI);
          exit(ret);
      }
--    free(p);
++
++
      return ret;
  
  }
@@@ -208,22 -208,22 +200,13 @@@ static void sourceCallBack (  void *inf
  /* Specific wrapper for mac os X which is going to call realmin in a specific thread.
   * Takes the same args as realmain
   */
--int initMacOSXEnv(int no_startup_flag_l, char *initial_script, InitScriptType initial_script_type, int memory)
++int initMacOSXEnv(ScilabEngineInfo* _pSEI)
  {
--
      CFRunLoopSourceContext sourceContext;
      /* Start the thread that runs the VM. */
      pthread_t vmthread;
      setAppName("Scilab");
  
--    /* Create the structure which is going to be giving to the function inside the thread */
--    thread_parm_t         *param = NULL;
--    param = malloc(sizeof(thread_parm_t));
--    param->no_startup_flag_l = no_startup_flag_l;
--    param->initial_script = initial_script;
--    param->initial_script_type = initial_script_type;
--    param->memory = memory;
--
      /* create a new pthread copying the stack size of the primordial pthread */
      struct rlimit limit;
      size_t stack_size = 0;
      }
  
      /* Start the thread that we will start the JVM on. */
--    pthread_create(&vmthread, &thread_attr,  launchMacOSXEnv, (void*)param);
++    pthread_create(&vmthread, &thread_attr,  launchMacOSXEnv, _pSEI);
      pthread_attr_destroy(&thread_attr);
  
--    /* Create a sourceContext to be used by our source that makes */
++    /* Create a a sourceContext to be used by our source that makes */
      /* sure the CFRunLoop doesn't exit right away */
      sourceContext.version = 0;
      sourceContext.info = NULL;
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
  <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
      <ProjectConfiguration Include="Debug|Win32">
      <ProjectReference Include="..\..\..\..\core\src\c\core.vcxproj">
        <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
      </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <ItemGroup>
-     <ClCompile Include="..\..\..\..\others_tools\src\cpp\scilab.cpp" />
++    <ClCompile Include="..\..\..\..\startup\src\cpp\scilab.cpp" />
    </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup>
      <Filter Include="Source Files">
@@@ -19,9 -24,4 +19,9 @@@
        <Filter>Resource Files</Filter>
      </ResourceCompile>
    </ItemGroup>
 +  <ItemGroup>
-     <ClCompile Include="..\..\..\..\others_tools\src\cpp\scilab.cpp">
++    <ClCompile Include="..\..\..\..\startup\src\cpp\scilab.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +  </ItemGroup>
  </Project>
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
  <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
      <ProjectConfiguration Include="Debug|Win32">
      <ResourceCompile Include="WScilex.rc" />
    </ItemGroup>
    <ItemGroup>
 -    <ProjectReference Include="..\..\..\..\..\libs\GetWindowsVersion\GetWindowsVersion.vcxproj">
 -      <Project>{982bf37f-42c4-4d37-8d14-60521b141503}</Project>
 -      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    <ProjectReference Include="..\..\..\..\console\src\c\console.vcxproj">
 +      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\core\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
      </ProjectReference>
 -    <ProjectReference Include="..\..\..\..\..\tools\localization\generatePoFile.vcxproj">
 -      <Project>{6880d4df-bc7a-411f-ad9b-20a14429a92f}</Project>
 -      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    <ProjectReference Include="..\..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
      </ProjectReference>
 -    <ProjectReference Include="..\..\..\..\functions\scripts\buildmacros\BuildMacros.vcxproj">
 -      <Project>{66f2fb48-5d68-4445-a856-119f685a371b}</Project>
 -      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    <ProjectReference Include="..\..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
      </ProjectReference>
 -    <ProjectReference Include="..\CScilex\CScilex.vcxproj">
 -      <Project>{9ba6f7e4-ae64-4fd9-a5a7-0996a8b73b77}</Project>
 -      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    <ProjectReference Include="..\..\..\..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
      </ProjectReference>
    </ItemGroup>
 +  <ItemGroup>
-     <ClCompile Include="..\..\..\..\others_tools\src\cpp\scilab.cpp" />
++    <ClCompile Include="..\..\..\..\startup\src\cpp\scilab.cpp" />
 +  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup>
      <Filter Include="Source Files">
        <Filter>Resource Files</Filter>
      </ResourceCompile>
    </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="resource.h">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +  </ItemGroup>
 +  <ItemGroup>
-     <ClCompile Include="..\..\..\..\others_tools\src\cpp\scilab.cpp">
++    <ClCompile Include="..\..\..\..\startup\src\cpp\scilab.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +  </ItemGroup>
  </Project>