Move sources to avoid subdir-objetcs Autotools conflict in make distclean. 02/13402/1
Bruno JOFRET [Mon, 6 Jan 2014 15:17:17 +0000 (16:17 +0100)]
Change-Id: I07409d1c146bc424322d9a43f67ae5ca3373722a

scilab/Makefile.am
scilab/Makefile.in
scilab/modules/console/src/c/others/mainscic.cpp [deleted file]
scilab/modules/others_tools/src/c/initMPI.c [moved from scilab/modules/console/src/c/others/initMPI.c with 95% similarity]
scilab/modules/others_tools/src/c/initMPI.h [moved from scilab/modules/console/src/c/others/initMPI.h with 100% similarity]
scilab/modules/others_tools/src/c/mainscic.cpp [new file with mode: 0644]

index ae3fafe..55b993b 100644 (file)
@@ -69,21 +69,21 @@ scilab_bin_CPPFLAGS = -I$(top_srcdir)/modules/io/includes/ \
 # (causing issues on some platform)
 COMMON_LIBS = $(LTLIBINTL)
 
-scilab_bin_SOURCES             = modules/console/src/c/others/mainscic.cpp
+scilab_bin_SOURCES             = modules/others_tools/src/c/mainscic.cpp
 
 scilab_bin_LDADD               = $(COMMON_LIBS) $(top_builddir)/modules/libscilab.la $(FLIBS)
 
 # Match scilab -nwni (ie command line without graphics)
-scilab_cli_bin_SOURCES = modules/console/src/c/others/mainscic.cpp
+scilab_cli_bin_SOURCES = modules/others_tools/src/c/mainscic.cpp
 
 scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS)
 scilab_cli_bin_LDADD   = $(COMMON_LIBS) $(top_builddir)/modules/libscilab-cli.la $(FLIBS)
 
 if MPI
 CXX = $(OPENMPI_CXX)
-scilab_bin_SOURCES += modules/console/src/c/others/initMPI.c
+scilab_bin_SOURCES += modules/others_tools/src/c/initMPI.c
 scilab_bin_CPPFLAGS += $(OPENMPI_CXXFLAGS)
-scilab_cli_bin_SOURCES += modules/console/src/c/others/initMPI.c
+scilab_cli_bin_SOURCES += modules/others_tools/src/c/initMPI.c
 scilab_cli_bin_CPPFLAGS += $(OPENMPI_CXXFLAGS)
 endif
 
index cc764db..f2b5e86 100644 (file)
@@ -115,9 +115,9 @@ bin_PROGRAMS = scilab-bin$(EXEEXT) scilab-cli-bin$(EXEEXT)
 @USE_STATIC_SYSTEM_LIB_FALSE@am__append_5 = -lstdc++
 #-static-libgfortran
 @IS_MACOSX_TRUE@am__append_6 = -framework Cocoa
-@MPI_TRUE@am__append_7 = modules/console/src/c/others/initMPI.c
+@MPI_TRUE@am__append_7 = modules/others_tools/src/c/initMPI.c
 @MPI_TRUE@am__append_8 = $(OPENMPI_CXXFLAGS)
-@MPI_TRUE@am__append_9 = modules/console/src/c/others/initMPI.c
+@MPI_TRUE@am__append_9 = modules/others_tools/src/c/initMPI.c
 @MPI_TRUE@am__append_10 = $(OPENMPI_CXXFLAGS)
 
 #  The user wants to compile the localization files
@@ -257,12 +257,11 @@ call_scilab_readwritestring_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(call_scilab_readwritestring_CFLAGS) $(CFLAGS) \
        $(call_scilab_readwritestring_LDFLAGS) $(LDFLAGS) -o $@
-am__scilab_bin_SOURCES_DIST =  \
-       modules/console/src/c/others/mainscic.cpp \
-       modules/console/src/c/others/initMPI.c
-@MPI_TRUE@am__objects_1 = modules/console/src/c/others/scilab_bin-initMPI.$(OBJEXT)
+am__scilab_bin_SOURCES_DIST = modules/others_tools/src/c/mainscic.cpp \
+       modules/others_tools/src/c/initMPI.c
+@MPI_TRUE@am__objects_1 = modules/others_tools/src/c/scilab_bin-initMPI.$(OBJEXT)
 am_scilab_bin_OBJECTS =  \
-       modules/console/src/c/others/scilab_bin-mainscic.$(OBJEXT) \
+       modules/others_tools/src/c/scilab_bin-mainscic.$(OBJEXT) \
        $(am__objects_1)
 scilab_bin_OBJECTS = $(am_scilab_bin_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -273,10 +272,11 @@ 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/console/src/c/others/mainscic.cpp \
-       modules/console/src/c/others/initMPI.c
-@MPI_TRUE@am__objects_2 = modules/console/src/c/others/scilab_cli_bin-initMPI.$(OBJEXT)
-am_scilab_cli_bin_OBJECTS = modules/console/src/c/others/scilab_cli_bin-mainscic.$(OBJEXT) \
+       modules/others_tools/src/c/mainscic.cpp \
+       modules/others_tools/src/c/initMPI.c
+@MPI_TRUE@am__objects_2 = modules/others_tools/src/c/scilab_cli_bin-initMPI.$(OBJEXT)
+am_scilab_cli_bin_OBJECTS =  \
+       modules/others_tools/src/c/scilab_cli_bin-mainscic.$(OBJEXT) \
        $(am__objects_2)
 scilab_cli_bin_OBJECTS = $(am_scilab_cli_bin_OBJECTS)
 scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -791,12 +791,12 @@ scilab_bin_CPPFLAGS = -I$(top_srcdir)/modules/io/includes/ \
 # Localization dep already exists because of the `exportLocaleToSystem' symbol
 # (causing issues on some platform)
 COMMON_LIBS = $(LTLIBINTL)
-scilab_bin_SOURCES = modules/console/src/c/others/mainscic.cpp \
+scilab_bin_SOURCES = modules/others_tools/src/c/mainscic.cpp \
        $(am__append_7)
 scilab_bin_LDADD = $(COMMON_LIBS) $(top_builddir)/modules/libscilab.la $(FLIBS)
 
 # Match scilab -nwni (ie command line without graphics)
-scilab_cli_bin_SOURCES = modules/console/src/c/others/mainscic.cpp \
+scilab_cli_bin_SOURCES = modules/others_tools/src/c/mainscic.cpp \
        $(am__append_9)
 scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS) \
        $(am__append_10)
@@ -1098,28 +1098,28 @@ modules/call_scilab/examples/basicExamples/call_scilab_readwritestring-readwrite
 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/console/src/c/others/$(am__dirstamp):
-       @$(MKDIR_P) modules/console/src/c/others
-       @: > modules/console/src/c/others/$(am__dirstamp)
-modules/console/src/c/others/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) modules/console/src/c/others/$(DEPDIR)
-       @: > modules/console/src/c/others/$(DEPDIR)/$(am__dirstamp)
-modules/console/src/c/others/scilab_bin-mainscic.$(OBJEXT):  \
-       modules/console/src/c/others/$(am__dirstamp) \
-       modules/console/src/c/others/$(DEPDIR)/$(am__dirstamp)
-modules/console/src/c/others/scilab_bin-initMPI.$(OBJEXT):  \
-       modules/console/src/c/others/$(am__dirstamp) \
-       modules/console/src/c/others/$(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-mainscic.$(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)
 
 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/console/src/c/others/scilab_cli_bin-mainscic.$(OBJEXT):  \
-       modules/console/src/c/others/$(am__dirstamp) \
-       modules/console/src/c/others/$(DEPDIR)/$(am__dirstamp)
-modules/console/src/c/others/scilab_cli_bin-initMPI.$(OBJEXT):  \
-       modules/console/src/c/others/$(am__dirstamp) \
-       modules/console/src/c/others/$(DEPDIR)/$(am__dirstamp)
+modules/others_tools/src/c/scilab_cli_bin-mainscic.$(OBJEXT):  \
+       modules/others_tools/src/c/$(am__dirstamp) \
+       modules/others_tools/src/c/$(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)
 
 scilab-cli-bin$(EXEEXT): $(scilab_cli_bin_OBJECTS) $(scilab_cli_bin_DEPENDENCIES) $(EXTRA_scilab_cli_bin_DEPENDENCIES) 
        @rm -f scilab-cli-bin$(EXEEXT)
@@ -1164,7 +1164,7 @@ 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/console/src/c/others/*.$(OBJEXT)
+       -rm -f modules/others_tools/src/c/*.$(OBJEXT)
 
 distclean-compile:
        -rm -f *.tab.c
@@ -1177,10 +1177,10 @@ distclean-compile:
 @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/console/src/c/others/$(DEPDIR)/scilab_bin-initMPI.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/console/src/c/others/$(DEPDIR)/scilab_bin-mainscic.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-initMPI.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-mainscic.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-mainscic.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/c/$(DEPDIR)/scilab_cli_bin-mainscic.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1318,33 +1318,33 @@ modules/call_scilab/examples/basicExamples/call_scilab_readwritestring-readwrite
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(call_scilab_readwritestring_CFLAGS) $(CFLAGS) -c -o modules/call_scilab/examples/basicExamples/call_scilab_readwritestring-readwritestring.obj `if test -f 'modules/call_scilab/examples/basicExamples/readwritestring.c'; then $(CYGPATH_W) 'modules/call_scilab/examples/basicExamples/readwritestring.c'; else $(CYGPATH_W) '$(srcdir)/modules/call_scilab/examples/basicExamples/readwritestring.c'; fi`
 
-modules/console/src/c/others/scilab_bin-initMPI.o: modules/console/src/c/others/initMPI.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT modules/console/src/c/others/scilab_bin-initMPI.o -MD -MP -MF modules/console/src/c/others/$(DEPDIR)/scilab_bin-initMPI.Tpo -c -o modules/console/src/c/others/scilab_bin-initMPI.o `test -f 'modules/console/src/c/others/initMPI.c' || echo '$(srcdir)/'`modules/console/src/c/others/initMPI.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) modules/console/src/c/others/$(DEPDIR)/scilab_bin-initMPI.Tpo modules/console/src/c/others/$(DEPDIR)/scilab_bin-initMPI.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='modules/console/src/c/others/initMPI.c' object='modules/console/src/c/others/scilab_bin-initMPI.o' libtool=no @AMDEPBACKSLASH@
+modules/others_tools/src/c/scilab_bin-initMPI.o: modules/others_tools/src/c/initMPI.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT modules/others_tools/src/c/scilab_bin-initMPI.o -MD -MP -MF modules/others_tools/src/c/$(DEPDIR)/scilab_bin-initMPI.Tpo -c -o modules/others_tools/src/c/scilab_bin-initMPI.o `test -f 'modules/others_tools/src/c/initMPI.c' || echo '$(srcdir)/'`modules/others_tools/src/c/initMPI.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) modules/others_tools/src/c/$(DEPDIR)/scilab_bin-initMPI.Tpo modules/others_tools/src/c/$(DEPDIR)/scilab_bin-initMPI.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='modules/others_tools/src/c/initMPI.c' object='modules/others_tools/src/c/scilab_bin-initMPI.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o modules/console/src/c/others/scilab_bin-initMPI.o `test -f 'modules/console/src/c/others/initMPI.c' || echo '$(srcdir)/'`modules/console/src/c/others/initMPI.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o modules/others_tools/src/c/scilab_bin-initMPI.o `test -f 'modules/others_tools/src/c/initMPI.c' || echo '$(srcdir)/'`modules/others_tools/src/c/initMPI.c
 
-modules/console/src/c/others/scilab_bin-initMPI.obj: modules/console/src/c/others/initMPI.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT modules/console/src/c/others/scilab_bin-initMPI.obj -MD -MP -MF modules/console/src/c/others/$(DEPDIR)/scilab_bin-initMPI.Tpo -c -o modules/console/src/c/others/scilab_bin-initMPI.obj `if test -f 'modules/console/src/c/others/initMPI.c'; then $(CYGPATH_W) 'modules/console/src/c/others/initMPI.c'; else $(CYGPATH_W) '$(srcdir)/modules/console/src/c/others/initMPI.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) modules/console/src/c/others/$(DEPDIR)/scilab_bin-initMPI.Tpo modules/console/src/c/others/$(DEPDIR)/scilab_bin-initMPI.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='modules/console/src/c/others/initMPI.c' object='modules/console/src/c/others/scilab_bin-initMPI.obj' libtool=no @AMDEPBACKSLASH@
+modules/others_tools/src/c/scilab_bin-initMPI.obj: modules/others_tools/src/c/initMPI.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT modules/others_tools/src/c/scilab_bin-initMPI.obj -MD -MP -MF modules/others_tools/src/c/$(DEPDIR)/scilab_bin-initMPI.Tpo -c -o modules/others_tools/src/c/scilab_bin-initMPI.obj `if test -f 'modules/others_tools/src/c/initMPI.c'; then $(CYGPATH_W) 'modules/others_tools/src/c/initMPI.c'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/c/initMPI.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) modules/others_tools/src/c/$(DEPDIR)/scilab_bin-initMPI.Tpo modules/others_tools/src/c/$(DEPDIR)/scilab_bin-initMPI.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='modules/others_tools/src/c/initMPI.c' object='modules/others_tools/src/c/scilab_bin-initMPI.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o modules/console/src/c/others/scilab_bin-initMPI.obj `if test -f 'modules/console/src/c/others/initMPI.c'; then $(CYGPATH_W) 'modules/console/src/c/others/initMPI.c'; else $(CYGPATH_W) '$(srcdir)/modules/console/src/c/others/initMPI.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o modules/others_tools/src/c/scilab_bin-initMPI.obj `if test -f 'modules/others_tools/src/c/initMPI.c'; then $(CYGPATH_W) 'modules/others_tools/src/c/initMPI.c'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/c/initMPI.c'; fi`
 
-modules/console/src/c/others/scilab_cli_bin-initMPI.o: modules/console/src/c/others/initMPI.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT modules/console/src/c/others/scilab_cli_bin-initMPI.o -MD -MP -MF modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-initMPI.Tpo -c -o modules/console/src/c/others/scilab_cli_bin-initMPI.o `test -f 'modules/console/src/c/others/initMPI.c' || echo '$(srcdir)/'`modules/console/src/c/others/initMPI.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-initMPI.Tpo modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-initMPI.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='modules/console/src/c/others/initMPI.c' object='modules/console/src/c/others/scilab_cli_bin-initMPI.o' libtool=no @AMDEPBACKSLASH@
+modules/others_tools/src/c/scilab_cli_bin-initMPI.o: modules/others_tools/src/c/initMPI.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT modules/others_tools/src/c/scilab_cli_bin-initMPI.o -MD -MP -MF modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-initMPI.Tpo -c -o modules/others_tools/src/c/scilab_cli_bin-initMPI.o `test -f 'modules/others_tools/src/c/initMPI.c' || echo '$(srcdir)/'`modules/others_tools/src/c/initMPI.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-initMPI.Tpo modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-initMPI.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='modules/others_tools/src/c/initMPI.c' object='modules/others_tools/src/c/scilab_cli_bin-initMPI.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o modules/console/src/c/others/scilab_cli_bin-initMPI.o `test -f 'modules/console/src/c/others/initMPI.c' || echo '$(srcdir)/'`modules/console/src/c/others/initMPI.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o modules/others_tools/src/c/scilab_cli_bin-initMPI.o `test -f 'modules/others_tools/src/c/initMPI.c' || echo '$(srcdir)/'`modules/others_tools/src/c/initMPI.c
 
-modules/console/src/c/others/scilab_cli_bin-initMPI.obj: modules/console/src/c/others/initMPI.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT modules/console/src/c/others/scilab_cli_bin-initMPI.obj -MD -MP -MF modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-initMPI.Tpo -c -o modules/console/src/c/others/scilab_cli_bin-initMPI.obj `if test -f 'modules/console/src/c/others/initMPI.c'; then $(CYGPATH_W) 'modules/console/src/c/others/initMPI.c'; else $(CYGPATH_W) '$(srcdir)/modules/console/src/c/others/initMPI.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-initMPI.Tpo modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-initMPI.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='modules/console/src/c/others/initMPI.c' object='modules/console/src/c/others/scilab_cli_bin-initMPI.obj' libtool=no @AMDEPBACKSLASH@
+modules/others_tools/src/c/scilab_cli_bin-initMPI.obj: modules/others_tools/src/c/initMPI.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT modules/others_tools/src/c/scilab_cli_bin-initMPI.obj -MD -MP -MF modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-initMPI.Tpo -c -o modules/others_tools/src/c/scilab_cli_bin-initMPI.obj `if test -f 'modules/others_tools/src/c/initMPI.c'; then $(CYGPATH_W) 'modules/others_tools/src/c/initMPI.c'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/c/initMPI.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-initMPI.Tpo modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-initMPI.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='modules/others_tools/src/c/initMPI.c' object='modules/others_tools/src/c/scilab_cli_bin-initMPI.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o modules/console/src/c/others/scilab_cli_bin-initMPI.obj `if test -f 'modules/console/src/c/others/initMPI.c'; then $(CYGPATH_W) 'modules/console/src/c/others/initMPI.c'; else $(CYGPATH_W) '$(srcdir)/modules/console/src/c/others/initMPI.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o modules/others_tools/src/c/scilab_cli_bin-initMPI.obj `if test -f 'modules/others_tools/src/c/initMPI.c'; then $(CYGPATH_W) 'modules/others_tools/src/c/initMPI.c'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/c/initMPI.c'; fi`
 
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1370,33 +1370,33 @@ modules/console/src/c/others/scilab_cli_bin-initMPI.obj: modules/console/src/c/o
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
-modules/console/src/c/others/scilab_bin-mainscic.o: modules/console/src/c/others/mainscic.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/console/src/c/others/scilab_bin-mainscic.o -MD -MP -MF modules/console/src/c/others/$(DEPDIR)/scilab_bin-mainscic.Tpo -c -o modules/console/src/c/others/scilab_bin-mainscic.o `test -f 'modules/console/src/c/others/mainscic.cpp' || echo '$(srcdir)/'`modules/console/src/c/others/mainscic.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) modules/console/src/c/others/$(DEPDIR)/scilab_bin-mainscic.Tpo modules/console/src/c/others/$(DEPDIR)/scilab_bin-mainscic.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='modules/console/src/c/others/mainscic.cpp' object='modules/console/src/c/others/scilab_bin-mainscic.o' libtool=no @AMDEPBACKSLASH@
+modules/others_tools/src/c/scilab_bin-mainscic.o: modules/others_tools/src/c/mainscic.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/others_tools/src/c/scilab_bin-mainscic.o -MD -MP -MF modules/others_tools/src/c/$(DEPDIR)/scilab_bin-mainscic.Tpo -c -o modules/others_tools/src/c/scilab_bin-mainscic.o `test -f 'modules/others_tools/src/c/mainscic.cpp' || echo '$(srcdir)/'`modules/others_tools/src/c/mainscic.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) modules/others_tools/src/c/$(DEPDIR)/scilab_bin-mainscic.Tpo modules/others_tools/src/c/$(DEPDIR)/scilab_bin-mainscic.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='modules/others_tools/src/c/mainscic.cpp' object='modules/others_tools/src/c/scilab_bin-mainscic.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/console/src/c/others/scilab_bin-mainscic.o `test -f 'modules/console/src/c/others/mainscic.cpp' || echo '$(srcdir)/'`modules/console/src/c/others/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/others_tools/src/c/scilab_bin-mainscic.o `test -f 'modules/others_tools/src/c/mainscic.cpp' || echo '$(srcdir)/'`modules/others_tools/src/c/mainscic.cpp
 
-modules/console/src/c/others/scilab_bin-mainscic.obj: modules/console/src/c/others/mainscic.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/console/src/c/others/scilab_bin-mainscic.obj -MD -MP -MF modules/console/src/c/others/$(DEPDIR)/scilab_bin-mainscic.Tpo -c -o modules/console/src/c/others/scilab_bin-mainscic.obj `if test -f 'modules/console/src/c/others/mainscic.cpp'; then $(CYGPATH_W) 'modules/console/src/c/others/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/console/src/c/others/mainscic.cpp'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) modules/console/src/c/others/$(DEPDIR)/scilab_bin-mainscic.Tpo modules/console/src/c/others/$(DEPDIR)/scilab_bin-mainscic.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='modules/console/src/c/others/mainscic.cpp' object='modules/console/src/c/others/scilab_bin-mainscic.obj' libtool=no @AMDEPBACKSLASH@
+modules/others_tools/src/c/scilab_bin-mainscic.obj: modules/others_tools/src/c/mainscic.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/others_tools/src/c/scilab_bin-mainscic.obj -MD -MP -MF modules/others_tools/src/c/$(DEPDIR)/scilab_bin-mainscic.Tpo -c -o modules/others_tools/src/c/scilab_bin-mainscic.obj `if test -f 'modules/others_tools/src/c/mainscic.cpp'; then $(CYGPATH_W) 'modules/others_tools/src/c/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/c/mainscic.cpp'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) modules/others_tools/src/c/$(DEPDIR)/scilab_bin-mainscic.Tpo modules/others_tools/src/c/$(DEPDIR)/scilab_bin-mainscic.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='modules/others_tools/src/c/mainscic.cpp' object='modules/others_tools/src/c/scilab_bin-mainscic.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/console/src/c/others/scilab_bin-mainscic.obj `if test -f 'modules/console/src/c/others/mainscic.cpp'; then $(CYGPATH_W) 'modules/console/src/c/others/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/console/src/c/others/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/others_tools/src/c/scilab_bin-mainscic.obj `if test -f 'modules/others_tools/src/c/mainscic.cpp'; then $(CYGPATH_W) 'modules/others_tools/src/c/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/c/mainscic.cpp'; fi`
 
-modules/console/src/c/others/scilab_cli_bin-mainscic.o: modules/console/src/c/others/mainscic.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/console/src/c/others/scilab_cli_bin-mainscic.o -MD -MP -MF modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo -c -o modules/console/src/c/others/scilab_cli_bin-mainscic.o `test -f 'modules/console/src/c/others/mainscic.cpp' || echo '$(srcdir)/'`modules/console/src/c/others/mainscic.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-mainscic.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='modules/console/src/c/others/mainscic.cpp' object='modules/console/src/c/others/scilab_cli_bin-mainscic.o' libtool=no @AMDEPBACKSLASH@
+modules/others_tools/src/c/scilab_cli_bin-mainscic.o: modules/others_tools/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/others_tools/src/c/scilab_cli_bin-mainscic.o -MD -MP -MF modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo -c -o modules/others_tools/src/c/scilab_cli_bin-mainscic.o `test -f 'modules/others_tools/src/c/mainscic.cpp' || echo '$(srcdir)/'`modules/others_tools/src/c/mainscic.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='modules/others_tools/src/c/mainscic.cpp' object='modules/others_tools/src/c/scilab_cli_bin-mainscic.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/console/src/c/others/scilab_cli_bin-mainscic.o `test -f 'modules/console/src/c/others/mainscic.cpp' || echo '$(srcdir)/'`modules/console/src/c/others/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/others_tools/src/c/scilab_cli_bin-mainscic.o `test -f 'modules/others_tools/src/c/mainscic.cpp' || echo '$(srcdir)/'`modules/others_tools/src/c/mainscic.cpp
 
-modules/console/src/c/others/scilab_cli_bin-mainscic.obj: modules/console/src/c/others/mainscic.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(scilab_cli_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT modules/console/src/c/others/scilab_cli_bin-mainscic.obj -MD -MP -MF modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo -c -o modules/console/src/c/others/scilab_cli_bin-mainscic.obj `if test -f 'modules/console/src/c/others/mainscic.cpp'; then $(CYGPATH_W) 'modules/console/src/c/others/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/console/src/c/others/mainscic.cpp'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo modules/console/src/c/others/$(DEPDIR)/scilab_cli_bin-mainscic.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='modules/console/src/c/others/mainscic.cpp' object='modules/console/src/c/others/scilab_cli_bin-mainscic.obj' libtool=no @AMDEPBACKSLASH@
+modules/others_tools/src/c/scilab_cli_bin-mainscic.obj: modules/others_tools/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/others_tools/src/c/scilab_cli_bin-mainscic.obj -MD -MP -MF modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo -c -o modules/others_tools/src/c/scilab_cli_bin-mainscic.obj `if test -f 'modules/others_tools/src/c/mainscic.cpp'; then $(CYGPATH_W) 'modules/others_tools/src/c/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/c/mainscic.cpp'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Tpo modules/others_tools/src/c/$(DEPDIR)/scilab_cli_bin-mainscic.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='modules/others_tools/src/c/mainscic.cpp' object='modules/others_tools/src/c/scilab_cli_bin-mainscic.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/console/src/c/others/scilab_cli_bin-mainscic.obj `if test -f 'modules/console/src/c/others/mainscic.cpp'; then $(CYGPATH_W) 'modules/console/src/c/others/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/console/src/c/others/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/others_tools/src/c/scilab_cli_bin-mainscic.obj `if test -f 'modules/others_tools/src/c/mainscic.cpp'; then $(CYGPATH_W) 'modules/others_tools/src/c/mainscic.cpp'; else $(CYGPATH_W) '$(srcdir)/modules/others_tools/src/c/mainscic.cpp'; fi`
 
 mostlyclean-libtool:
        -rm -f *.lo
@@ -1915,8 +1915,8 @@ 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/console/src/c/others/$(DEPDIR)/$(am__dirstamp)
-       -rm -f modules/console/src/c/others/$(am__dirstamp)
+       -rm -f modules/others_tools/src/c/$(DEPDIR)/$(am__dirstamp)
+       -rm -f modules/others_tools/src/c/$(am__dirstamp)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -1929,7 +1929,7 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
 
 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/console/src/c/others/$(DEPDIR)
+       -rm -rf modules/call_scilab/examples/basicExamples/$(DEPDIR) modules/call_scilab/examples/call_scilab/c/common/$(DEPDIR) modules/others_tools/src/c/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-hdr distclean-libtool distclean-tags
@@ -1978,7 +1978,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/console/src/c/others/$(DEPDIR)
+       -rm -rf modules/call_scilab/examples/basicExamples/$(DEPDIR) modules/call_scilab/examples/call_scilab/c/common/$(DEPDIR) modules/others_tools/src/c/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/scilab/modules/console/src/c/others/mainscic.cpp b/scilab/modules/console/src/c/others/mainscic.cpp
deleted file mode 100644 (file)
index 4a63b15..0000000
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - INRIA - Allan CORNET
- * Copyright (C) 2008 - INRIA - 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
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <unistd.h>             /* isatty */
-#include <stdlib.h>             /* stdin */
-#include <stdio.h>
-extern "C" {
-#include "core_math.h"
-#include "version.h"
-#include "realmain.h"           /* realmain */
-#include "scimem.h"             /* nofpex */
-#include "scilabmode.h"
-#include "getcommandlineargs.h"
-#include "texmacs.h"
-#include "Thread_Wrapper.h"
-#include "core_math.h"
-#include "setgetlanguage.h"
-#include "LaunchScilabSignal.h"
-#include "setenvc.h"
-#include "signal_mgmt.h"
-#include "cliDisplayManagement.h"
-
-#ifdef ENABLE_MPI
-#include "initMPI.h"
-#endif
-
-
-#ifdef __APPLE__
-#include "initMacOSXEnv.h"
-#endif
-
-#if defined(linux) && defined(__i386__)
-#include "setPrecisionFPU.h"
-#endif
-}
-/*--------------------------------------------------------------------------*/
-#define MIN_STACKSIZE 8000000
-/*--------------------------------------------------------------------------*/
-
-/*
- * Private function to check any linker errors
- */
-static void checkForLinkerErrors(void);
-
-/*
- * see http://www.gnu.org/software/autoconf/manual/autoconf.html and
- * search for F77_DUMMY_MAIN
- */
-#ifdef F77_DUMMY_MAIN
-#ifdef __cplusplus
-extern "C"
-#endif
-int F77_DUMMY_MAIN()
-{
-    return 1;
-}
-#endif
-
-int main(int argc, char **argv)
-{
-    int i;
-    int no_startup_flag = 0;
-    int memory = MIN_STACKSIZE;
-
-    char *initial_script = NULL;
-    InitScriptType initial_script_type = SCILAB_SCRIPT;
-
-    /* This bug only occurs under Linux 32 bits
-     * See: http://wiki.scilab.org/Scilab_precision
-     */
-#if defined(linux) && defined(__i386__)
-    setFPUToDouble();
-#endif
-
-#ifdef ENABLE_MPI
-    initScilabMPI();
-#endif
-
-    InitializeLaunchScilabSignal();
-
-/* Management of the signals (seg fault, floating point exception, etc) */
-
-    if (getenv("SCI_DISABLE_EXCEPTION_CATCHING") == NULL)
-    {
-        base_error_init();
-    }
-
-#if defined(netbsd) || defined(freebsd)
-    /* floating point exceptions */
-    fpsetmask(0);
-#endif
-
-#ifdef WITHOUT_GUI
-    setScilabMode(SCILAB_NWNI);
-#else
-    setScilabMode(SCILAB_STD);
-#endif
-
-    /* scanning options */
-    for (i = 1; i < argc; i++)
-    {
-        if (strcmp(argv[i], "-nw") == 0)
-        {
-            setScilabMode(SCILAB_NW);
-        }
-        else if (strcmp(argv[i], "-nwni") == 0 || strcmp(argv[i], "-nogui") == 0)
-        {
-            setScilabMode(SCILAB_NWNI);
-        }
-        else if (strcmp(argv[i], "-display") == 0 || strcmp(argv[i], "-d") == 0)
-        {
-            /* @TODO Buffer overflow here */
-            char dpy[128];
-
-            sprintf(dpy, "DISPLAY=%s", argv[++i]);
-            putenv(dpy);
-        }
-        else if (strcmp(argv[i], "-l") == 0)
-        {
-            char *argLang = strdup(argv[++i]);
-
-            /* Export the locale. This is going to be used by setlanguage("") in
-             * modules/localization/src/c/InitializeLocalization.c */
-            if (strcmp(argLang, "en") == 0)
-            {
-                /* backward compatiblity en => en_US */
-                setenvc("LANG", "en_US");
-            }
-            else
-            {
-                if (strcmp(argLang, "fr") == 0)
-                {
-                    /* backward compatiblity fr => fr_FR */
-                    setenvc("LANG", "fr_FR");
-                }
-                else
-                {
-                    setenvc("LANG", argLang);
-                }
-            }
-
-            free(argLang);
-
-        }
-        else if (strcmp(argv[i], "-ns") == 0)
-        {
-            no_startup_flag = 1;
-        }
-        else if (strcmp(argv[i], "-mem") == 0)
-        {
-            i++;
-            memory = Max(atoi(argv[i]), MIN_STACKSIZE);
-        }
-        else if (strcmp(argv[i], "-f") == 0)
-        {
-            initial_script = argv[++i];
-        }
-        else if (strcmp(argv[i], "-e") == 0)
-        {
-            initial_script = argv[++i];
-            initial_script_type = SCILAB_CODE;
-        }
-        else if (strcmp(argv[i], "--texmacs") == 0)
-        {
-            setScilabMode(SCILAB_NW);
-            settexmacs();
-        }
-        else if (strcmp(argv[i], "-nocolor") == 0)
-        {
-            setCLIColor(FALSE);
-        }
-        else if (strcmp(argv[i], "-version") == 0)
-        {
-            disp_scilab_version();
-            exit(1);
-        }
-    }
-
-    if (!isatty(fileno(stdin)) && getScilabMode() != SCILAB_STD)
-    {
-        /*
-         * if not an interactive terminal
-         * then, we are disabling the banner
-         * Since the banner is disabled in the scilab script checking
-         * with the function sciargs is -nb is present, I add this argument
-         * by hand
-         */
-
-        char **pNewArgv = (char **)malloc((argc + 1) * sizeof(char *));
-
-        for (i = 0; i < argc; i++)
-        {
-            pNewArgv[i] = (char *)malloc((strlen(argv[i]) + 1) * sizeof(char));
-            strcpy(pNewArgv[i], argv[i]);
-        }
-
-#define NB_ARG "-nb"
-        pNewArgv[i] = (char *)malloc((strlen(NB_ARG) + 1) * sizeof(char));
-        strcpy(pNewArgv[i], NB_ARG);
-        i++;
-
-        argv = pNewArgv;
-        argc = argc + 1;
-
-    }
-
-    setCommandLineArgs(argv, argc);
-
-#ifndef WITH_GUI
-    if (getScilabMode() != SCILAB_NWNI)
-    {
-        fprintf(stderr, "Scilab was compiled without its GUI and advanced features. Run scilab-cli or us the -nwni option.\n");
-        exit(1);
-    }
-#endif
-
-    checkForLinkerErrors();
-
-#ifndef __APPLE__
-    return realmain(no_startup_flag, initial_script, initial_script_type, memory);
-#else
-#ifdef WITHOUT_GUI
-    /* Do not use this function when building scilab-bin under Mac OS X
-     * not that this function is however used by scilab-cli-bin under Mac OS X */
-    return realmain(no_startup_flag, initial_script, initial_script_type, memory);
-#else
-    /* The Mac OS X Java/Swing integration doesn't work the same way as Microsoft Windows or GNU/Linux */
-    return initMacOSXEnv(no_startup_flag, initial_script, initial_script_type, memory);
-#endif
-#endif
-}
-
-/*--------------------------------------------------------------------------*/
-extern "C" {
-/* Defined without include to avoid useless header dependency */
-BOOL isItTheDisabledLib(void);
-}
-
-static void checkForLinkerErrors(void)
-{
-    /*
-       Depending on the linking order, sometime, libs are not loaded the right way.
-       This can cause painful debugging tasks for packager or developer, we are
-       doing the check to help them.
-    */
-#define LINKER_ERROR_1 "Scilab startup function detected that the function proposed to the engine is the wrong one. Usually, it comes from a linker problem in your distribution/OS.\n"
-#define LINKER_ERROR_2 "If you do not know what it means, please report a bug on http://bugzilla.scilab.org/. If you do, you probably know that you should change the link order in SCI/modules/Makefile.am\n"
-    if (getScilabMode() != SCILAB_NWNI)
-    {
-        if (isItTheDisabledLib())
-        {
-            fprintf(stderr, LINKER_ERROR_1);
-            fprintf(stderr, "Here, Scilab should have 'libscijvm' defined but gets 'libscijvm-disable' instead.\n");
-            fprintf(stderr, LINKER_ERROR_2);
-            exit(1);
-
-        }
-    }
-    else
-    {
-        /* NWNI mode */
-        if (!isItTheDisabledLib())
-        {
-            fprintf(stderr, LINKER_ERROR_1);
-            fprintf(stderr, "Here, Scilab should have 'libscijvm-disable' defined but gets 'libscijvm' instead.\n");
-            fprintf(stderr, LINKER_ERROR_2);
-            exit(1);
-        }
-    }
-#undef LINKER_ERROR_1
-#undef LINKER_ERROR_2
-}
similarity index 95%
rename from scilab/modules/console/src/c/others/initMPI.c
rename to scilab/modules/others_tools/src/c/initMPI.c
index 88af695..9383e55 100644 (file)
@@ -24,7 +24,7 @@ void MPIErrHandler(MPI_Comm * comm, int *errorcode, ...)
 
     MPI_Error_string(*errorcode, buffer, &resultlen);
     buffer[resultlen] = 0;
-    fprintf(stderr,_("MPI error: %s\n"), buffer);
+    fprintf(stderr, _("MPI error: %s\n"), buffer);
 }
 
 
diff --git a/scilab/modules/others_tools/src/c/mainscic.cpp b/scilab/modules/others_tools/src/c/mainscic.cpp
new file mode 100644 (file)
index 0000000..6a52ea1
--- /dev/null
@@ -0,0 +1,282 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007 - INRIA - Allan CORNET
+ * Copyright (C) 2008 - INRIA - 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
+ *
+ */
+/*--------------------------------------------------------------------------*/
+#include <unistd.h>             /* isatty */
+#include <stdlib.h>             /* stdin */
+#include <stdio.h>
+extern "C" {
+#include "core_math.h"
+#include "version.h"
+#include "realmain.h"           /* realmain */
+#include "scimem.h"             /* nofpex */
+#include "scilabmode.h"
+#include "getcommandlineargs.h"
+#include "texmacs.h"
+#include "Thread_Wrapper.h"
+#include "core_math.h"
+#include "setgetlanguage.h"
+#include "LaunchScilabSignal.h"
+#include "setenvc.h"
+#include "signal_mgmt.h"
+#include "cliDisplayManagement.h"
+
+#ifdef ENABLE_MPI
+#include "initMPI.h"
+#endif
+
+
+#ifdef __APPLE__
+#include "initMacOSXEnv.h"
+#endif
+
+#if defined(linux) && defined(__i386__)
+#include "setPrecisionFPU.h"
+#endif
+}
+/*--------------------------------------------------------------------------*/
+#define MIN_STACKSIZE 8000000
+/*--------------------------------------------------------------------------*/
+
+/*
+ * Private function to check any linker errors
+ */
+static void checkForLinkerErrors(void);
+
+/*
+ * see http://www.gnu.org/software/autoconf/manual/autoconf.html and
+ * search for F77_DUMMY_MAIN
+ */
+#ifdef F77_DUMMY_MAIN
+#ifdef __cplusplus
+extern "C"
+#endif
+int F77_DUMMY_MAIN()
+{
+return 1;
+}
+#endif
+
+int main(int argc, char **argv)
+{
+int i;
+int no_startup_flag = 0;
+int memory = MIN_STACKSIZE;
+
+char *initial_script = NULL;
+InitScriptType initial_script_type = SCILAB_SCRIPT;
+
+/* This bug only occurs under Linux 32 bits
+ * See: http://wiki.scilab.org/Scilab_precision
+ */
+#if defined(linux) && defined(__i386__)
+setFPUToDouble();
+#endif
+
+#ifdef ENABLE_MPI
+initScilabMPI();
+#endif
+
+InitializeLaunchScilabSignal();
+
+/* Management of the signals (seg fault, floating point exception, etc) */
+
+if (getenv("SCI_DISABLE_EXCEPTION_CATCHING") == NULL)
+{
+    base_error_init();
+}
+
+#if defined(netbsd) || defined(freebsd)
+/* floating point exceptions */
+fpsetmask(0);
+#endif
+
+#ifdef WITHOUT_GUI
+setScilabMode(SCILAB_NWNI);
+#else
+setScilabMode(SCILAB_STD);
+#endif
+
+/* scanning options */
+for (i = 1; i < argc; i++)
+{
+    if (strcmp(argv[i], "-nw") == 0)
+    {
+        setScilabMode(SCILAB_NW);
+    }
+    else if (strcmp(argv[i], "-nwni") == 0 || strcmp(argv[i], "-nogui") == 0)
+    {
+        setScilabMode(SCILAB_NWNI);
+    }
+    else if (strcmp(argv[i], "-display") == 0 || strcmp(argv[i], "-d") == 0)
+    {
+        /* @TODO Buffer overflow here */
+        char dpy[128];
+
+        sprintf(dpy, "DISPLAY=%s", argv[++i]);
+        putenv(dpy);
+    }
+    else if (strcmp(argv[i], "-l") == 0)
+    {
+        char *argLang = strdup(argv[++i]);
+
+        /* Export the locale. This is going to be used by setlanguage("") in
+         * modules/localization/src/c/InitializeLocalization.c */
+        if (strcmp(argLang, "en") == 0)
+        {
+            /* backward compatiblity en => en_US */
+            setenvc("LANG", "en_US");
+        }
+        else
+        {
+            if (strcmp(argLang, "fr") == 0)
+            {
+                /* backward compatiblity fr => fr_FR */
+                setenvc("LANG", "fr_FR");
+            }
+            else
+            {
+                setenvc("LANG", argLang);
+            }
+        }
+
+        free(argLang);
+
+    }
+    else if (strcmp(argv[i], "-ns") == 0)
+    {
+        no_startup_flag = 1;
+    }
+    else if (strcmp(argv[i], "-mem") == 0)
+    {
+        i++;
+        memory = Max(atoi(argv[i]), MIN_STACKSIZE);
+    }
+    else if (strcmp(argv[i], "-f") == 0)
+    {
+        initial_script = argv[++i];
+    }
+    else if (strcmp(argv[i], "-e") == 0)
+    {
+        initial_script = argv[++i];
+        initial_script_type = SCILAB_CODE;
+    }
+    else if (strcmp(argv[i], "--texmacs") == 0)
+    {
+        setScilabMode(SCILAB_NW);
+        settexmacs();
+    }
+    else if (strcmp(argv[i], "-nocolor") == 0)
+    {
+        setCLIColor(FALSE);
+    }
+    else if (strcmp(argv[i], "-version") == 0)
+    {
+        disp_scilab_version();
+        exit(1);
+    }
+}
+
+if (!isatty(fileno(stdin)) && getScilabMode() != SCILAB_STD)
+{
+    /*
+     * if not an interactive terminal
+     * then, we are disabling the banner
+     * Since the banner is disabled in the scilab script checking
+     * with the function sciargs is -nb is present, I add this argument
+     * by hand
+     */
+
+    char **pNewArgv = (char **)malloc((argc + 1) * sizeof(char *));
+
+    for (i = 0; i < argc; i++)
+    {
+        pNewArgv[i] = (char *)malloc((strlen(argv[i]) + 1) * sizeof(char));
+        strcpy(pNewArgv[i], argv[i]);
+    }
+
+#define NB_ARG "-nb"
+    pNewArgv[i] = (char *)malloc((strlen(NB_ARG) + 1) * sizeof(char));
+    strcpy(pNewArgv[i], NB_ARG);
+    i++;
+
+    argv = pNewArgv;
+    argc = argc + 1;
+
+}
+
+setCommandLineArgs(argv, argc);
+
+#ifndef WITH_GUI
+if (getScilabMode() != SCILAB_NWNI)
+{
+    fprintf(stderr, "Scilab was compiled without its GUI and advanced features. Run scilab-cli or us the -nwni option.\n");
+    exit(1);
+}
+#endif
+
+checkForLinkerErrors();
+
+#ifndef __APPLE__
+return realmain(no_startup_flag, initial_script, initial_script_type, memory);
+#else
+#ifdef WITHOUT_GUI
+/* Do not use this function when building scilab-bin under Mac OS X
+ * not that this function is however used by scilab-cli-bin under Mac OS X */
+return realmain(no_startup_flag, initial_script, initial_script_type, memory);
+#else
+/* The Mac OS X Java/Swing integration doesn't work the same way as Microsoft Windows or GNU/Linux */
+return initMacOSXEnv(no_startup_flag, initial_script, initial_script_type, memory);
+#endif
+#endif
+}
+
+/*--------------------------------------------------------------------------*/
+extern "C" {
+/* Defined without include to avoid useless header dependency */
+BOOL isItTheDisabledLib(void);
+}
+
+static void checkForLinkerErrors(void)
+{
+/*
+   Depending on the linking order, sometime, libs are not loaded the right way.
+   This can cause painful debugging tasks for packager or developer, we are
+   doing the check to help them.
+*/
+#define LINKER_ERROR_1 "Scilab startup function detected that the function proposed to the engine is the wrong one. Usually, it comes from a linker problem in your distribution/OS.\n"
+#define LINKER_ERROR_2 "If you do not know what it means, please report a bug on http://bugzilla.scilab.org/. If you do, you probably know that you should change the link order in SCI/modules/Makefile.am\n"
+if (getScilabMode() != SCILAB_NWNI)
+{
+    if (isItTheDisabledLib())
+    {
+        fprintf(stderr, LINKER_ERROR_1);
+        fprintf(stderr, "Here, Scilab should have 'libscijvm' defined but gets 'libscijvm-disable' instead.\n");
+        fprintf(stderr, LINKER_ERROR_2);
+        exit(1);
+
+    }
+}
+else
+{
+    /* NWNI mode */
+    if (!isItTheDisabledLib())
+    {
+        fprintf(stderr, LINKER_ERROR_1);
+        fprintf(stderr, "Here, Scilab should have 'libscijvm-disable' defined but gets 'libscijvm' instead.\n");
+        fprintf(stderr, LINKER_ERROR_2);
+        exit(1);
+    }
+}
+#undef LINKER_ERROR_1
+#undef LINKER_ERROR_2
+}