Merge remote branch 'origin/master' into sas 71/2071/1
Bruno JOFRET [Thu, 23 Sep 2010 15:49:14 +0000 (17:49 +0200)]
Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/sci_gateway/c/sci_frexp.c
scilab/modules/javasci/Javasci.vcproj
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/parallel/src/c/parallel.vcproj
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/tests/unit_tests/remez.dia.ref
scilab/modules/signal_processing/tests/unit_tests/remez.tst
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/sci_gateway/c/sci_cdfbet.c
scilab/modules/statistics/sci_gateway/c/sci_cdfbin.c
scilab/modules/statistics/sci_gateway/c/sci_cdfchi.c
scilab/modules/statistics/sci_gateway/c/sci_cdfchn.c
scilab/modules/statistics/sci_gateway/c/sci_cdff.c
scilab/modules/statistics/sci_gateway/c/sci_cdffnc.c
scilab/modules/statistics/sci_gateway/c/sci_cdfgam.c
scilab/modules/statistics/sci_gateway/c/sci_cdfnbn.c
scilab/modules/statistics/sci_gateway/c/sci_cdfnor.c
scilab/modules/statistics/sci_gateway/c/sci_cdfpoi.c
scilab/modules/statistics/sci_gateway/c/sci_cdft.c
scilab/modules/statistics/src/c/CdfBase.c
scilab/modules/statistics/src/c/CdfBase.h
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in

Change-Id: Iffe944b81f4f0c8d96022dd1c774574f219d198b

126 files changed:
1  2 
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/configure.ac
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/core.vcproj
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_frexp.c
scilab/modules/elementary_functions/sci_gateway/c/sci_zeros.c
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcproj
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/c/gui.vcproj
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/javasci/Javasci.vcproj
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/operations/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/src/c/output_stream.vcproj
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/src/c/parallel.vcproj
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/tests/unit_tests/remez.tst
scilab/modules/sound/Makefile.am
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/src/c/CdfBase.c
scilab/modules/statistics/src/c/CdfBase.h
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/src/c/ui_data.vcproj
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/c/xcos.vcproj

Simple merge
Simple merge
@@@ -36753,7 -37076,7 +37076,7 @@@ if test "$enable_stop_on_warning" = yes
     CPPFLAGS="$CPPFLAGS -Werror -O0"
  fi
  
- ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/operations/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
 -ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
++ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/operations/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
  
  
  # Detection of the module for the future version of Scilab 6
Simple merge
  
  # core is the main module of Scilab. All the compilation deps has been removed
  # since it already linked almost the whole world
- SUBDIRS = core
  
- SUBDIRS += \
+ SUBDIRS = \
 +operations \
  output_stream \
  arnoldi \
  elementary_functions \
@@@ -151,20 -154,20 +154,20 @@@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARG
        distdir
  ETAGS = etags
  CTAGS = ctags
- DIST_SUBDIRS = core operations output_stream arnoldi \
-       elementary_functions string api_scilab dynamic_link fileio \
-       history_manager spreadsheet tclsci localization action_binding \
-       renderer shell completion console graphic_export gui jvm \
-       graphics optimization symbolic randlib statistics \
-       special_functions interpolation linear_algebra integer \
-       data_structures mexlib differential_equations cacsd \
-       polynomials boolean double pvm io intersci signal_processing \
-       call_scilab sound time sparse windows_tools functions \
-       overloading maple2scilab m2sci texmacs development_tools \
-       compatibility_functions helptools fftw umfpack demo_tools \
-       genetic_algorithms simulated_annealing parameters matio atoms \
-       types hdf5 graph xcos scinotes parallel modules_manager \
-       ui_data history_browser scicos_blocks scicos . javasci
 -DIST_SUBDIRS = output_stream arnoldi elementary_functions string \
 -      api_scilab dynamic_link fileio history_manager spreadsheet \
 -      tclsci localization commons jvm action_binding renderer shell \
 -      completion console graphic_export gui graphics optimization \
 -      symbolic randlib statistics special_functions interpolation \
 -      linear_algebra integer data_structures mexlib \
++DIST_SUBDIRS = operations output_stream arnoldi elementary_functions \
++      string api_scilab dynamic_link fileio history_manager \
++      spreadsheet tclsci localization commons jvm action_binding \
++      renderer shell completion console graphic_export gui graphics \
++      optimization symbolic randlib statistics special_functions \
++      interpolation linear_algebra integer data_structures mexlib \
+       differential_equations cacsd polynomials boolean double pvm io \
+       intersci signal_processing core call_scilab sound time sparse \
+       windows_tools functions overloading maple2scilab m2sci texmacs \
+       development_tools compatibility_functions helptools fftw \
+       umfpack demo_tools genetic_algorithms simulated_annealing \
+       parameters matio atoms types hdf5 graph xcos scinotes parallel \
+       modules_manager ui_data history_browser scicos_blocks scicos . \
+       javasci
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
@@@ -435,15 -438,12 +438,12 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- # core is the main module of Scilab. All the compilation deps has been removed
- # since it already linked almost the whole world
- SUBDIRS = core operations output_stream arnoldi elementary_functions \
-       string api_scilab dynamic_link fileio history_manager \
-       spreadsheet tclsci localization action_binding renderer shell \
-       completion console graphic_export gui jvm graphics \
-       optimization symbolic randlib statistics special_functions \
-       interpolation linear_algebra integer data_structures mexlib \
 -SUBDIRS = output_stream arnoldi elementary_functions string api_scilab \
 -      dynamic_link fileio history_manager spreadsheet tclsci \
 -      localization commons jvm action_binding renderer shell \
++SUBDIRS = operations output_stream arnoldi elementary_functions string \
++      api_scilab dynamic_link fileio history_manager spreadsheet \
++      tclsci localization commons jvm action_binding renderer shell \
+       completion console graphic_export gui graphics optimization \
+       symbolic randlib statistics special_functions interpolation \
+       linear_algebra integer data_structures mexlib \
        differential_equations cacsd polynomials boolean double pvm io \
        intersci signal_processing core call_scilab interpolation \
        sound time randlib sparse windows_tools functions overloading \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -221,7 -219,7 +221,7 @@@ INCLUDE_FLAGS = $(libscicacsd_la_CFLAGS
  
  
  # cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la
- libscicacsd_la_LIBADD =  $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscicacsd_la_LIBADD =  $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscicacsd_la_LIBADD =  $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  
  #### Target ######
@@@ -703,7 -700,7 +702,7 @@@ CHECK_SRC = $(GATEWAY_C_SOURCES
  INCLUDE_FLAGS = $(libscicacsd_la_CFLAGS)
  
  # cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la
- libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename = cacsd
@@@ -59,7 -57,7 +59,7 @@@ INCLUDE_FLAGS = $(libscicompletion_la_C
  
  ## Libraries necessary
  ## Change to include other Scilab modules/lib
- libscicompletion_la_LIBADD =  $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscicompletion_la_LIBADD =  $(top_builddir)/modules/fileio/libscifileio.la  $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscicompletion_la_LIBADD =  $(top_builddir)/modules/fileio/libscifileio.la  $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  #$(top_builddir)/modules/graphics/libscigraphics.la
  #### Name of the module and the path ######
  modulename=completion
@@@ -467,7 -465,7 +466,7 @@@ libscicompletion_la_SOURCES = $(COMPLET
  # For the code check (splint)
  CHECK_SRC = $(COMPLETION_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscicompletion_la_CFLAGS)
- libscicompletion_la_LIBADD = $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscicompletion_la_LIBADD = $(top_builddir)/modules/fileio/libscifileio.la  $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscicompletion_la_LIBADD = $(top_builddir)/modules/fileio/libscifileio.la  $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  #$(top_builddir)/modules/graphics/libscigraphics.la
  #### Name of the module and the path ######
  modulename = completion
Simple merge
Simple merge
Simple merge
@@@ -2,7 -2,7 +2,7 @@@
  # Copyright (C) 2006 - INRIA - Sylvestre LEDRU
  #
  # This file is distributed under the same license as the Scilab package.
-- 
++
  
  DATA_STRUCTURES_C_SOURCES = src/c/stcreate.c \
  src/c/hmops.c
@@@ -62,8 -61,8 +62,8 @@@ libscidata_structures_la_SOURCES = $(DA
  CHECK_SRC= $(DATA_STRUCTURES_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscidata_structures_la_CFLAGS)
  
 -# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la 
 +# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la
- libscidata_structures_la_LIBADD =  libdummy-data_structures.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+ libscidata_structures_la_LIBADD =  libdummy-data_structures.la  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  
  libdummy_data_structures_la-intl_e.lo: src/fortran/intl_e.f
@@@ -484,8 -482,8 +483,8 @@@ libscidata_structures_la_SOURCES = $(DA
  CHECK_SRC = $(DATA_STRUCTURES_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscidata_structures_la_CFLAGS)
  
 -# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la 
 +# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la
- libscidata_structures_la_LIBADD = libdummy-data_structures.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+ libscidata_structures_la_LIBADD = libdummy-data_structures.la  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename = data_structures
@@@ -148,7 -143,7 +148,7 @@@ libscidifferential_equations_la_SOURCE
  CHECK_SRC= $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscidifferential_equations_la_CFLAGS)
  
- libscidifferential_equations_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscidifferential_equations_la_LIBADD =   $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscidifferential_equations_la_LIBADD =   $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  
  #### Target ######
@@@ -575,7 -572,7 +573,7 @@@ libscidifferential_equations_la_SOURCE
  # For the code check (splint)
  CHECK_SRC = $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscidifferential_equations_la_CFLAGS)
- libscidifferential_equations_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscidifferential_equations_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscidifferential_equations_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename = differential_equations
@@@ -3,10 -3,6 +3,10 @@@
  #
  # This file is distributed under the same license as the Scilab package.
  
 +DOUBLE_C_SOURCES =    src/c/matmult.c \
 +                      src/c/matldiv.c \
-                       src/c/matrdiv.c 
++                      src/c/matrdiv.c
 +
  GATEWAY_C_SOURCES = sci_gateway/c/gw_double.c
  
  GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/vecldiv.f \
@@@ -45,7 -40,8 +45,7 @@@ libscidouble_la_SOURCES = $(DOUBLE_C_SO
  CHECK_SRC= $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscidouble_la_CFLAGS)
  
- libscidouble_la_LIBADD =  $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/operations/libscioperations.la
 -libscidouble_la_LIBADD =  $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la 
 -
++libscidouble_la_LIBADD =  $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/operations/libscioperations.la
  
  #### Target ######
  modulename=double
@@@ -115,18 -115,13 +115,17 @@@ libscidouble_la_DEPENDENCIES =  
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
        $(top_builddir)/modules/polynomials/libscipolynomials.la \
        $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
-       $(top_builddir)/modules/core/libscicore.la \
 -      $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -am__objects_1 = libscidouble_la-gw_double.lo
 -am__objects_2 = vecldiv.lo vecmul.lo matxpow.lo vecimpl.lo matldiv.lo \
 +      $(top_builddir)/modules/output_stream/libscioutput_stream.la \
 +      $(top_builddir)/modules/operations/libscioperations.la
 +am__objects_1 = libscidouble_la-matmult.lo libscidouble_la-matldiv.lo \
 +      libscidouble_la-matrdiv.lo
 +am__objects_2 = libscidouble_la-gw_double.lo
 +am__objects_3 = vecldiv.lo vecmul.lo matxpow.lo vecimpl.lo matldiv.lo \
        matsubst.lo vecrdiv.lo matchsgn.lo matrdiv.lo matrc.lo \
 -      matpow.lo matins1.lo matins2.lo matcmp.lo matmult.lo \
 -      matext1.lo matext2.lo mattr.lo matcc.lo mattrc.lo matadd.lo
 -am_libscidouble_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 +      matpow.lo matins1.lo matins2.lo matcmp.lo matext1.lo \
 +      matext2.lo mattr.lo matcc.lo mattrc.lo matadd.lo
 +am_libscidouble_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
 +      $(am__objects_3)
  libscidouble_la_OBJECTS = $(am_libscidouble_la_OBJECTS)
  libscidouble_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
@@@ -401,10 -396,6 +400,10 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 +DOUBLE_C_SOURCES = src/c/matmult.c \
 +                      src/c/matldiv.c \
-                       src/c/matrdiv.c 
++                      src/c/matrdiv.c
 +
  GATEWAY_C_SOURCES = sci_gateway/c/gw_double.c
  GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/vecldiv.f \
  sci_gateway/fortran/vecmul.f \
@@@ -439,7 -429,7 +438,7 @@@ libscidouble_la_SOURCES = $(DOUBLE_C_SO
  # For the code check (splint)
  CHECK_SRC = $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscidouble_la_CFLAGS)
- libscidouble_la_LIBADD = $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/operations/libscioperations.la
 -libscidouble_la_LIBADD = $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscidouble_la_LIBADD = $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/operations/libscioperations.la
  
  #### Target ######
  modulename = double
@@@ -43,7 -42,7 +43,7 @@@ libscidynamic_link_la_SOURCES = $(DYNAM
  CHECK_SRC=  $(DYNAMIC_LINK_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscidynamic_link_la_CFLAGS)
  
- # cyclic $(top_builddir)/modules/core/libscicore.la
 -# cyclic  
++# cyclic
  libscidynamic_link_la_LIBADD =  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  #### Target ######
  modulename=dynamic_link
@@@ -451,7 -450,7 +451,7 @@@ libscidynamic_link_la_SOURCES = $(DYNAM
  CHECK_SRC = $(DYNAMIC_LINK_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscidynamic_link_la_CFLAGS)
  
- # cyclic $(top_builddir)/modules/core/libscicore.la
 -# cyclic  
++# cyclic
  libscidynamic_link_la_LIBADD = $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  #### Target ######
  modulename = dynamic_link
@@@ -37,6 -37,7 +37,7 @@@ static gw_generic_table Tab[] 
        {sci_kron, "kron"},
        {sci_kron, "kron"},
        {sci_kron, "kron"},
 -      {sci_scimatrix, "matrix"},      
++      {sci_kron, "kron"},
        {sci_sin, "sin"},
        {sci_cos, "cos"},
        {sci_atan, "atan"},
        {sci_spones, "spones"},
        {sci_gsort, "gsort"},
        {sci_isequalbitwise, "isequalbitwise"},
-     {sci_scimatrix, "matrix"},        
++    {sci_scimatrix, "matrix"},
      {sci_rat, "rat"},
      {sci_maxi, "maxi"},
      {sci_maxi, "mini"}
  };
  /*--------------------------------------------------------------------------*/
  int gw_elementary_functions(void)
--{  
++{
        callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
        return 0;
  }
@@@ -1,7 -1,8 +1,7 @@@
  /*
   * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-- * Copyright (C) 2006 - INRIA - Allan CORNET
+  * Copyright (C) 2010 - DIGITEO - Allan CORNET
 - * 
 + *
   * 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
  /*--------------------------------------------------------------------------*/
  int sci_frexp(char *fname,unsigned long fname_len)
  {
 -      static int id[6];
 -    SciErr sciErr;
 -    int *piAddressVarOne = NULL;
 +      SciErr sciErr;
 +      int i;
 +      int iRows                                       = 0;
 +      int iCols                                       = 0;
 +      int iType                                       = 0;
  
 -    CheckRhs(1, 1);
 -    CheckLhs(2, 2);
  
 -    sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
 -    if(sciErr.iErr)
 -    {
 -        printError(&sciErr, 0);
 -        return 0;
 -    }
 +      int* piAddr                             = NULL;
 +
 +
 +      double *pdblReal        = NULL;
 +      double *pdblCoef        = NULL;
 +      double *pdblExp         = NULL;
  
 -    if ( isVarComplex(pvApiCtx, piAddressVarOne) )
 -    {
 -        Scierror(999,_("%s: Wrong type for input argument #%d: Real matrix expected.\n"), fname, 1);
 +      CheckRhs(1,1);
 +      CheckLhs(2,2);
 +
 +      sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
 +      if(sciErr.iErr)
 +      {
 +              printError(&sciErr, 0);
 +              return 0;
 +      }
 +
 +      sciErr = getVarType(pvApiCtx, piAddr, &iType);
 +      if(sciErr.iErr)
 +      {
 +              printError(&sciErr, 0);
 +              return 0;
 +      }
 +
 +      if(iType != sci_matrix)
 +      {
 +              OverLoad(1);
 +              return 0;
 +      }
 +
 +      if(isVarComplex(pvApiCtx, piAddr))
 +      {
-               SciError(9999);
-               sciprint(_("%s: real data only.\n"), fname);
++              Scierror(999,_("%s: Wrong type for input argument #%d: Real matrix expected.\n"), fname, 1);
+         return 0;
 -    }
 +      }
 +
 +      sciErr = getMatrixOfDouble(pvApiCtx, piAddr, &iRows, &iCols, &pdblReal);
 +      if(sciErr.iErr)
 +      {
 +              printError(&sciErr, 0);
 +              return 0;
 +      }
 +
 +      sciErr = allocMatrixOfDouble(pvApiCtx, Rhs + 1, iRows, iCols, &pdblCoef);
 +      if(sciErr.iErr)
 +      {
 +              printError(&sciErr, 0);
 +              return 0;
 +      }
 +
 +      sciErr = allocMatrixOfDouble(pvApiCtx, Rhs + 2, iRows, iCols, &pdblExp);
 +      if(sciErr.iErr)
 +      {
 +              printError(&sciErr, 0);
 +              return 0;
 +      }
 +
 +      for(i = 0 ; i < iRows * iCols; i++)
 +      {
 +              pdblCoef[i] = dfrexps(pdblReal[i], &pdblExp[i]);
 +      }
  
 -      C2F(intfrexp)(id);
 +      LhsVar(1) = Rhs + 1;
 +      LhsVar(2) = Rhs + 2;
 +      PutLhsVar();
        return 0;
  }
  /*--------------------------------------------------------------------------*/
@@@ -1,77 -1,23 +1,85 @@@
  /*
   * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
   * Copyright (C) 2006 - INRIA - Allan CORNET
-- * 
++ *
   * 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    
++ * are also available at
   * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
   *
   */
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  #include "gw_elementary_functions.h"
 +#include "stack-c.h"
 +#include "basic_functions.h"
 +
 +#define _NEW_TONIO_
  /*--------------------------------------------------------------------------*/
 -extern int C2F(intzeros)(int *id);
 +extern int C2F(intzeros) (int *id);
  /*--------------------------------------------------------------------------*/
  int sci_zeros(char *fname,unsigned long fname_len)
  {
        static int id[6];
 +#ifdef _NEW_TONIO_
 +      int iIndex                              = 0;
 +      int iRows                               = 0;
 +      int iCols                               = 0;
 +      double *pReturnRealData = 0;
 +
-       CheckLhs(1,1);
++    CheckLhs(1,1);
 +
 +      if(Rhs > 2)
 +      {
-               //trouver un moyen d'appeller %hm_zeros :(
++              int iStart      = 1;
++              int iRhs                = Rhs;
++              int iLhs                = Lhs;
++
++              SciString(&iStart,"%hm_zeros", &iLhs, &iRhs);
++
++              LhsVar(1) = 1;
++              PutLhsVar();
++              return 0;
 +      }
 +      else if(Rhs <= 0)
 +      {
 +              Rhs = 0;
 +              iRows = 1;
 +              iCols = 1;
 +      }
 +      else if(Rhs == 1)
 +      {
 +              if(GetType(1) > 10)
 +              {
 +                      OverLoad(1);
 +                      return 0;
 +              }
 +              GetVarDimension(1, &iRows, &iCols);
 +              CheckVarUsed(1);
 +      }
 +      else if(Rhs == 2)
 +      {
 +              GetDimFromVar(1, 2, &iRows);
 +              GetDimFromVar(2, 1, &iCols);
 +      }
 +
 +      if(iCols == 0)
 +              iRows = 0;
 +      if(iRows == 0)
 +              iCols = 0;
 +
 +      iAllocMatrixOfDouble(Rhs + 1, iRows, iCols, &pReturnRealData);
 +      //pReturnRealData = (double*)malloc(iRows * iCols * sizeof(double));
 +      if(iRows != 0)
 +              vDset(iRows * iCols, 0, pReturnRealData, 1);
 +
 +      //CreateVarFromPtr(Rhs + 1, MATRIX_OF_DOUBLE_DATATYPE, &iRows, &iCols, &pReturnRealData);
 +      LhsVar(1) = Rhs + 1;
 +      PutLhsVar();
 +      //free(pReturnRealData);
 +#else
        C2F(intzeros)(id);
 +#endif
        return 0;
  }
  /*--------------------------------------------------------------------------*/
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -42,7 -45,7 +45,7 @@@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;../operations/includes"
 -                              AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c"
++                              AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;../operations/includes"
                                PreprocessorDefinitions="_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;../operations/includes"
 -                              AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c"
++                              AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;../operations/includes"
                                PreprocessorDefinitions="_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;../operations/includes"
 -                              AdditionalOptions=""
 -                              AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c"
++                              AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;../operations/includes"
                                PreprocessorDefinitions="NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="0"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;../operations/includes"
 -                              AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c"
++                              AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;../operations/includes"
                                PreprocessorDefinitions="NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="0"
@@@ -2,7 -2,7 +2,7 @@@
  # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  # Copyright (C) INRIA   - 2006 - Sylvestre Ledru
  # Copyright (C) DIGITEO - 2009 - Pierre MARECHAL
--# 
++#
  # 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
@@@ -65,6 -72,23 +73,24 @@@ libjavasci_la_LIBADD = 
        $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
        $(top_builddir)/modules/libscilab.la
  
+ libjavasci2_la_CFLAGS = -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/c/ \
+                       $(JAVA_JNI_INCLUDE) \
+                       $(TCL_INC_PATH) \
+                       $(TK_INC_PATH) \
+                       -I$(top_srcdir)/libs/doublylinkedlist/includes \
+                       -I$(top_srcdir)/modules/tclsci/includes \
+                       -I$(top_srcdir)/modules/call_scilab/includes \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
+                       -I$(top_srcdir)/modules/fileio/includes \
 -                      -I$(top_srcdir)/modules/output_stream/includes
++                      -I$(top_srcdir)/modules/output_stream/includes \
++                      -I$(top_srcdir)/modules/operations/includes
+ libjavasci2_la_LIBADD = \
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+       $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
+       $(top_builddir)/modules/libscilab.la
  ### javasci :  images ###
  libsciscipad_la_imagesdir = $(mydatadir)/help/images/
  libsciscipad_la_images_DATA = help/images/ScilabClass.gif \
@@@ -19,7 -19,7 +19,7 @@@
  # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  # Copyright (C) INRIA   - 2006 - Sylvestre Ledru
  # Copyright (C) DIGITEO - 2009 - Pierre MARECHAL
--# 
++#
  # 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
@@@ -459,6 -480,23 +481,24 @@@ libjavasci_la_etc_DATA = etc/javasci.qu
  @JAVASCI_TRUE@        $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
  @JAVASCI_TRUE@        $(top_builddir)/modules/libscilab.la
  
+ @JAVASCI_TRUE@libjavasci2_la_CFLAGS = -I$(srcdir)/includes/ \
+ @JAVASCI_TRUE@                        -I$(srcdir)/src/c/ \
+ @JAVASCI_TRUE@                        $(JAVA_JNI_INCLUDE) \
+ @JAVASCI_TRUE@                        $(TCL_INC_PATH) \
+ @JAVASCI_TRUE@                        $(TK_INC_PATH) \
+ @JAVASCI_TRUE@                        -I$(top_srcdir)/libs/doublylinkedlist/includes \
+ @JAVASCI_TRUE@                        -I$(top_srcdir)/modules/tclsci/includes \
+ @JAVASCI_TRUE@                        -I$(top_srcdir)/modules/call_scilab/includes \
+ @JAVASCI_TRUE@                        -I$(top_srcdir)/modules/api_scilab/includes \
+ @JAVASCI_TRUE@                        -I$(top_srcdir)/modules/fileio/includes \
 -@JAVASCI_TRUE@                        -I$(top_srcdir)/modules/output_stream/includes
++@JAVASCI_TRUE@                        -I$(top_srcdir)/modules/output_stream/includes \
++@JAVASCI_TRUE@                        -I$(top_srcdir)/modules/operations/includes
+ @JAVASCI_TRUE@libjavasci2_la_LIBADD = \
+ @JAVASCI_TRUE@        $(top_builddir)/libs/MALLOC/libscimalloc.la \
+ @JAVASCI_TRUE@        $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
+ @JAVASCI_TRUE@        $(top_builddir)/modules/libscilab.la
  
  ### javasci :  images ###
  @JAVASCI_TRUE@libsciscipad_la_imagesdir = $(mydatadir)/help/images/
Simple merge
Simple merge
@@@ -119,7 -105,7 +119,7 @@@ libscilinear_algebra_la_SOURCES = $(LIN
  CHECK_SRC= $(LINEAR_ALGEBRA_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscilinear_algebra_la_CFLAGS)
  
- libscilinear_algebra_la_LIBADD =  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscilinear_algebra_la_LIBADD =  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscilinear_algebra_la_LIBADD =  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename=linear_algebra
@@@ -554,7 -530,7 +553,7 @@@ libscilinear_algebra_la_SOURCES = $(LIN
  # For the code check (splint)
  CHECK_SRC = $(LINEAR_ALGEBRA_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscilinear_algebra_la_CFLAGS)
- libscilinear_algebra_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscilinear_algebra_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscilinear_algebra_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename = linear_algebra
Simple merge
Simple merge
@@@ -403,11 -403,10 +403,11 @@@ src/c/sci_gateway.
  
  MEXLIB_FLAGS = -I$(srcdir)/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes/ \
 -      -I$(top_srcdir)/modules/elementary_functions/includes/ \
        -I$(top_srcdir)/modules/call_scilab/includes/ \
 +      -I$(top_srcdir)/modules/elementary_functions/includes/ \
 +      -I$(top_srcdir)/modules/operations/includes/ \
        -I$(top_srcdir)/modules/string/includes
- MEXLIB_DEP = $(top_builddir)/modules/core/libscicore.la \
+ MEXLIB_DEP = \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/data_structures/libscidata_structures.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
index d5759d7,0000000..2a7e06d
mode 100644,000000..100644
--- /dev/null
@@@ -1,1032 -1,0 +1,1034 @@@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +@SET_MAKE@
 +
 +##########
 +### Antoine ELIAS <antoine.elias@scilab.org>
 +### INRIA - Scilab 2008
 +##########
 +
 +# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 +# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
 +# Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
 +#
 +# This file must be used under the terms of the CeCILL.
 +# This source file is licensed as described in the file COPYING, which
 +# you should have received as part of this distribution.  The terms
 +# are also available at
 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 +#
 +
 +##########
 +### Makefile included stuff
 +### Target, variable, suffixes which are supposed to be usefull in every makefile.am
 +##########
 +
 +VPATH = @srcdir@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 +      $(top_srcdir)/Makefile.incl.am
 +@NEED_JAVA_TRUE@am__append_1 = java
 +
 +# With --enable-compilation-tests, launch java unitary tests
 +@COMPILATION_TESTS_TRUE@am__append_2 = test
 +subdir = modules/operations
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
 +      $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
 +      $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
 +      $(top_srcdir)/m4/intel_compiler.m4 \
 +      $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
 +      $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
 +      $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
 +      $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 +      $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
 +      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 +      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 +      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 +      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 +      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +      $(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 +CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 +am__nobase_strip = \
 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 +am__nobase_list = $(am__nobase_strip_setup); \
 +  for p in $$list; do echo "$$p $$p"; done | \
 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
 +    if (++n[$$2] == $(am__install_max)) \
 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
 +    END { for (dir in files) print dir, files[dir] }'
 +am__base_list = \
 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 +am__installdirs = "$(DESTDIR)$(pkglibdir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libscioperations_la_DEPENDENCIES =
 +am__objects_1 = libscioperations_la-doublecomplex.lo \
 +      libscioperations_la-matrix_multiplication.lo \
 +      libscioperations_la-matrix_addition.lo \
 +      libscioperations_la-matrix_substraction.lo \
 +      libscioperations_la-matrix_division.lo \
 +      libscioperations_la-matrix_power.lo \
 +      libscioperations_la-matrix_finite.lo
 +am_libscioperations_la_OBJECTS = $(am__objects_1)
 +libscioperations_la_OBJECTS = $(am_libscioperations_la_OBJECTS)
 +libscioperations_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 +      $(libscioperations_la_CFLAGS) $(CFLAGS) \
 +      $(libscioperations_la_LDFLAGS) $(LDFLAGS) -o $@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +am__mv = mv -f
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +      $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 +CCLD = $(CC)
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +SOURCES = $(libscioperations_la_SOURCES)
 +DIST_SOURCES = $(libscioperations_la_SOURCES)
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALL_LINGUAS = @ALL_LINGUAS@
 +AMTAR = @AMTAR@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +BSH = @BSH@
 +CC = @CC@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
 +F77 = @F77@
 +FFLAGS = @FFLAGS@
 +FFTW3_LIB = @FFTW3_LIB@
 +FFTW_ENABLE = @FFTW_ENABLE@
 +FGREP = @FGREP@
 +FLEXDOCK = @FLEXDOCK@
 +FLIBS = @FLIBS@
 +FOP = @FOP@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN_RT = @GLUEGEN_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +HDF5_ENABLE = @HDF5_ENABLE@
 +HDF5_LIBS = @HDF5_LIBS@
 +HELP_ENABLE = @HELP_ENABLE@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +INTLLIBS = @INTLLIBS@
 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 +JAR = @JAR@
 +JAVA = @JAVA@
 +JAVAC = @JAVAC@
 +JAVAH = @JAVAH@
 +JAVASCI_ENABLE = @JAVASCI_ENABLE@
 +JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
 +JAVA_ENABLE = @JAVA_ENABLE@
 +JAVA_G = @JAVA_G@
 +JAVA_HOME = @JAVA_HOME@
 +JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
 +JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JHDF5 = @JHDF5@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL = @JOGL@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT = @JUNIT@
 +LAPACK_LIBS = @LAPACK_LIBS@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOOKS = @LOOKS@
 +LTLIBICONV = @LTLIBICONV@
 +LTLIBINTL = @LTLIBINTL@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MSGCAT = @MSGCAT@
 +MSGFMT = @MSGFMT@
 +MSGFMT_015 = @MSGFMT_015@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OCAMLC = @OCAMLC@
 +OCAMLDEP = @OCAMLDEP@
 +OCAMLLEX = @OCAMLLEX@
 +OCAMLOPT = @OCAMLOPT@
 +OCAMLYACC = @OCAMLYACC@
 +OPENMP_CFLAGS = @OPENMP_CFLAGS@
 +OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 +OPENMP_ENABLE = @OPENMP_ENABLE@
 +OPENMP_LIBS = @OPENMP_LIBS@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PCRE_CFLAGS = @PCRE_CFLAGS@
 +PCRE_CONFIG = @PCRE_CONFIG@
 +PCRE_LIBS = @PCRE_LIBS@
 +PCRE_VERSION = @PCRE_VERSION@
 +PKG_CONFIG = @PKG_CONFIG@
 +POSUB = @POSUB@
 +POW_LIB = @POW_LIB@
 +PVMGETARCH = @PVMGETARCH@
 +PVM_ARCH = @PVM_ARCH@
 +PVM_ENABLE = @PVM_ENABLE@
 +PVM_INCLUDE = @PVM_INCLUDE@
 +PVM_LIB = @PVM_LIB@
 +PYTHON = @PYTHON@
 +QDOX = @QDOX@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
 +SCICOS_ENABLE = @SCICOS_ENABLE@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SET_RELOCATABLE = @SET_RELOCATABLE@
 +SHELL = @SHELL@
 +SKINLF = @SKINLF@
 +SPLINT = @SPLINT@
 +STRIP = @STRIP@
 +SWIG_BIN = @SWIG_BIN@
 +SWIG_JAVA = @SWIG_JAVA@
 +SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TESTNG = @TESTNG@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_ENABLE = @UMFPACK_ENABLE@
 +UMFPACK_LIB = @UMFPACK_LIB@
 +USE_NLS = @USE_NLS@
 +VERSION = @VERSION@
 +WITH_OCAML = @WITH_OCAML@
 +WITH_TKSCI = @WITH_TKSCI@
 +XGETTEXT = @XGETTEXT@
 +XGETTEXT_015 = @XGETTEXT_015@
 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 +XMKMF = @XMKMF@
 +XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
 +XML_APIS_EXT = @XML_APIS_EXT@
 +XML_CONFIG = @XML_CONFIG@
 +XML_FLAGS = @XML_FLAGS@
 +XML_LIBS = @XML_LIBS@
 +XML_VERSION = @XML_VERSION@
 +X_CFLAGS = @X_CFLAGS@
 +X_EXTRA_LIBS = @X_EXTRA_LIBS@
 +X_LIBS = @X_LIBS@
 +X_PRE_LIBS = @X_PRE_LIBS@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +OPERATIONS_C_SOURCES = src/c/doublecomplex.c \
 +                      src/c/matrix_multiplication.c \
 +                      src/c/matrix_addition.c \
 +                      src/c/matrix_substraction.c \
 +                      src/c/matrix_division.c \
 +                      src/c/matrix_power.c \
 +                      src/c/matrix_finite.c
 +
 +pkglib_LTLIBRARIES = libscioperations.la
 +libscioperations_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 +libscioperations_la_CFLAGS = -I$(top_srcdir)/modules/operations/includes \
 +                              -I$(top_srcdir)/modules/elementary_functions/includes \
 +                              -I$(top_srcdir)/modules/output_stream/includes
 +
 +libscioperations_la_CXXFLAGS = -I$(top_srcdir)/modules/operations/includes \
 +                                              -I$(top_srcdir)/modules/types/includes \
 +                                              -I$(top_srcdir)/modules/core/includes
 +
 +libscioperations_la_SOURCES = $(OPERATIONS_C_SOURCES)
 +libscioperations_la_LIBADD = 
 +
 +#### Target ######
 +modulename = operations
 +
 +# Where all the Scilab stuff is installed (macros, help, ...)
 +mydatadir = $(pkgdatadir)/modules/$(modulename)
 +
 +# splint options
 +SPLINT_OPTIONS = -weak -booltype BOOL
 +
 +########################### JAVA ######################################
 +#### We are delegating java compilation to ant... Thanks to that
 +#### the procedure will be the same with Microsoft Windows (C)
 +#### and Linux/Unix
 +#######################################################################
 +TARGETS_ALL = $(am__append_1) $(am__append_2)
 +
 +################ MACROS ######################
 +# Rule to build a macro
 +# NOT USED  AT THE MOMENT
 +SUFFIXES = .sci 
 +
 +########### INSTALL DOCUMENTATION ###################
 +
 +# Install documentation files into the right target
 +# We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because
 +# automake needs the html files to be present which is not the case when
 +# we are building Scilab
 +
 +# Where it should be installed
 +pkgdocdir = $(mydatadir)
 +
 +# What is the mask of the help source
 +DOCMASKXML = *.xml
 +
 +# What is the mask of the MathML sources
 +DOCMASKMML = *.mml
 +
 +########### INSTALL DATA ###################
 +# Install macros, help & demos
 +# Where it should be installed
 +pkgmacrosdir = $(mydatadir)
 +# Which directory we process
 +MACRODIRS = macros/
 +# Mask of the Scilab sources macros
 +MACROMASK = *.sci
 +# Mask of the Scilab executable sources macros
 +MACROBUILDMASK = *.sce
 +# Mask of the Scilab compiled macros
 +MACROBINMASK = *.bin
 +# List of the standard directory for tests
 +TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
 +# Where the demos should be installed
 +pkgdemosdir = $(mydatadir)
 +# List of the standard directory for demos
 +DEMOS_DIR = demos
 +# List of the standard directory for examples
 +EXAMPLES_DIR = examples
 +# Where to export JAVA archives (.jar)
 +JARDIR = jar/
 +# JAR files mask
 +JARMASK = *.jar
 +# Chapter file 
 +HELP_CHAPTERDIR = help/
 +HELP_CHAPTERFILE = addchapter.sce
 +HELP_CHAPTERLANG = en_US fr_FR pt_BR
 +all: all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .sci .bin .c .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
 +      @for dep in $?; do \
 +        case '$(am__configure_deps)' in \
 +          *$$dep*) \
 +            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 +              && { if test -f $@; then exit 0; else break; fi; }; \
 +            exit 1;; \
 +        esac; \
 +      done; \
 +      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/operations/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/operations/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +      @case '$?' in \
 +        *config.status*) \
 +          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +        *) \
 +          echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +          cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +      esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
 +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 +        dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +        test "$$dir" != "$$p" || dir=.; \
 +        echo "rm -f \"$${dir}/so_locations\""; \
 +        rm -f "$${dir}/so_locations"; \
 +      done
 +libscioperations.la: $(libscioperations_la_OBJECTS) $(libscioperations_la_DEPENDENCIES) 
 +      $(libscioperations_la_LINK) -rpath $(pkglibdir) $(libscioperations_la_OBJECTS) $(libscioperations_la_LIBADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioperations_la-doublecomplex.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioperations_la-matrix_addition.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioperations_la-matrix_division.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioperations_la-matrix_finite.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioperations_la-matrix_multiplication.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioperations_la-matrix_power.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioperations_la-matrix_substraction.Plo@am__quote@
 +
 +.c.o:
 +@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(COMPILE) -c $<
 +
 +.c.obj:
 +@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
 +
 +.c.lo:
 +@am__fastdepCC_TRUE@  $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
 +
 +libscioperations_la-doublecomplex.lo: src/c/doublecomplex.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -MT libscioperations_la-doublecomplex.lo -MD -MP -MF $(DEPDIR)/libscioperations_la-doublecomplex.Tpo -c -o libscioperations_la-doublecomplex.lo `test -f 'src/c/doublecomplex.c' || echo '$(srcdir)/'`src/c/doublecomplex.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscioperations_la-doublecomplex.Tpo $(DEPDIR)/libscioperations_la-doublecomplex.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/doublecomplex.c' object='libscioperations_la-doublecomplex.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -c -o libscioperations_la-doublecomplex.lo `test -f 'src/c/doublecomplex.c' || echo '$(srcdir)/'`src/c/doublecomplex.c
 +
 +libscioperations_la-matrix_multiplication.lo: src/c/matrix_multiplication.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -MT libscioperations_la-matrix_multiplication.lo -MD -MP -MF $(DEPDIR)/libscioperations_la-matrix_multiplication.Tpo -c -o libscioperations_la-matrix_multiplication.lo `test -f 'src/c/matrix_multiplication.c' || echo '$(srcdir)/'`src/c/matrix_multiplication.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscioperations_la-matrix_multiplication.Tpo $(DEPDIR)/libscioperations_la-matrix_multiplication.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/matrix_multiplication.c' object='libscioperations_la-matrix_multiplication.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -c -o libscioperations_la-matrix_multiplication.lo `test -f 'src/c/matrix_multiplication.c' || echo '$(srcdir)/'`src/c/matrix_multiplication.c
 +
 +libscioperations_la-matrix_addition.lo: src/c/matrix_addition.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -MT libscioperations_la-matrix_addition.lo -MD -MP -MF $(DEPDIR)/libscioperations_la-matrix_addition.Tpo -c -o libscioperations_la-matrix_addition.lo `test -f 'src/c/matrix_addition.c' || echo '$(srcdir)/'`src/c/matrix_addition.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscioperations_la-matrix_addition.Tpo $(DEPDIR)/libscioperations_la-matrix_addition.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/matrix_addition.c' object='libscioperations_la-matrix_addition.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -c -o libscioperations_la-matrix_addition.lo `test -f 'src/c/matrix_addition.c' || echo '$(srcdir)/'`src/c/matrix_addition.c
 +
 +libscioperations_la-matrix_substraction.lo: src/c/matrix_substraction.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -MT libscioperations_la-matrix_substraction.lo -MD -MP -MF $(DEPDIR)/libscioperations_la-matrix_substraction.Tpo -c -o libscioperations_la-matrix_substraction.lo `test -f 'src/c/matrix_substraction.c' || echo '$(srcdir)/'`src/c/matrix_substraction.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscioperations_la-matrix_substraction.Tpo $(DEPDIR)/libscioperations_la-matrix_substraction.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/matrix_substraction.c' object='libscioperations_la-matrix_substraction.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -c -o libscioperations_la-matrix_substraction.lo `test -f 'src/c/matrix_substraction.c' || echo '$(srcdir)/'`src/c/matrix_substraction.c
 +
 +libscioperations_la-matrix_division.lo: src/c/matrix_division.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -MT libscioperations_la-matrix_division.lo -MD -MP -MF $(DEPDIR)/libscioperations_la-matrix_division.Tpo -c -o libscioperations_la-matrix_division.lo `test -f 'src/c/matrix_division.c' || echo '$(srcdir)/'`src/c/matrix_division.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscioperations_la-matrix_division.Tpo $(DEPDIR)/libscioperations_la-matrix_division.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/matrix_division.c' object='libscioperations_la-matrix_division.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -c -o libscioperations_la-matrix_division.lo `test -f 'src/c/matrix_division.c' || echo '$(srcdir)/'`src/c/matrix_division.c
 +
 +libscioperations_la-matrix_power.lo: src/c/matrix_power.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -MT libscioperations_la-matrix_power.lo -MD -MP -MF $(DEPDIR)/libscioperations_la-matrix_power.Tpo -c -o libscioperations_la-matrix_power.lo `test -f 'src/c/matrix_power.c' || echo '$(srcdir)/'`src/c/matrix_power.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscioperations_la-matrix_power.Tpo $(DEPDIR)/libscioperations_la-matrix_power.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/matrix_power.c' object='libscioperations_la-matrix_power.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -c -o libscioperations_la-matrix_power.lo `test -f 'src/c/matrix_power.c' || echo '$(srcdir)/'`src/c/matrix_power.c
 +
 +libscioperations_la-matrix_finite.lo: src/c/matrix_finite.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -MT libscioperations_la-matrix_finite.lo -MD -MP -MF $(DEPDIR)/libscioperations_la-matrix_finite.Tpo -c -o libscioperations_la-matrix_finite.lo `test -f 'src/c/matrix_finite.c' || echo '$(srcdir)/'`src/c/matrix_finite.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscioperations_la-matrix_finite.Tpo $(DEPDIR)/libscioperations_la-matrix_finite.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/matrix_finite.c' object='libscioperations_la-matrix_finite.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscioperations_la_CFLAGS) $(CFLAGS) -c -o libscioperations_la-matrix_finite.lo `test -f 'src/c/matrix_finite.c' || echo '$(srcdir)/'`src/c/matrix_finite.c
 +
 +mostlyclean-libtool:
 +      -rm -f *.lo
 +
 +clean-libtool:
 +      -rm -rf .libs _libs
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +      list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      set x; \
 +      here=`pwd`; \
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      shift; \
 +      if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +        test -n "$$unique" || unique=$$empty_fix; \
 +        if test $$# -gt 0; then \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            "$$@" $$unique; \
 +        else \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            $$unique; \
 +        fi; \
 +      fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      test -z "$(CTAGS_ARGS)$$unique" \
 +        || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +           $$unique
 +
 +GTAGS:
 +      here=`$(am__cd) $(top_builddir) && pwd` \
 +        && $(am__cd) $(top_srcdir) \
 +        && gtags -i $(GTAGS_ARGS) "$$here"
 +
 +distclean-tags:
 +      -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +distdir: $(DISTFILES)
 +      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      list='$(DISTFILES)'; \
 +        dist_files=`for file in $$list; do echo $$file; done | \
 +        sed -e "s|^$$srcdirstrip/||;t" \
 +            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 +      case $$dist_files in \
 +        */*) $(MKDIR_P) `echo "$$dist_files" | \
 +                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 +                         sort -u` ;; \
 +      esac; \
 +      for file in $$dist_files; do \
 +        if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 +        if test -d $$d/$$file; then \
 +          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +          if test -d "$(distdir)/$$file"; then \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 +            cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 +        else \
 +          test -f "$(distdir)/$$file" \
 +          || cp -p $$d/$$file "$(distdir)/$$file" \
 +          || exit 1; \
 +        fi; \
 +      done
 +check-am: all-am
 +      $(MAKE) $(AM_MAKEFLAGS) check-local
 +check: check-am
 +all-am: Makefile $(LTLIBRARIES) all-local
 +installdirs:
 +      for dir in "$(DESTDIR)$(pkglibdir)"; do \
 +        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +      done
 +install: install-am
 +install-exec: install-exec-am
 +install-data: install-data-am
 +uninstall: uninstall-am
 +
 +install-am: all-am
 +      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
 +installcheck: installcheck-am
 +install-strip:
 +      $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +        install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +        `test -z '$(STRIP)' || \
 +          echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 +mostlyclean-generic:
 +
 +clean-generic:
 +
 +distclean-generic:
 +      -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +      -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 +
 +maintainer-clean-generic:
 +      @echo "This command is intended for maintainers to use"
 +      @echo "it deletes files that may require special tools to rebuild."
 +clean: clean-am
 +
 +clean-am: clean-generic clean-libtool clean-local \
 +      clean-pkglibLTLIBRARIES mostlyclean-am
 +
 +distclean: distclean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +      distclean-local distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +html-am:
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-data-local
 +
 +install-dvi: install-dvi-am
 +
 +install-dvi-am:
 +
 +install-exec-am: install-pkglibLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-html-am: install-html-local
 +
 +install-info: install-info-am
 +
 +install-info-am:
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-pdf-am:
 +
 +install-ps: install-ps-am
 +
 +install-ps-am:
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +      mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-pkglibLTLIBRARIES
 +
 +.MAKE: check-am install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
 +      clean clean-generic clean-libtool clean-local \
 +      clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
 +      distclean-generic distclean-libtool distclean-local \
 +      distclean-tags distdir dvi dvi-am html html-am info info-am \
 +      install install-am install-data install-data-am \
 +      install-data-local install-dvi install-dvi-am install-exec \
 +      install-exec-am install-html install-html-am \
 +      install-html-local install-info install-info-am install-man \
 +      install-pdf install-pdf-am install-pkglibLTLIBRARIES \
 +      install-ps install-ps-am install-strip installcheck \
 +      installcheck-am installdirs maintainer-clean \
 +      maintainer-clean-generic mostlyclean mostlyclean-compile \
 +      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +      tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
 +
 +
 +# This target enables tests for Scilab
 +check-local: $(top_builddir)/scilab-bin test
 +      @COMMAND="test_run('$(modulename)');quit";\
 +      export LANG=C;\
 +      $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
 +check-code:
 +      if test -f build.xml; then \
 +              $(ANT) checkstyle; \
 +      fi
 +      if test -x "$(SPLINT)"; then \
 +              $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
 +      fi
 +@NEED_JAVA_TRUE@java:
 +# Some configurations needs to export JAVA_HOME in the current env
 +@NEED_JAVA_TRUE@      @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
 +@NEED_JAVA_TRUE@      if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +@NEED_JAVA_TRUE@      if test -f build.xml -a $$USEANT -eq 1; then \
 +@NEED_JAVA_TRUE@              $(ANT); \
 +@NEED_JAVA_TRUE@      fi
 +
 +@NEED_JAVA_TRUE@clean-java:
 +# Some configurations needs to export JAVA_HOME in the current env
 +@NEED_JAVA_TRUE@      @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
 +@NEED_JAVA_TRUE@      if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +@NEED_JAVA_TRUE@      if test -f build.xml -a $$USEANT -eq 1; then \
 +@NEED_JAVA_TRUE@              $(ANT) clean; \
 +@NEED_JAVA_TRUE@      fi;
 +
 +# If the user request for the SWIG generation of the wrappers Java => C/C++ 
 +# We call the target swig-build on the variable SWIG_WRAPPERS
 +
 +@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
 +@SWIG_TRUE@   @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
 +@SWIG_TRUE@   SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
 +@SWIG_TRUE@   if test -n "$(SWIG_WRAPPERS)"; then \
 +@SWIG_TRUE@           for file in $(SWIG_WRAPPERS) ; do \
 +@SWIG_TRUE@                   echo "Swig process of $$file ..."; \
 +@SWIG_TRUE@                   $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME  -outdir $$SWIG_OUTDIR $$file; \
 +@SWIG_TRUE@           done; \
 +@SWIG_TRUE@   fi
 +
 +# If the user request for the SWIG generation of the wrappers Java => C/C++ 
 +# We call the target swig-build on the variable SWIG_WRAPPERS
 +
 +@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
 +@GIWS_TRUE@   @GIWS_OUTPUTDIR=src/jni/;\
 +@GIWS_TRUE@   if test -n "$(GIWS_WRAPPERS)"; then \
 +@GIWS_TRUE@           for file in $(GIWS_WRAPPERS) ; do \
 +@GIWS_TRUE@                   echo "GIWS process of $$file ..."; \
 +@GIWS_TRUE@                   $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
 +@GIWS_TRUE@           done; \
 +@GIWS_TRUE@   fi
 +
 +macros:
 +      -@( if test ! -x $(top_builddir)/scilab-bin; then \
 +              echo "Error : Cannot build $< : Scilab has not been built"; \
 +      else \
 +              $(top_builddir)/bin/scilab -ns -nwni -e "exec('macros/buildmacros.sce');quit;";\
 +      fi)
 +
 +# Removes the macros
 +clean-macros:
 +# Removes macros (*.bin generated from .sci)
 +      @for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
 +              echo "rm -f $(builddir)/$$dir/$(MACROBINMASK)"; \
 +              rm -f $(builddir)/$$dir/$(MACROBINMASK); \
 +      done
 +
 +test:
 +# More tests could be added here
 +      @if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +      if test -f build.xml -a $$USEANT -eq 1; then \
 +              $(ANT) test; \
 +      fi
 +
 +all-local: $(TARGETS_ALL)
 +
 +.sci.bin:
 +      -@( if test ! -x $(top_builddir)/scilab-bin; then \
 +      echo "Error : Cannot build $< : Scilab has not been build"; \
 +      else \
 +      echo "Creating $@"; \
 +      $(top_builddir)/bin/scilab -ns -nwni -e "exec('$(abs_srcdir)/$<');save('$(abs_srcdir)/$@');exit;"; \
 +      fi )
 +
 +install-html-local:
 +# If the user wants the help sources to be installed
 +@INSTALL_HELP_XML_TRUE@       @echo "-------- Install of XML sources of help files --------"; \
 +@INSTALL_HELP_XML_TRUE@       for lang in $(ALL_LINGUAS); do \
 +@INSTALL_HELP_XML_TRUE@        if test -d $(srcdir)/help/$$lang; then \
 +@INSTALL_HELP_XML_TRUE@         $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/$$lang && \
 +@INSTALL_HELP_XML_TRUE@               if ls -lLd $(srcdir)/help/$$lang/$(DOCMASKXML) >/dev/null 2>&1; then \
 +@INSTALL_HELP_XML_TRUE@                 for file in $(srcdir)/help/$$lang/$(DOCMASKXML) ; do \
 +@INSTALL_HELP_XML_TRUE@                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/$$lang" ; \
 +@INSTALL_HELP_XML_TRUE@               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/$$lang ; \
 +@INSTALL_HELP_XML_TRUE@                 done ; \
 +@INSTALL_HELP_XML_TRUE@               fi; \
 +@INSTALL_HELP_XML_TRUE@        fi; \
 +@INSTALL_HELP_XML_TRUE@       done; \
 +@INSTALL_HELP_XML_TRUE@       @echo "-------- Install of MathML sources --------"; \
 +@INSTALL_HELP_XML_TRUE@        if test -d $(srcdir)/help/mml/; then \
 +@INSTALL_HELP_XML_TRUE@         $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/mml/ && \
 +@INSTALL_HELP_XML_TRUE@               if ls -lLd $(srcdir)/help/mml/$(DOCMASKMML) >/dev/null 2>&1; then \
 +@INSTALL_HELP_XML_TRUE@                 for file in $(srcdir)/help/mml/$(DOCMASKMML) ; do \
 +@INSTALL_HELP_XML_TRUE@                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/mml" ; \
 +@INSTALL_HELP_XML_TRUE@               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/mml ; \
 +@INSTALL_HELP_XML_TRUE@                 done ; \
 +@INSTALL_HELP_XML_TRUE@               fi; \
 +@INSTALL_HELP_XML_TRUE@       fi
 +install-data-local:
 +# Install the tests
 +      @echo "-------- Install tests (if any) --------"; \
 +      for dir in $(TESTS_DIR) $(TESTS_DIREXT) ; do \
 +        if test -d $(srcdir)/$$dir/; then \
 +          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
 +                for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
 +                  if test -d "$(srcdir)/$$dir/$$file"; then \
 +                        echo $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir/$$file; \
 +                        $(mkinstalldirs) "$(DESTDIR)$(pkgmacrosdir)/$$dir/$$file"; \
 +                  else \
 +                    echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
 +                $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
 +                  fi \
 +                done; \
 +        fi; \
 +      done
 +# Install the help chapter
 +      @echo "-------- Install the help chapter (if any) --------"; \
 +      for lang in $(HELP_CHAPTERLANG); do \
 +              HELPFILE=$(srcdir)/$(HELP_CHAPTERDIR)$$lang/$(HELP_CHAPTERFILE); \
 +              if test -f $$HELPFILE; then \
 +                      echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
 +                      $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
 +                      echo $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
 +                      $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
 +              fi; \
 +      done
 +# Install the demos & examples
 +      @echo "-------- Install demos & examples (if any) --------"; \
 +      for dir in $(DEMOS_DIR) $(DEMOS_DIREXT) $(EXAMPLES_DIR) $(EXAMPLES_DIREXT) ; do \
 +        if test -d $(srcdir)/$$dir/; then \
 +          $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
 +                for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
 +                  if test -d "$(srcdir)/$$dir/$$file"; then \
 +                        echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir/$$file; \
 +                        $(mkinstalldirs) "$(DESTDIR)$(pkgdocdir)/$$dir/$$file"; \
 +                  else \
 +                    echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
 +                $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
 +                  fi \
 +                done; \
 +        fi; \
 +      done
 +# Install the macros
 +      @echo "-------- Install macros (if any) --------"; \
 +      for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
 +        $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
 +              if test -d $(srcdir)/$$dir/; then \
 +                      FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
 +                      if test -n "$(MACROSSPECIALEXT)"; then \
 +                              specialExtDir=""; \
 +                              for specialExt in $(MACROSSPECIALEXT); do \
 +                                      specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
 +                              done; \
 +                              FILELIST="$$FILELIST $$specialExtDir"; \
 +                      fi; \
 +                for file in `ls -1 $$FILELIST 2>/dev/null`; do \
 +                  echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
 +              $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
 +                done; \
 +              fi; \
 +      done
 +# Install java files (.jar)
 +      @if ls -lLd $(srcdir)/$(JARDIR)$(JARMASK) >/dev/null 2>&1; then \
 +      echo "-------- Install jar files --------"; \
 +    $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(JARDIR); \
 +        for file in $(srcdir)/$(JARDIR)$(JARMASK); do\
 +                  echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$(JARDIR)" ; \
 +              $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/$(JARDIR) ; \
 +        done ; \
 +      fi
 +
 +########### CLEAN ###################
- # Clean macros and help (generated automatically by Scilab)
- @NEED_JAVA_TRUE@clean-local: clean-java clean-macros
- @NEED_JAVA_FALSE@clean-local: clean-macros
++# Clean help (generated automatically by Scilab)
++# It used to clean the macro (clean-macros) but this was causing
++# make clean && make to fail Scilab startup
++@NEED_JAVA_TRUE@clean-local: clean-java
++@NEED_JAVA_FALSE@clean-local:
 +
 +distclean-local:
 +      rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_*
 +
 +.PHONY: macros java swig giws
 +
 +#### operations : Conf files ####
 +#### libscioperations_la_rootdir = $(mydatadir)
 +#### libscioperations_la_root_DATA = changelog.txt license.txt readme.txt version.xml
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
@@@ -133,7 -132,7 +133,7 @@@ libscioptimization_la_LDFLAGS = -versio
  
  libscioptimization_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(MINPACK_SOURCES)
  
- libscioptimization_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscioptimization_la_LIBADD =  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscioptimization_la_LIBADD =  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  
  #### Target ######
@@@ -551,7 -548,7 +549,7 @@@ libscioptimization_la_CFLAGS = -I$(srcd
  pkglib_LTLIBRARIES = libscioptimization.la
  libscioptimization_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
  libscioptimization_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(MINPACK_SOURCES)
- libscioptimization_la_LIBADD = $(top_builddir)/modules/core/libscicore.la  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscioptimization_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscioptimization_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename = optimization
Simple merge
Simple merge
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="UTF-8"?>
++<?xml version="1.0" encoding="UTF-8"?>
  <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@@ -45,7 -45,7 +45,7 @@@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../operations/includes;../../../localization/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
 -                              AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../parallel/includes;../../../localization/includes;../../../windows_tools/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
++                              AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../operations/includes;../../../parallel/includes;../../../localization/includes;../../../windows_tools/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;PARALLEL_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../operations/includes;../../../localization/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
 -                              AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../parallel/includes;../../../localization/includes;../../../windows_tools/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
++                              AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../operations/includes;../../../parallel/includes;../../../localization/includes;../../../windows_tools/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;PARALLEL_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../operations/includes;../../../localization/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
 -                              AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../parallel/includes;../../../localization/includes;../../../windows_tools/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
++                              AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../operations/includes;../../../parallel/includes;../../../localization/includes;../../../windows_tools/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;PARALLEL_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../operations/includes;../../../localization/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
 -                              AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../parallel/includes;../../../localization/includes;../../../windows_tools/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
++                              AdditionalIncludeDirectories=".;../../includes;../../src/cpp;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../parameters/includes;../../../jvm/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/src/c/scilab_windows;../../../operations/includes;../../../parallel/includes;../../../localization/includes;../../../windows_tools/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;PARALLEL_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
Simple merge
@@@ -117,7 -117,7 +117,7 @@@ libscipolynomials_la_SOURCES = $(POLYNO
  CHECK_SRC= ) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscipolynomials_la_CFLAGS)
  
- libscipolynomials_la_LIBADD =  $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscipolynomials_la_LIBADD =  $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscipolynomials_la_LIBADD =  $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename=polynomials
@@@ -536,7 -535,7 +535,7 @@@ libscipolynomials_la_SOURCES = $(POLYNO
  # For the code check (splint)
  CHECK_SRC = ) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscipolynomials_la_CFLAGS)
- libscipolynomials_la_LIBADD = $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscipolynomials_la_LIBADD = $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscipolynomials_la_LIBADD = $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename = polynomials
@@@ -95,10 -94,9 +95,9 @@@ pkglib_LTLIBRARIES = libscipvm.l
  
  libscipvm_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
  
 -libscipvm_la_SOURCES = $(PVM_C_SOURCES) 
 +libscipvm_la_SOURCES = $(PVM_C_SOURCES)
  
- libscipvm_la_LIBADD = \
-       $(top_builddir)/modules/core/libscicore.la
+ libscipvm_la_LIBADD = 
  
  libscipvm_la_CFLAGS = -I$(top_srcdir)/modules/api_scilab/includes \
  -I$(srcdir)/includes/ \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -98,7 -107,7 +98,7 @@@ libscisignal_processing_la_SOURCES = $(
  CHECK_SRC= $(SIGNAL_PROCESSING_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscisignal_processing_la_CFLAGS)
  
- libscisignal_processing_la_LIBADD =  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscisignal_processing_la_LIBADD =  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscisignal_processing_la_LIBADD =  $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename=signal_processing
@@@ -116,19 -113,18 +116,18 @@@ LTLIBRARIES = $(pkglib_LTLIBRARIES
  libscisignal_processing_la_DEPENDENCIES = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -am__objects_1 = sci_ffir.lo degree.lo parcha.lo ouch.lo dfftbi.lo \
 -      dsqrtc.lo tranze.lo chebc.lo tscccf.lo dsn2.lo hammin.lo \
 -      bounn.lo nstabl.lo ino.lo desia.lo desi11.lo cmpse3.lo \
 -      cheby.lo trbize.lo r2tx.lo deli2.lo gee.lo r4tx.lo transn.lo \
 -      r8tx.lo kaiser.lo deli11.lo compel.lo filbut.lo desi01.lo \
 -      desi22.lo amell.lo desi24.lo dellk.lo syredi.lo dpspln.lo \
 -      coeft.lo tranpo.lo blnumz.lo sn.lo bldenz.lo dspln.lo belan.lo \
 -      desib.lo freque.lo desi12.lo cmpse2.lo desi14.lo delip.lo \
 -      deli1.lo trbipo.lo rpem.lo dfft2.lo dgee01.lo romeg.lo \
 -      snell.lo fft842.lo tg02ad.lo remez.lo poles.lo desi00.lo \
 -      desi21.lo dfftmx.lo
 +am__objects_1 = degree.lo parcha.lo ouch.lo dfftbi.lo dsqrtc.lo \
 +      tranze.lo chebc.lo tscccf.lo dsn2.lo hammin.lo bounn.lo \
 +      nstabl.lo ino.lo desia.lo desi11.lo cmpse3.lo cheby.lo \
 +      trbize.lo r2tx.lo deli2.lo gee.lo r4tx.lo transn.lo r8tx.lo \
 +      kaiser.lo deli11.lo compel.lo filbut.lo desi01.lo desi22.lo \
 +      amell.lo desi24.lo dellk.lo syredi.lo dpspln.lo coeft.lo \
 +      tranpo.lo blnumz.lo sn.lo bldenz.lo dspln.lo belan.lo desib.lo \
 +      freque.lo desi12.lo cmpse2.lo desi14.lo delip.lo deli1.lo \
 +      trbipo.lo rpem.lo dfft2.lo dgee01.lo romeg.lo snell.lo \
 +      fft842.lo tg02ad.lo remez.lo poles.lo desi00.lo desi21.lo \
 +      dfftmx.lo
  am__objects_2 = libscisignal_processing_la-corrtable.lo
  am__objects_3 = libscisignal_processing_la-sci_remez.lo \
        libscisignal_processing_la-sci_rpem.lo \
@@@ -511,7 -519,7 +510,7 @@@ libscisignal_processing_la_SOURCES = $(
  # For the code check (splint)
  CHECK_SRC = $(SIGNAL_PROCESSING_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscisignal_processing_la_CFLAGS)
- libscisignal_processing_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscisignal_processing_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscisignal_processing_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la  $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename = signal_processing
@@@ -1,14 -1,17 +1,27 @@@
  // =============================================================================
  // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 +// Copyright (C) 2009 - DIGITEO
+ // Copyright (C) 2010 - DIGITEO
  //
  //  This file is distributed under the same license as the Scilab package.
  // =============================================================================
  
 +iext = linspace(1,5,5);
 +ds = [ones(1:5),zeros(1:5)];
 +fg = linspace(0,0.5,10);
 +wt = ones(fg);
 +y = remez(iext,ds,fg,wt);
 +
 +if max(abs(y - [0.500 0.852 0.000 0.000])) > 0.001 then pause, end
++
++
+ nc=21;
+ ngrid=nc*250;
+ fgrid=.5*(0:(ngrid-1))/(ngrid-1);
+ mag(1:ngrid/2)=ones(1:ngrid/2);
+ mag(ngrid/2+1:ngrid)=0*ones(1:ngrid/2);
+ weight=ones(fgrid);
+ guess=round(1:ngrid/nc:ngrid);
+ guess(nc+1)=ngrid;
+ guess(nc+2)=ngrid;
 -an=remez(guess,mag,fgrid,weight);
++an=remez(guess,mag,fgrid,weight);
Simple merge
Simple merge
@@@ -173,7 -172,7 +173,7 @@@ libscisparse_la_SOURCES = $(SPARSE_C_SO
  CHECK_SRC = $(SPARSE_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscisparse_la_CFLAGS)
  
- libscisparse_la_LIBADD =  $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/core/libscicore.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscisparse_la_LIBADD =  $(top_builddir)/modules/io/libsciio.la   $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscisparse_la_LIBADD =  $(top_builddir)/modules/io/libsciio.la   $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  
  #### Target ######
@@@ -603,7 -601,7 +602,7 @@@ libscisparse_la_SOURCES = $(SPARSE_C_SO
  # For the code check (splint)
  CHECK_SRC = $(SPARSE_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscisparse_la_CFLAGS)
- libscisparse_la_LIBADD = $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/core/libscicore.la  $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscisparse_la_LIBADD = $(top_builddir)/modules/io/libsciio.la   $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscisparse_la_LIBADD = $(top_builddir)/modules/io/libsciio.la   $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename = sparse
@@@ -100,7 -97,7 +100,7 @@@ libscistatistics_la_SOURCES = $(STATIST
  CHECK_SRC= $(STATISTICS_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscistatistics_la_CFLAGS)
  
- libscistatistics_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscistatistics_la_LIBADD =  $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscistatistics_la_LIBADD =  $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename=statistics
@@@ -112,11 -111,9 +112,10 @@@ am__installdirs = "$(DESTDIR)$(pkglibdi
        "$(DESTDIR)$(libscistatistics_la_sci_gatewaydir)"
  LTLIBRARIES = $(pkglib_LTLIBRARIES)
  libscistatistics_la_DEPENDENCIES =  \
-       $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la
  am__objects_1 = libscistatistics_la-CdfBase.lo \
 -      libscistatistics_la-ipmpar1.lo
 +      libscistatistics_la-ipmpar1.lo \
 +      libscistatistics_la-sci_string_matrix.lo
  am__objects_2 = psi.lo alngam.lo erfc1.lo cdff.lo spmpar.lo cumnor.lo \
        cdfpoi.lo bcorr.lo cumchi.lo apser.lo gamln1.lo cdft.lo \
        gaminv.lo cumnbn.lo cdffnc.lo rlog1.lo cdfchn.lo dt1.lo \
@@@ -512,7 -507,7 +511,7 @@@ libscistatistics_la_SOURCES = $(STATIST
  # For the code check (splint)
  CHECK_SRC = $(STATISTICS_C_SOURCES) $(GATEWAY_C_SOURCES)
  INCLUDE_FLAGS = $(libscistatistics_la_CFLAGS)
- libscistatistics_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libscistatistics_la_LIBADD = $(top_builddir)/modules/output_stream/libscioutput_stream.la 
++libscistatistics_la_LIBADD = $(top_builddir)/modules/output_stream/libscioutput_stream.la
  
  #### Target ######
  modulename = statistics
   * you should have received as part of this distribution.  The terms
   * are also available at
   * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 - *
   */
  
 -/*--------------------------------------------------------------------------*/
 -#include <string.h>
 -#include "stack-c.h"
  #include "CdfBase.h"
 +
 +#include "api_scilab.h"
 +#include "stack-c.h" /* TODO: remove as soon as Rhs is linked in api_scilab.h */
  #include "Scierror.h"
  #include "localization.h"
 -/*--------------------------------------------------------------------------*/
 -int  CdfBase(char *fname,int inarg,int oarg,int *callpos,char *option,char *errnames,int which,int (*fonc)(),void (*foncErr)() )
 -{
 -    int i = 0, status = 0, m[6], n[6], l[6];
 -    double bound = 0;
 -    if ( Rhs != inarg + 1 )
 -    {
 -        Scierror(999,_("%s: Wrong number of input arguments with the '%s' option: %d expected.\n"),fname,option,inarg+1);
 -        return 1;
 -    }
 -    for ( i = 0 ; i < inarg ; i++ )
 -    {
 -        GetRhsVar(i + 2, MATRIX_OF_DOUBLE_DATATYPE, &m[i], &n[i], &l[i]);
 -    }
 -    for ( i = 1 ; i < inarg ; i++)
 -    {
 -        if ( m[i] != m[i-1] || n[i] != n[i-1])
 -        {
 -            Scierror(999,_("%s and %s must have same size.\n"),fname,errnames);
 -            return 1;
 -        }
 -    }
 -    for ( i = 0 ; i < oarg ; i++)
 -    {
 -        CreateVar(i+2+inarg,MATRIX_OF_DOUBLE_DATATYPE,&m[0],&n[0],&l[i+inarg]);
 -    }
 -
 -    switch ( inarg+oarg)
 -    {
 -    case 5:
 -        for ( i=0 ; i < m[0]*n[0]; i++)
 -        {
 -            (*fonc)(&which,stk(l[callpos[0]]+i),stk(l[callpos[1]]+i),
 -                stk(l[callpos[2]] +i),stk(l[callpos[3]]+i),
 -                stk(l[callpos[4]]+i),
 -                &status,&bound);
 -
 -            if (status != 0)
 -            {
 -                (*foncErr)(status,bound); return 1;
 -            }
 -        }
 -        break;
 +#include "MALLOC.h"
 +#include "sci_string_matrix.h"
 +#include <string.h>
  
 -    case 6:
 -        for ( i=0 ; i < m[0]*n[0]; i++)
 -        {
 -            (*fonc)(&which,stk(l[callpos[0]]+i),stk(l[callpos[1]]+i),
 -                stk(l[callpos[2]] +i),stk(l[callpos[3]]+i),
 -                stk(l[callpos[4]] +i),stk(l[callpos[5]]+i),
 -                &status,&bound);
 +int mod(int a, int b);
 +int rotate(int i, int step, int length);
 +char *cdf_options(struct cdf_descriptor const * const desc);
 +void cdf_error(char const * const fname, int status, double bound);
 +int CdfBase(char const * const fname, int inarg, int oarg, int shift, int which,
 +          int (*fun)(int *, ...));
  
 -            if (status != 0)
 -            {
 -                /** Scierror(999,"i=%d\n",i); **/
 -                (*foncErr)(status,bound); return 1;
 -            }
 -        }
 -        break;
 -    case 4:
 -        for ( i=0 ; i < m[0]*n[0]; i++)
 -        {
 -            (*fonc)(&which,stk(l[callpos[0]]+i),stk(l[callpos[1]]+i),
 -                stk(l[callpos[2]] +i),stk(l[callpos[3]]+i),
 -                &status,&bound);
 +int
 +cdf_generic(char *fname, struct cdf_descriptor *cdf)
 +{
 +  struct cdf_item const * it;
 +  char *option;
  
 -            if (status != 0)
 -            {
 -                (*foncErr)(status,bound); return 1;
 -            }
 -        }
 -        break;
 +  CheckRhs(cdf->minrhs, cdf->maxrhs);
 +  CheckLhs(cdf->minlhs, cdf->maxlhs);
 +  option = create_string(1);
 +  for (it = cdf->items; it != cdf->end_item; ++it)
 +    if (strcmp(option, it->option) == 0) {
 +      /* "which" argument (5th) inferred from position in item list */
 +      CdfBase(fname, it->inarg, it->oarg, it->shift, it - cdf->items + 1, cdf->fun);
 +      break;
      }
 +  destroy_string(option);
 +  if (it == cdf->end_item) { /* no target found */
 +    char *optlist;
 +    optlist = cdf_options(cdf);
 +    Scierror(999, _("%s: Wrong value for input argument #%d: Must be in the set {%s}.\n"), fname, 1, optlist);
 +    FREE(optlist);
 +    return 1;
 +  }
 +  return 0;
 +}
  
 -    for ( i = 0 ; i < oarg ; i++)
 -    {
 -        LhsVar(i+1) = i+2+inarg;
 -    }
 +/**
 + * Remainder r > 0 of a div b.
 + */
 +int
 +mod(int a, int b)
 +{
 +  int m = a % b;
 +  return (m >= 0) ? m : m + b;
 +}
  
 -    PutLhsVar();
 -    return 0;
 +/**
 + * Get index of T's ith element after T has been rotated step elts to the left.
 + * Formally, with r denoting table's rotation to the left,
 + *   (r(T, step))[rotate(i, step, length)] = T[i]
 + * e.g.  T = {0, 1, 2, 3, 4, 5, 6, 7, 8}
 + * r(T, 3) = {3, 4, 5, 6, 7, 8, 0, 1, 2}
 + * hence rotate(7,3,9) = 4
 + */
 +int
 +rotate(int i, int step, int length)
 +{
 +  return mod((i - step), length);
  }
 -/*--------------------------------------------------------------------------*/
 -void CdfDefaultError(char** param, int status, double bound)
 +
 +/**
 + * Collect options from a cdf_descriptor in a user readable string.
 + * Allocates space for its return value. To be freed afterwards.
 + */
 +char *
 +cdf_options(struct cdf_descriptor const * const cdf)
  {
 -    if (bound <= ZERO_FOR_CDF)
 -    {
 -        Scierror(999, "Input argument %c is out of range.\nBound exceeded: %f\n", param[-status-1], 0);
 -    }
 -    else if (bound >= INFINITY_FOR_CDF)
 -    {
 -        Scierror(999, "Input argument %c is out of range.\nBound exceeded: %s\n", param[-status-1], "%inf");
 -    }
 -    else
 -    {
 -        Scierror(999, "Input argument %c is out of range.\nBound exceeded: %f\n", param[-status-1], bound);
 -    }
 +  char *ret;
 +  size_t len = 0;
 +  char const * const spc = ", ";
 +  struct cdf_item const * it;
 +
 +  for (it = cdf->items; it != cdf->end_item; ++it)
 +    len += strlen(spc) + strlen(it->option);
 +  ret = (char *) MALLOC(len * sizeof(char));
 +  ret[0] = '\0';
 +  for (it = cdf->items; it != cdf->end_item; ++it) {
 +    strcat(ret, it->option);
 +    if (it + 1 != cdf->end_item)
 +      strcat(ret, spc);
 +  }
 +  return ret;
  }
 -/*--------------------------------------------------------------------------*/
 -void cdfLowestSearchError(double bound)
 +
 +/**
 + * Interpret and signal DCDFLIB's error return values.
 + */
 +void
 +cdf_error(char const * const fname, int status, double bound)
  {
-   switch (status) {
 -    if (bound <= ZERO_FOR_CDF)
 -    {
 -        Scierror(999,_("Answer appears to be lower than lowest search bound %f\n"), 0);
 -    }
 -    else
 -    {
 -        Scierror(999,_("Answer appears to be lower than lowest search bound %f\n"), bound);
 -    }            
++  switch (status)
++  {
 +  case 1:
-     Scierror(999, _("%s: Answer appears to be lower than lowest search bound %f\n"), fname, bound);
-     break;
++      Scierror(999, _("%s: Answer appears to be lower than lowest search bound %f\n"), fname, (bound > ZERO_FOR_CDF ? bound : 0));
++      break;
 +  case 2:
-     Scierror(999, _("%s: Answer appears to be higher than greatest search bound %f\n"), fname, bound);
++      if (bound >= INFINITY_FOR_CDF)
++      {
++          Scierror(999, _("%s: Answer appears to be higher than greatest search bound %s\n"), fname, "%inf");
++      }
++      else
++      {
++          Scierror(999, _("%s: Answer appears to be higher than greatest search bound %f\n"), fname, bound);
++      }
 +    break;
 +  case 3:
-     Scierror(999, "%s: P + Q ≠ 1\n", fname);
-     break;
++      Scierror(999, "%s: P + Q ≠ 1\n", fname);
++      break;
 +  case 4:
-     if (strcmp(fname, "cdfbet") == 0)
-       Scierror(999, "%s: X + Y ≠ 1", fname);
-     else if (strcmp(fname, "cdfbin") == 0 ||
++      if (strcmp(fname, "cdfbet") == 0)
++      {
++          Scierror(999, "%s: X + Y ≠ 1", fname);
++      }
++      else if (strcmp(fname, "cdfbin") == 0 ||
 +           strcmp(fname, "cdfnbn") == 0)
-       Scierror(999, "%s: Pr + Ompr ≠ 1\n", fname);
++      {
++          Scierror(999, "%s: Pr + Ompr ≠ 1\n", fname);
++      }
 +      else if (strcmp(fname, "cdfnor") == 0)
-       Scierror(999, _("%s: Std must not be zero\n"), fname);
++      {
++          Scierror(999, _("%s: Std must not be zero\n"), fname);
++      }
 +    break;
 +  case 10:
-     if (strcmp(fname, "cdfchi") == 0)
-       Scierror(999, _("%s: cumgam returned an error\n"), fname);
-     else if (strcmp(fname, "cdfchi") == 0)
-       Scierror(999, _("%s: gamma or inverse gamma routine failed\n"), fname);
-     break;
++      if (strcmp(fname, "cdfchi") == 0)
++      {
++          Scierror(999, _("%s: cumgam returned an error\n"), fname);
++      }
++      else if (strcmp(fname, "cdfchi") == 0)
++      {
++          Scierror(999, _("%s: gamma or inverse gamma routine failed\n"), fname);
++      }
++      break;
 +  default:
-     Scierror(999, _("%s: Argument #%d out of range. Bound exceeded: %f.\n"),
-            fname, - status, bound);
++      Scierror(999, _("%s: Argument #%d out of range. Bound exceeded: %f.\n"),
++               fname, - status, bound);
 +  }
  }
 -/*--------------------------------------------------------------------------*/
 -void cdfGreatestSearchError(double bound)
 +
 +/**
 + * Older generic interface to DCDLIB's cdf functions.
 + * @param fname scilab caller's function name
 + * @param inarg number of inputs to the scilab call
 + * @param oarg number of outputs begged by the scilab call
 + * @param shift tells how much arglist has to be shifted in DCDFLIB funcall
 + * @param which of the arguments is to be deduced from the others
 + * @param fun actual computation function
 + * @return error code
 + */
 +int
 +CdfBase(char const * const fname, int inarg, int oarg, int shift, int which,
 +      int (*fun)(int*, ...))
  {
 -    if (bound >= INFINITY_FOR_CDF)
 -    {
 -        Scierror(999,_("Answer appears to be higher than greatest search bound %s\n"), "%inf");
 +  #define MAXARG 6
 +  double *data[MAXARG];
 +  int rows[MAXARG], cols[MAXARG];
 +  #undef MAXARG
 +
 +  double bound;
 +  int errlevel;
 +  int i;
 +  int *p;
 +
 +  if ( Rhs != inarg + 1 ) {
 +    Scierror(999, _("%s: Wrong number of input argument(s): %d expected.\n"), fname, inarg + 1);
 +    return 1;
 +  }
 +  for (i = 0; i < inarg; ++i) {
 +    getVarAddressFromPosition(pvApiCtx, i + 2, &p);
 +    getMatrixOfDouble(pvApiCtx, p, &rows[i], &cols[i], &data[i]);
 +  }
 +  for (i = 1; i < inarg ; ++i)
 +    if (rows[i] != rows[i-1] || cols[i] != cols[i-1]) {
 +      Scierror(999, _("%s: Incompatible input arguments #%d and #%d': Same sizes expected.\n"), fname, i + 1, i + 2);
 +      return 1;
 +    }
 +  for (i = 0; i < oarg; ++i)
 +    allocMatrixOfDouble(pvApiCtx, Rhs + i + 1, rows[0], cols[0], &data[i + inarg]);
 +#define callpos(i) rotate(i, shift, inarg + oarg)
 +  for (i = 0; i < rows[0] * cols[0]; ++i) {
 +    switch (inarg + oarg) {
 +    case 4: /* cdfchi, cdfpoi, cdft */
 +      (*fun)(&which,
 +           &(data[callpos(0)][i]),
 +           &(data[callpos(1)][i]),
 +           &(data[callpos(2)][i]),
 +           &(data[callpos(3)][i]),
 +           &errlevel, &bound);
 +      break;
 +    case 5: /* cdfchn, cdff, cdfgam, cdfnor */
 +      (*fun)(&which,
 +           &(data[callpos(0)][i]),
 +           &(data[callpos(1)][i]),
 +           &(data[callpos(2)][i]),
 +           &(data[callpos(3)][i]),
 +           &(data[callpos(4)][i]),
 +           &errlevel, &bound);
 +      break;
 +    case 6: /* cdfbet, cdfbin, cdffnc, cdfnbn, */
 +      (*fun)(&which,
 +           &(data[callpos(0)][i]),
 +           &(data[callpos(1)][i]),
 +           &(data[callpos(2)][i]),
 +           &(data[callpos(3)][i]),
 +           &(data[callpos(4)][i]),
 +           &(data[callpos(5)][i]),
 +           &errlevel, &bound);
 +      break;
      }
 -    else
 -    {
 -        Scierror(999,_("Answer appears to be higher than greatest search bound %f\n"),bound);
 +    if (errlevel != 0) {
 +      cdf_error(fname, errlevel, bound);
 +      return 1;
      }
 +  }
 +#undef callpos
 +  for (i = 0; i < oarg; ++i)
 +    LhsVar(i + 1) = Rhs + i + 1;
 +  PutLhsVar();
 +  return 0;
  }
 -/*--------------------------------------------------------------------------*/
@@@ -8,87 -8,37 +8,91 @@@
   * you should have received as part of this distribution.  The terms
   * are also available at
   * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 - *
   */
-- 
++
  #ifndef __CDFBASE_H__
  #define __CDFBASE_H__
  
+ /* see cdff.f line 97 */
+ #define INFINITY_FOR_CDF 1.0e300
+ #define ZERO_FOR_CDF 1.0e-300
  /**
 - * TODO : needs comments
 - * @param fname
 - * @param inarg
 - * @param oarg
 - * @param callpos
 - * @param option
 - * @param errnames
 - * @param which
 - * @param (*fonc)()
 - * @param (*foncErr)()
 - * @return
 + * Describe a way of calling a particular cdf function.
 + * @see cdf_descriptor
 + */
 +struct cdf_item {
 +  const char *option;
 +  const int inarg; /* number of inputs taken */
 +  const int oarg;  /* number of outputs expected */
 +  const int shift; /* how much arglist has to be shifted in DCDFLIB funcall @see CdfBase */
 +};
 +
 +/**
 + * Type of a cdf generic function.
   */
 -int  CdfBase(char *fname,int inarg,int oarg,int *callpos,char *option,char *errnames,int which,int (*fonc)(),void (*foncErr)() );
 +typedef int (*const cdf_fptr)(int *, ...);
  
 +/**
 + * Holds all information required to manipulate DCDFLIB's cdf functions.
 + * @warning "items" element order is used in cdf_generic to infer "which" value
 + * @note use mkcdf macro to instanciate cdf_descriptors
 + */
 +struct cdf_descriptor {
 +  const int minrhs;
 +  const int maxrhs;
 +  const int minlhs;
 +  const int maxlhs;
 +  cdf_fptr fun;                                /* actual DCDFLIB's function */
 +  const struct cdf_item *items;        /* ways of calling this function */
 +  const struct cdf_item *end_item; /* last item, 1 passed */
 +};
  
 -/* messages error */
 -void CdfDefaultError(char** param, int status, double bound);
 +/**
 + * Generic interface to DCDFLIB's cdf functions.
 + * @param[in] fname scilab caller function name
 + * @param[in] cdf's description, @see struct cdf_descriptor
 + */
 +extern int cdf_generic(char *fname, struct cdf_descriptor *cdf);
  
 -void cdfLowestSearchError(double bound);
  
 -void cdfGreatestSearchError(double bound);
 +/**
-  * Number of elements of an elttype-typed array 
++ * Number of elements of an elttype-typed array
 + */
 +#define       nelem(array, elttype) (sizeof(array) / sizeof(elttype))
 +
 +/**
 + * Address of end (ie last past one) element of a cdf_item array
 + */
 +#define       end_item(array) (array + nelem(array, struct cdf_item))
 +
 +/**
 + * Format a cdf_descriptor
 + * @param ffname fortran function name (with no underscore)
 + * @param minrhs, maxrhs, minlhs, maxlhs rhs (resp. lhs) minimum (resp. max)
 + * @param itvar variable holing the cdf_item array describing cdf options
 + * @warning itvar must be an array so that sizeof will work on it significantly
 + */
 +#define       mkcdf(ffname, minrhs, maxrhs, minlhs, maxlhs, itvar)            \
 +  {minrhs, maxrhs, minlhs, maxlhs,                                    \
 +      (cdf_fptr)C2F(ffname), itvar, end_item(itvar)}
 +
 +/**
 + * @remark There is a need for cleverer macros in this module. Indeed,
 + * every sci_cdf file follows the same pattern. However, I won't go
 + * any further on this way since:
 + *
 + * 1. I frown upon encapsulating returns in macros (beacause it cheats
 + * on standard C interpreting). And I am reluctant to declare unscoped
 + * variables in macros to be used out of the macro's body (because of
 + * side effects and code obfuscating). But C89 doesn't allow
 + * expressions like (int t, &t). Hence, I see no (clean) way out.
 + *
 + * 2. No comma inside a macro arguments is allowed. i.e. cpp reads 3
 + * arguments in such a macro call as mac({1, 2, 3}). On the other
 + * hand, I won't write bracing macros (two complementary macros
 + * starting and ending a block) because it's a pain to write neatly,
 + * it has unexpected side effets w.r.t. standard C interpretation.
 + */
  
  #endif /* __CDFBASE_H__ */
@@@ -87,8 -86,8 +87,8 @@@ CHECK_SRC= $(STRING_C_SOURCES) $(GATEWA
  INCLUDE_FLAGS = $(libscistring_la_CFLAGS)
  
  # commented since it is the first module to be processed
 -#  $(top_builddir)/modules/polynomials/libscipolynomials.la 
 +#  $(top_builddir)/modules/polynomials/libscipolynomials.la
- libscistring_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+ libscistring_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  #### Target ######
  modulename=string
  
@@@ -507,8 -505,8 +506,8 @@@ CHECK_SRC = $(STRING_C_SOURCES) $(GATEW
  INCLUDE_FLAGS = $(libscistring_la_CFLAGS)
  
  # commented since it is the first module to be processed
 -#  $(top_builddir)/modules/polynomials/libscipolynomials.la 
 +#  $(top_builddir)/modules/polynomials/libscipolynomials.la
- libscistring_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+ libscistring_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
  #### Target ######
  modulename = string
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge