Merge commit 'origin/master' into sas
Antoine ELIAS [Mon, 4 Jan 2010 08:59:03 +0000 (09:59 +0100)]
Conflicts:
scilab/Scilab.sln
scilab/configure
scilab/modules/api_scilab/api_scilab.vcproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/src/c/hdf5.vcproj
scilab/modules/javasci/Javasci.vcproj
scilab/modules/localization/Makefile.in
scilab/modules/metanet/Makefile.am
scilab/modules/metanet/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in

133 files changed:
1  2 
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/LibScilab_Import.def
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/api_scilab.vcproj
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/arnoldi.vcproj
scilab/modules/arnoldi/sci_gateway/c/sci_znaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_zneupd.c
scilab/modules/boolean/Makefile.am
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/call_scilab/call_scilab.vcproj
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/stack1.h
scilab/modules/core/includes/version.h
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/stack1.c
scilab/modules/core/src/c/stack3.c
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.in
scilab/modules/double/src/c/double.vcproj
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
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/functions/src/c/functions.vcproj
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/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/src/c/hdf5.vcproj
scilab/modules/helptools/Makefile.am
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.am
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/linear_algebra/help/en_US/schur.xml
scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
scilab/modules/linear_algebra/tests/unit_tests/svd.tst
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/matio/Makefile.am
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/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.am
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/src/c/signal_processing.vcproj
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/statistics.vcproj
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/string.vcproj
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/time/time.vcproj
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in

@@@ -1059,18 -1030,41 +1043,34 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad-Ant", "modules\xpad\src\java\xpad-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "operations", "modules\operations\operations.vcproj", "{1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}"
        ProjectSection(ProjectDependencies) = postProject
 -              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
 -              {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
 -              {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
 +              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
 +              {E1284D3E-4B3F-446B-B541-F661A8A166A7} = {E1284D3E-4B3F-446B-B541-F661A8A166A7}
 +              {3735EFF9-925B-45B1-82CF-762658E69E70} = {3735EFF9-925B-45B1-82CF-762658E69E70}
        EndProjectSection
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad", "modules\xpad\src\c\xpad.vcproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elem_func", "modules\elementary_functions\src\cpp\elem_func\elem_func.vcproj", "{E1284D3E-4B3F-446B-B541-F661A8A166A7}"
        ProjectSection(ProjectDependencies) = postProject
 -              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 -              {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
 -              {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
 -              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 -              {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
 -              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
 -              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 -              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
        EndProjectSection
  EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\xcos.vcproj", "{494FA8C9-6C85-4175-BE4C-9A113C7A3278}"
+       ProjectSection(ProjectDependencies) = postProject
+               {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+       EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
+       EndProjectSection
+ EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@@ -34188,7 -34355,7 +34355,7 @@@ if test "$enable_stop_on_warning" = yes
     CXXFLAGS="$CXXFLAGS -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/metanet/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/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/scipad/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/xpad/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml modules/jvm/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/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/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/xpad/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/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/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/xpad/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
      "modules/simulated_annealing/Makefile") CONFIG_FILES="$CONFIG_FILES modules/simulated_annealing/Makefile" ;;
      "modules/parameters/Makefile") CONFIG_FILES="$CONFIG_FILES modules/parameters/Makefile" ;;
      "modules/matio/Makefile") CONFIG_FILES="$CONFIG_FILES modules/matio/Makefile" ;;
 +    "modules/operations/Makefile") CONFIG_FILES="$CONFIG_FILES modules/operations/Makefile" ;;
      "modules/atoms/Makefile") CONFIG_FILES="$CONFIG_FILES modules/atoms/Makefile" ;;
+     "modules/xcos/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xcos/Makefile" ;;
      "modules/xpad/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xpad/Makefile" ;;
      "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
      "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;;
@@@ -1466,8 -1539,8 +1539,9 @@@ modules/genetic_algorithms/Makefil
  modules/simulated_annealing/Makefile
  modules/parameters/Makefile
  modules/matio/Makefile
 +modules/operations/Makefile
  modules/atoms/Makefile
+ modules/xcos/Makefile
  modules/xpad/Makefile
  modules/Makefile
  libs/Makefile
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes"
 -                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes"
++                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes"
 -                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes"
++                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes"
 -                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes"
++                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes"
 -                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes"
++                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
Simple merge
Simple merge
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../api_scilab/includes"
 +                              AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes"
 +                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../operations/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
Simple merge
Simple merge
@@@ -336,46 -335,18 +336,19 @@@ libscicore_la_xmldir = $(mydatadir)/xm
  libscicore_la_xml_DATA = xml/modules.dtd xml/version.dtd
  
  #### core : include files ####
- libscicore_la_includedir=$(pkgincludedir)/core
+ libscicore_la_includedir=$(pkgincludedir)
  libscicore_la_include_HEADERS = \
  includes/BOOL.h \
- includes/callFunctionFromGateway.h \
- includes/callinter.h \
- includes/callinterf.h \
- includes/commandwords.h \
  includes/core_math.h \
 -includes/doublecomplex.h \
 +includes/ExceptionMessage.h \
 +includes/existfunction.h \
  includes/freeArrayOfString.h \
- includes/Funtab.h \
  includes/getcommandlineargs.h \
- includes/GetExceptionCode.h \
- includes/getfunctionslist.h \
  includes/getmemory.h \
- includes/getmodules.h \
- includes/getvariablesname.h \
- includes/GetXmlFileEncoding.h \
- includes/gw_core.h \
- includes/gw_user.h \
- includes/gw_user2.h \
- includes/inffic.h \
- includes/inisci-c.h \
- includes/InitializeCore.h \
- includes/intmacr2tree.h \
- includes/isanan.h \
- includes/IsAScalar.h \
- includes/islittleendian.h \
- includes/loadversion.h \
+ includes/getos.h \
  includes/machine.h \
- includes/machine.h.in \
- includes/machine.h.vc \
- includes/Os_specific.h \
- includes/PARAMS.h \
+ includes/mode_exec.h \
  includes/PATH_MAX.h \
- includes/realmain.h \
- includes/returnanan.h \
- includes/returnProperty.h \
- includes/returnPropertyList.h \
  includes/SCIHOME.h \
  includes/scilabDefaults.h \
  includes/scilabmode.h \
@@@ -800,46 -803,18 +804,19 @@@ libscicore_la_xmldir = $(mydatadir)/xm
  libscicore_la_xml_DATA = xml/modules.dtd xml/version.dtd
  
  #### core : include files ####
- libscicore_la_includedir = $(pkgincludedir)/core
+ libscicore_la_includedir = $(pkgincludedir)
  libscicore_la_include_HEADERS = \
  includes/BOOL.h \
- includes/callFunctionFromGateway.h \
- includes/callinter.h \
- includes/callinterf.h \
- includes/commandwords.h \
  includes/core_math.h \
 -includes/doublecomplex.h \
 +includes/ExceptionMessage.h \
 +includes/existfunction.h \
  includes/freeArrayOfString.h \
- includes/Funtab.h \
  includes/getcommandlineargs.h \
- includes/GetExceptionCode.h \
- includes/getfunctionslist.h \
  includes/getmemory.h \
- includes/getmodules.h \
- includes/getvariablesname.h \
- includes/GetXmlFileEncoding.h \
- includes/gw_core.h \
- includes/gw_user.h \
- includes/gw_user2.h \
- includes/inffic.h \
- includes/inisci-c.h \
- includes/InitializeCore.h \
- includes/intmacr2tree.h \
- includes/isanan.h \
- includes/IsAScalar.h \
- includes/islittleendian.h \
- includes/loadversion.h \
+ includes/getos.h \
  includes/machine.h \
- includes/machine.h.in \
- includes/machine.h.vc \
- includes/Os_specific.h \
- includes/PARAMS.h \
+ includes/mode_exec.h \
  includes/PATH_MAX.h \
- includes/realmain.h \
- includes/returnanan.h \
- includes/returnProperty.h \
- includes/returnPropertyList.h \
  includes/SCIHOME.h \
  includes/scilabDefaults.h \
  includes/scilabmode.h \
Simple merge
@@@ -13,9 -13,9 +13,9 @@@
  #define SCI_VERSION_H
  
  #define SCI_VERSION_MAJOR 5
- #define SCI_VERSION_MINOR 2
+ #define SCI_VERSION_MINOR 3
  #define SCI_VERSION_MAINTENANCE 0
 -#define SCI_VERSION_STRING "scilab-branch-master"
 +#define SCI_VERSION_STRING "scilab-branch-sas"
  /* SCI_VERSION_REVISION --> hash key commit */
  #define SCI_VERSION_REVISION 0
  #define SCI_VERSION_TIMESTAMP 0
@@@ -44,8 -44,9 +44,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
 +                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes"
                                PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
Simple merge
Simple merge
Simple merge
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
 +                              AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../elementary_functions/includes;../../../operations/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
 +                              StringPooling="false"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="2"
 -                              InlineFunctionExpansion="1"
 -                              FavorSizeOrSpeed="1"
 -                              AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
 +                              AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../elementary_functions/includes;../../../operations/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@@ -44,8 -44,9 +44,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
 +                              AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../double/includes;../../../operations/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
 +                              AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
Simple merge
Simple merge
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../call_scilab/includes;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../fileio/includes;../../../windows_tools/includes"
 +                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../call_scilab/includes;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../fileio/includes;../../../windows_tools/includes;../../../operations/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FUNCTIONS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -36,7 -70,8 +70,9 @@@ libscihdf5_la_CXXFLAGS=       -I$(srcdir)/inc
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
 -                -I$(top_srcdir)/modules/jvm/includes/ \
 +                              -I$(top_srcdir)/modules/operations/includes \
++                              -I$(top_srcdir)/modules/jvm/includes/ \
+                               $(JAVA_JNI_INCLUDE) \
                                $(HDF5_CFLAGS)
  
  libscihdf5_la_CFLAGS=         -I$(srcdir)/includes/ \
@@@ -45,7 -80,7 +81,8 @@@
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/localization/includes \
 +                              -I$(top_srcdir)/modules/operations/includes \
+                               -I$(top_srcdir)/modules/fileio/includes \
                                $(HDF5_CFLAGS)
  
  
@@@ -414,7 -473,8 +474,9 @@@ libscihdf5_la_CXXFLAGS = -I$(srcdir)/in
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
 -                -I$(top_srcdir)/modules/jvm/includes/ \
 +                              -I$(top_srcdir)/modules/operations/includes \
++                              -I$(top_srcdir)/modules/jvm/includes/ \
+                               $(JAVA_JNI_INCLUDE) \
                                $(HDF5_CFLAGS)
  
  libscihdf5_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/localization/includes \
 +                              -I$(top_srcdir)/modules/operations/includes \
+                               -I$(top_srcdir)/modules/fileio/includes \
                                $(HDF5_CFLAGS)
  
  
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
++                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;_HDF5USEDLL_;WIN32"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
++                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;_HDF5USEDLL_;WIN32"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
++                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;_HDF5USEDLL_;WIN32"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
++                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;_HDF5USEDLL_;WIN32"
                                StringPooling="true"
                                RuntimeLibrary="2"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                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"
 +                              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"
                                PreprocessorDefinitions="_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
Simple merge
Simple merge
Simple merge
@@@ -428,10 -432,10 +432,11 @@@ libscijvm_la_CFLAGS = $(JAVA_JNI_INCLUD
                        -I$(top_srcdir)/modules/string/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/call_scilab/includes \
 -                      -I$(top_srcdir)/modules/fileio/includes/
 +                      -I$(top_srcdir)/modules/fileio/includes/ \
 +                      -I$(top_srcdir)/modules/operations/includes/
  
  pkglib_LTLIBRARIES = libscijvm-disable.la $(am__append_1)
+ @GUI_TRUE@USEANT = 1
  libscijvm_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) \
        -lpthread $(XML_LIBS) $(am__append_2)
  libscijvm_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes"
 +                              AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes;../../../operations/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;LINEAR_ALGEBRA_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@@ -131,9 -131,9 +131,9 @@@ if execstr('[U,S,V,rk]=svd([],'"e'")','
  A=rand(3,5);
  S=svd(A);
  if or(S<0) then pause,end
- if sort(S)<>S  then pause,end
+ if gsort(S)<>S  then pause,end
  
 -[U,S1]=svd(A);
 +[U,S1,V]=svd(A);
  if Err(S-diag(S1))>200*%eps  then pause,end
  if Err(U'*U-eye())>10*%eps  then pause,end
  
@@@ -162,9 -162,9 +162,9 @@@ A=rand(5,3)
  
  S=svd(A);
  if or(S<0) then pause,end
- if sort(S)<>S  then pause,end
+ if gsort(S)<>S  then pause,end
  
 -[U,S1]=svd(A);
 +[U,S1,V]=svd(A);
  if Err(S-diag(S1))>200*%eps  then pause,end
  if Err(U'*U-eye())>200*%eps  then pause,end
  
@@@ -192,9 -192,9 +192,9 @@@ if rk<>3 then pause,en
  A=rand(3,5)+%i*rand(3,5);
  S=svd(A);
  if or(S<0) then pause,end
- if sort(S)<>S  then pause,end
+ if gsort(S)<>S  then pause,end
  
 -[U,S1]=svd(A);
 +[U,S1,V]=svd(A);
  if Err(S-diag(S1))>200*%eps  then pause,end
  if Err(U'*U-eye())>200*%eps  then pause,end
  
@@@ -223,9 -223,9 +223,9 @@@ A=rand(5,3)+%i*rand(5,3)
  
  S=svd(A);
  if or(S<0) then pause,end
- if sort(S)<>S  then pause,end
+ if gsort(S)<>S  then pause,end
  
 -[U,S1]=svd(A);
 +[U,S1,V]=svd(A);
  if Err(S-diag(S1))>200*%eps  then pause,end
  if Err(U'*U-eye())>200*%eps  then pause,end
  
@@@ -255,9 -255,9 +255,9 @@@ if rk<>3 then pause,en
  A=rand(30,50);
  S=svd(A);
  if or(S<0) then pause,end
- if sort(S)<>S  then pause,end
+ if gsort(S)<>S  then pause,end
  
 -[U,S1]=svd(A);
 +[U,S1,V]=svd(A);
  if Err(S-diag(S1))>1000*%eps  then pause,end
  if Err(U'*U-eye())>1000*%eps  then pause,end
  
@@@ -286,9 -286,9 +286,9 @@@ A=rand(50,30)
  
  S=svd(A);
  if or(S<0) then pause,end
- if sort(S)<>S  then pause,end
+ if gsort(S)<>S  then pause,end
  
 -[U,S1]=svd(A);
 +[U,S1,V]=svd(A);
  if Err(S-diag(S1))>5000*%eps  then pause,end
  if Err(U'*U-eye())>5000*%eps  then pause,end
  
@@@ -316,9 -316,9 +316,9 @@@ if rk<>30 then pause,en
  A=rand(30,50)+%i*rand(30,50);
  S=svd(A);
  if or(S<0) then pause,end
- if sort(S)<>S  then pause,end
+ if gsort(S)<>S  then pause,end
  
 -[U,S1]=svd(A);
 +[U,S1,V]=svd(A);
  if Err(S-diag(S1))>5000*%eps  then pause,end
  if Err(U'*U-eye())>5000*%eps  then pause,end
  
@@@ -347,9 -347,9 +347,9 @@@ A=rand(50,30)+%i*rand(50,30)
  
  S=svd(A);
  if or(S<0) then pause,end
- if sort(S)<>S  then pause,end
+ if gsort(S)<>S  then pause,end
  
 -[U,S1]=svd(A);
 +[U,S1,V]=svd(A);
  if Err(S-diag(S1))>5000*%eps  then pause,end
  if Err(U'*U-eye())>5000*%eps  then pause,end
  
@@@ -407,20 -418,16 +418,17 @@@ sci_gateway/c/sci_getdefaultlanguage.c 
  sci_gateway/c/sci_getlanguage.c \
  sci_gateway/c/sci_setdefaultlanguage.c
  
- libscilocalization_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
-                               -I/sw/include \
-                               -I$(srcdir)/includes/ \
-                               -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -I$(top_srcdir)/modules/string/includes \
-                               -I$(top_srcdir)/modules/fileio/includes \
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/api_scilab/includes \
-                               -I$(top_srcdir)/modules/operations/includes
+ libscilocalization_la_CFLAGS = $(JAVA_JNI_INCLUDE) -I/sw/include \
+       -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/string/includes \
+       -I$(top_srcdir)/modules/fileio/includes \
++      -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/api_scilab/includes \
 -      -I$(top_srcdir)/modules/output_stream/includes $(am__append_4)
++      -I$(top_srcdir)/modules/operations/includes $(am__append_4)
  pkglib_LTLIBRARIES = libscilocalization.la
  libscilocalization_la_LDFLAGS = -version-info \
-       $(SCILAB_LIBRARY_VERSION) $(am__append_2)
+       $(SCILAB_LIBRARY_VERSION) $(am__append_3)
  libscilocalization_la_SOURCES = $(LOCALIZATION_C_SOURCES)  $(GATEWAY_C_SOURCES)
  
  # For the code check (splint)
Simple merge
Simple merge
Simple merge
Simple merge
index c8f25b0,0000000..8c82c2c
mode 100644,000000..100644
--- /dev/null
@@@ -1,1002 -1,0 +1,1010 @@@
 +# Makefile.in generated by automake 1.11 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
 +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.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 = $(install_sh) -d
++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@
 +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@
 +JOGL = @JOGL@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +LAPACK_LIBS = @LAPACK_LIBS@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +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@
 +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@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
 +SCICOS_ENABLE = @SCICOS_ENABLE@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
- SCIPAD_ENABLE = @SCIPAD_ENABLE@
 +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@
 +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@
- lt_ECHO = @lt_ECHO@
 +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)
 +
 +################ 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
 +      @COMMAND="test_run('$(modulename)');quit";\
 +      export LANG=C;\
 +      $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
 +check-code:
-       @if test -f build.xml; then \
++      if test -f build.xml; then \
 +              $(ANT) checkstyle; \
-       fi;\
-       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
++      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 ! -z "$(SWIG_WRAPPERS)"; then \
++@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 ! -z "$(GIWS_WRAPPERS)"; then \
++@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) --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
 +
 +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";\
-                       for specialExt in $(MACROSSPECIALEXT); do \
-                               specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
-                       done; \
-                       FILELIST="$$FILELIST $$specialExtDir"; \
++                      if test -n "$(MACROSSPECIALEXT)"; then \
++                              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
 +
 +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:
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes"
 +                              AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../operations/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -277,9 -274,10 +275,9 @@@ NO_SCICOS_C_SOURCES = src/c/noscicos/no
  libsciscicos_la_SOURCES = $(NO_SCICOS_C_SOURCES)
  
  libsciscicos_la_CFLAGS= -I$(top_srcdir)/modules/output_stream/includes \
 --I$(top_srcdir)/modules/api_scilab/includes \
  -I$(top_srcdir)/modules/scicos/includes
  
- libsciscicos_la_includedir=$(pkgincludedir)/scicos
+ libsciscicos_la_includedir=$(pkgincludedir)
  libsciscicos_la_include_HEADERS = src/c/noscicos/resource.h
  
  #### scicos : init scripts ####
Simple merge
@@@ -404,9 -410,19 +410,20 @@@ libsciscicos_blocks_la_CFLAGS= -I$(srcd
                        -I$(top_srcdir)/modules/renderer/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
                        -I$(top_srcdir)/modules/scicos/includes \
-                       -I$(top_srcdir)/modules/elementary_functions/includes \
 +                      -I$(top_srcdir)/modules/operations/includes
+                       -I$(top_srcdir)/modules/fileio/includes \
+                       -I$(top_srcdir)/modules/elementary_functions/includes
+ libsciscicos_blocks_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
+                       -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/jni/ \
+                       -I$(srcdir)/src/cpp/ \
+                       -I$(srcdir)/src/c/ \
+                       -I$(top_srcdir)/libs/MALLOC/includes/ \
+                       -I$(top_srcdir)/modules/jvm/includes/ \
+                       -I$(top_srcdir)/modules/output_stream/includes \
+                       -I$(top_srcdir)/modules/localization/includes \
+                       -I$(top_srcdir)/modules/api_scilab/includes
  
  libsciscicos_blocks_la_SOURCES = $(SCICOS_BLOCKS_C_SOURCES) \
  $(SCICOS_BLOCKS_FORTRAN_SOURCES) \
@@@ -1297,9 -1317,20 +1317,19 @@@ HELP_CHAPTERLANG = en_US fr_FR pt_B
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/renderer/includes/ \
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/output_stream/includes \
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/scicos/includes \
- @SCICOS_TRUE@                 -I$(top_srcdir)/modules/elementary_functions/includes \
 -@SCICOS_TRUE@                 -I$(top_srcdir)/modules/fileio/includes \
 -@SCICOS_TRUE@                 -I$(top_srcdir)/modules/elementary_functions/includes
 +@SCICOS_TRUE@                 -I$(top_srcdir)/modules/operations/includes
  
+ @SCICOS_TRUE@libsciscicos_blocks_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
+ @SCICOS_TRUE@                 -I$(srcdir)/includes/ \
+ @SCICOS_TRUE@                 -I$(srcdir)/src/jni/ \
+ @SCICOS_TRUE@                 -I$(srcdir)/src/cpp/ \
+ @SCICOS_TRUE@                 -I$(srcdir)/src/c/ \
+ @SCICOS_TRUE@                 -I$(top_srcdir)/libs/MALLOC/includes/ \
+ @SCICOS_TRUE@                 -I$(top_srcdir)/modules/jvm/includes/ \
+ @SCICOS_TRUE@                 -I$(top_srcdir)/modules/output_stream/includes \
+ @SCICOS_TRUE@                 -I$(top_srcdir)/modules/localization/includes \
+ @SCICOS_TRUE@                 -I$(top_srcdir)/modules/api_scilab/includes
  @SCICOS_FALSE@libsciscicos_blocks_la_SOURCES = 
  @SCICOS_TRUE@libsciscicos_blocks_la_SOURCES = $(SCICOS_BLOCKS_C_SOURCES) \
  @SCICOS_TRUE@$(SCICOS_BLOCKS_FORTRAN_SOURCES) \
@@@ -4552,6 -4875,6 +4874,8 @@@ distclean-local
        rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_*
  
  .PHONY: macros java swig giws
++@SCICOS_TRUE@                 -I$(top_srcdir)/modules/fileio/includes \
++@SCICOS_TRUE@                 -I$(top_srcdir)/modules/elementary_functions/includes
  
  @SCICOS_TRUE@build/Cblocknames:Makefile.am
  @SCICOS_TRUE@ @echo "-- Generates build/Cblocknames --"
Simple merge
Simple merge
  ##########
  
  
 +
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@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
@@@ -88,9 -104,7 +106,8 @@@ am__base_list = 
  am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscisignal_processing_la_etcdir)" \
        "$(DESTDIR)$(libscisignal_processing_la_rootdir)" \
 -      "$(DESTDIR)$(libscisignal_processing_la_sci_gatewaydir)"
 +      "$(DESTDIR)$(libscisignal_processing_la_sci_gatewaydir)" \
 +      "$(DESTDIR)$(libscisignal_processing_la_includedir)"
- pkglibLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(pkglib_LTLIBRARIES)
  libscisignal_processing_la_DEPENDENCIES = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
@@@ -150,11 -169,6 +168,7 @@@ DIST_SOURCES = $(libscisignal_processin
  DATA = $(libscisignal_processing_la_etc_DATA) \
        $(libscisignal_processing_la_root_DATA) \
        $(libscisignal_processing_la_sci_gateway_DATA)
- libscisignal_processing_la_includeHEADERS_INSTALL = $(INSTALL_HEADER)
 +HEADERS = $(libscisignal_processing_la_include_HEADERS)
  ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -661,67 -693,81 +685,67 @@@ distclean-compile
  @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
  
  libscisignal_processing_la-corrtable.lo: src/c/corrtable.c
- @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-corrtable.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-corrtable.Tpo -c -o libscisignal_processing_la-corrtable.lo `test -f 'src/c/corrtable.c' || echo '$(srcdir)/'`src/c/corrtable.c
- @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libscisignal_processing_la-corrtable.Tpo $(DEPDIR)/libscisignal_processing_la-corrtable.Plo
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-corrtable.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-corrtable.Tpo -c -o libscisignal_processing_la-corrtable.lo `test -f 'src/c/corrtable.c' || echo '$(srcdir)/'`src/c/corrtable.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscisignal_processing_la-corrtable.Tpo $(DEPDIR)/libscisignal_processing_la-corrtable.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/corrtable.c' object='libscisignal_processing_la-corrtable.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) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-corrtable.lo `test -f 'src/c/corrtable.c' || echo '$(srcdir)/'`src/c/corrtable.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-corrtable.lo `test -f 'src/c/corrtable.c' || echo '$(srcdir)/'`src/c/corrtable.c
  
  libscisignal_processing_la-sci_remez.lo: sci_gateway/c/sci_remez.c
- @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_remez.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_remez.Tpo -c -o libscisignal_processing_la-sci_remez.lo `test -f 'sci_gateway/c/sci_remez.c' || echo '$(srcdir)/'`sci_gateway/c/sci_remez.c
- @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libscisignal_processing_la-sci_remez.Tpo $(DEPDIR)/libscisignal_processing_la-sci_remez.Plo
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_remez.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_remez.Tpo -c -o libscisignal_processing_la-sci_remez.lo `test -f 'sci_gateway/c/sci_remez.c' || echo '$(srcdir)/'`sci_gateway/c/sci_remez.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscisignal_processing_la-sci_remez.Tpo $(DEPDIR)/libscisignal_processing_la-sci_remez.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_remez.c' object='libscisignal_processing_la-sci_remez.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) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_remez.lo `test -f 'sci_gateway/c/sci_remez.c' || echo '$(srcdir)/'`sci_gateway/c/sci_remez.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_remez.lo `test -f 'sci_gateway/c/sci_remez.c' || echo '$(srcdir)/'`sci_gateway/c/sci_remez.c
  
  libscisignal_processing_la-sci_rpem.lo: sci_gateway/c/sci_rpem.c
- @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_rpem.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_rpem.Tpo -c -o libscisignal_processing_la-sci_rpem.lo `test -f 'sci_gateway/c/sci_rpem.c' || echo '$(srcdir)/'`sci_gateway/c/sci_rpem.c
- @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libscisignal_processing_la-sci_rpem.Tpo $(DEPDIR)/libscisignal_processing_la-sci_rpem.Plo
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_rpem.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_rpem.Tpo -c -o libscisignal_processing_la-sci_rpem.lo `test -f 'sci_gateway/c/sci_rpem.c' || echo '$(srcdir)/'`sci_gateway/c/sci_rpem.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscisignal_processing_la-sci_rpem.Tpo $(DEPDIR)/libscisignal_processing_la-sci_rpem.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_rpem.c' object='libscisignal_processing_la-sci_rpem.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) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_rpem.lo `test -f 'sci_gateway/c/sci_rpem.c' || echo '$(srcdir)/'`sci_gateway/c/sci_rpem.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_rpem.lo `test -f 'sci_gateway/c/sci_rpem.c' || echo '$(srcdir)/'`sci_gateway/c/sci_rpem.c
  
  libscisignal_processing_la-sci_corr.lo: sci_gateway/c/sci_corr.c
- @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_corr.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_corr.Tpo -c -o libscisignal_processing_la-sci_corr.lo `test -f 'sci_gateway/c/sci_corr.c' || echo '$(srcdir)/'`sci_gateway/c/sci_corr.c
- @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libscisignal_processing_la-sci_corr.Tpo $(DEPDIR)/libscisignal_processing_la-sci_corr.Plo
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_corr.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_corr.Tpo -c -o libscisignal_processing_la-sci_corr.lo `test -f 'sci_gateway/c/sci_corr.c' || echo '$(srcdir)/'`sci_gateway/c/sci_corr.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscisignal_processing_la-sci_corr.Tpo $(DEPDIR)/libscisignal_processing_la-sci_corr.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_corr.c' object='libscisignal_processing_la-sci_corr.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) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_corr.lo `test -f 'sci_gateway/c/sci_corr.c' || echo '$(srcdir)/'`sci_gateway/c/sci_corr.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_corr.lo `test -f 'sci_gateway/c/sci_corr.c' || echo '$(srcdir)/'`sci_gateway/c/sci_corr.c
  
 -libscisignal_processing_la-sci_ffir.lo: sci_gateway/c/sci_ffir.c
 -@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_ffir.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_ffir.Tpo -c -o libscisignal_processing_la-sci_ffir.lo `test -f 'sci_gateway/c/sci_ffir.c' || echo '$(srcdir)/'`sci_gateway/c/sci_ffir.c
 -@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscisignal_processing_la-sci_ffir.Tpo $(DEPDIR)/libscisignal_processing_la-sci_ffir.Plo
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_ffir.c' object='libscisignal_processing_la-sci_ffir.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) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_ffir.lo `test -f 'sci_gateway/c/sci_ffir.c' || echo '$(srcdir)/'`sci_gateway/c/sci_ffir.c
 -
 -libscisignal_processing_la-sci_fiir.lo: sci_gateway/c/sci_fiir.c
 -@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_fiir.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_fiir.Tpo -c -o libscisignal_processing_la-sci_fiir.lo `test -f 'sci_gateway/c/sci_fiir.c' || echo '$(srcdir)/'`sci_gateway/c/sci_fiir.c
 -@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscisignal_processing_la-sci_fiir.Tpo $(DEPDIR)/libscisignal_processing_la-sci_fiir.Plo
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_fiir.c' object='libscisignal_processing_la-sci_fiir.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) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_fiir.lo `test -f 'sci_gateway/c/sci_fiir.c' || echo '$(srcdir)/'`sci_gateway/c/sci_fiir.c
 -
  libscisignal_processing_la-sci_amell.lo: sci_gateway/c/sci_amell.c
- @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_amell.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_amell.Tpo -c -o libscisignal_processing_la-sci_amell.lo `test -f 'sci_gateway/c/sci_amell.c' || echo '$(srcdir)/'`sci_gateway/c/sci_amell.c
- @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libscisignal_processing_la-sci_amell.Tpo $(DEPDIR)/libscisignal_processing_la-sci_amell.Plo
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_amell.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_amell.Tpo -c -o libscisignal_processing_la-sci_amell.lo `test -f 'sci_gateway/c/sci_amell.c' || echo '$(srcdir)/'`sci_gateway/c/sci_amell.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscisignal_processing_la-sci_amell.Tpo $(DEPDIR)/libscisignal_processing_la-sci_amell.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_amell.c' object='libscisignal_processing_la-sci_amell.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) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_amell.lo `test -f 'sci_gateway/c/sci_amell.c' || echo '$(srcdir)/'`sci_gateway/c/sci_amell.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_amell.lo `test -f 'sci_gateway/c/sci_amell.c' || echo '$(srcdir)/'`sci_gateway/c/sci_amell.c
  
  libscisignal_processing_la-gw_signal.lo: sci_gateway/c/gw_signal.c
- @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-gw_signal.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-gw_signal.Tpo -c -o libscisignal_processing_la-gw_signal.lo `test -f 'sci_gateway/c/gw_signal.c' || echo '$(srcdir)/'`sci_gateway/c/gw_signal.c
- @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libscisignal_processing_la-gw_signal.Tpo $(DEPDIR)/libscisignal_processing_la-gw_signal.Plo
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-gw_signal.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-gw_signal.Tpo -c -o libscisignal_processing_la-gw_signal.lo `test -f 'sci_gateway/c/gw_signal.c' || echo '$(srcdir)/'`sci_gateway/c/gw_signal.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscisignal_processing_la-gw_signal.Tpo $(DEPDIR)/libscisignal_processing_la-gw_signal.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/gw_signal.c' object='libscisignal_processing_la-gw_signal.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) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-gw_signal.lo `test -f 'sci_gateway/c/gw_signal.c' || echo '$(srcdir)/'`sci_gateway/c/gw_signal.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-gw_signal.lo `test -f 'sci_gateway/c/gw_signal.c' || echo '$(srcdir)/'`sci_gateway/c/gw_signal.c
  
  libscisignal_processing_la-sci_delip.lo: sci_gateway/c/sci_delip.c
- @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_delip.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_delip.Tpo -c -o libscisignal_processing_la-sci_delip.lo `test -f 'sci_gateway/c/sci_delip.c' || echo '$(srcdir)/'`sci_gateway/c/sci_delip.c
- @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libscisignal_processing_la-sci_delip.Tpo $(DEPDIR)/libscisignal_processing_la-sci_delip.Plo
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_delip.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_delip.Tpo -c -o libscisignal_processing_la-sci_delip.lo `test -f 'sci_gateway/c/sci_delip.c' || echo '$(srcdir)/'`sci_gateway/c/sci_delip.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscisignal_processing_la-sci_delip.Tpo $(DEPDIR)/libscisignal_processing_la-sci_delip.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_delip.c' object='libscisignal_processing_la-sci_delip.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) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_delip.lo `test -f 'sci_gateway/c/sci_delip.c' || echo '$(srcdir)/'`sci_gateway/c/sci_delip.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_delip.lo `test -f 'sci_gateway/c/sci_delip.c' || echo '$(srcdir)/'`sci_gateway/c/sci_delip.c
  
  libscisignal_processing_la-sci_fft.lo: sci_gateway/c/sci_fft.c
- @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_fft.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_fft.Tpo -c -o libscisignal_processing_la-sci_fft.lo `test -f 'sci_gateway/c/sci_fft.c' || echo '$(srcdir)/'`sci_gateway/c/sci_fft.c
- @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libscisignal_processing_la-sci_fft.Tpo $(DEPDIR)/libscisignal_processing_la-sci_fft.Plo
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_fft.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_fft.Tpo -c -o libscisignal_processing_la-sci_fft.lo `test -f 'sci_gateway/c/sci_fft.c' || echo '$(srcdir)/'`sci_gateway/c/sci_fft.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscisignal_processing_la-sci_fft.Tpo $(DEPDIR)/libscisignal_processing_la-sci_fft.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_fft.c' object='libscisignal_processing_la-sci_fft.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) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_fft.lo `test -f 'sci_gateway/c/sci_fft.c' || echo '$(srcdir)/'`sci_gateway/c/sci_fft.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_fft.lo `test -f 'sci_gateway/c/sci_fft.c' || echo '$(srcdir)/'`sci_gateway/c/sci_fft.c
  
  libscisignal_processing_la-sci_syredi.lo: sci_gateway/c/sci_syredi.c
- @am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_syredi.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_syredi.Tpo -c -o libscisignal_processing_la-sci_syredi.lo `test -f 'sci_gateway/c/sci_syredi.c' || echo '$(srcdir)/'`sci_gateway/c/sci_syredi.c
- @am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libscisignal_processing_la-sci_syredi.Tpo $(DEPDIR)/libscisignal_processing_la-sci_syredi.Plo
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -MT libscisignal_processing_la-sci_syredi.lo -MD -MP -MF $(DEPDIR)/libscisignal_processing_la-sci_syredi.Tpo -c -o libscisignal_processing_la-sci_syredi.lo `test -f 'sci_gateway/c/sci_syredi.c' || echo '$(srcdir)/'`sci_gateway/c/sci_syredi.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscisignal_processing_la-sci_syredi.Tpo $(DEPDIR)/libscisignal_processing_la-sci_syredi.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_syredi.c' object='libscisignal_processing_la-sci_syredi.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) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_syredi.lo `test -f 'sci_gateway/c/sci_syredi.c' || echo '$(srcdir)/'`sci_gateway/c/sci_syredi.c
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscisignal_processing_la_CFLAGS) $(CFLAGS) -c -o libscisignal_processing_la-sci_syredi.lo `test -f 'sci_gateway/c/sci_syredi.c' || echo '$(srcdir)/'`sci_gateway/c/sci_syredi.c
  
  .f.o:
        $(F77COMPILE) -c -o $@ $<
  .f.lo:
        $(LTF77COMPILE) -c -o $@ $<
  
 -sci_ffir.lo: src/fortran/sci_ffir.f
 -      $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sci_ffir.lo `test -f 'src/fortran/sci_ffir.f' || echo '$(srcdir)/'`src/fortran/sci_ffir.f
 -
  degree.lo: src/fortran/degree.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o degree.lo `test -f 'src/fortran/degree.f' || echo '$(srcdir)/'`src/fortran/degree.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o degree.lo `test -f 'src/fortran/degree.f' || echo '$(srcdir)/'`src/fortran/degree.f
  
  parcha.lo: src/fortran/parcha.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o parcha.lo `test -f 'src/fortran/parcha.f' || echo '$(srcdir)/'`src/fortran/parcha.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o parcha.lo `test -f 'src/fortran/parcha.f' || echo '$(srcdir)/'`src/fortran/parcha.f
  
  ouch.lo: src/fortran/ouch.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o ouch.lo `test -f 'src/fortran/ouch.f' || echo '$(srcdir)/'`src/fortran/ouch.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o ouch.lo `test -f 'src/fortran/ouch.f' || echo '$(srcdir)/'`src/fortran/ouch.f
  
  dfftbi.lo: src/fortran/dfftbi.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dfftbi.lo `test -f 'src/fortran/dfftbi.f' || echo '$(srcdir)/'`src/fortran/dfftbi.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dfftbi.lo `test -f 'src/fortran/dfftbi.f' || echo '$(srcdir)/'`src/fortran/dfftbi.f
  
  dsqrtc.lo: src/fortran/dsqrtc.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dsqrtc.lo `test -f 'src/fortran/dsqrtc.f' || echo '$(srcdir)/'`src/fortran/dsqrtc.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dsqrtc.lo `test -f 'src/fortran/dsqrtc.f' || echo '$(srcdir)/'`src/fortran/dsqrtc.f
  
  tranze.lo: src/fortran/tranze.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o tranze.lo `test -f 'src/fortran/tranze.f' || echo '$(srcdir)/'`src/fortran/tranze.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o tranze.lo `test -f 'src/fortran/tranze.f' || echo '$(srcdir)/'`src/fortran/tranze.f
  
  chebc.lo: src/fortran/chebc.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o chebc.lo `test -f 'src/fortran/chebc.f' || echo '$(srcdir)/'`src/fortran/chebc.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o chebc.lo `test -f 'src/fortran/chebc.f' || echo '$(srcdir)/'`src/fortran/chebc.f
  
  tscccf.lo: src/fortran/tscccf.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o tscccf.lo `test -f 'src/fortran/tscccf.f' || echo '$(srcdir)/'`src/fortran/tscccf.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o tscccf.lo `test -f 'src/fortran/tscccf.f' || echo '$(srcdir)/'`src/fortran/tscccf.f
  
  dsn2.lo: src/fortran/dsn2.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dsn2.lo `test -f 'src/fortran/dsn2.f' || echo '$(srcdir)/'`src/fortran/dsn2.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dsn2.lo `test -f 'src/fortran/dsn2.f' || echo '$(srcdir)/'`src/fortran/dsn2.f
  
  hammin.lo: src/fortran/hammin.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o hammin.lo `test -f 'src/fortran/hammin.f' || echo '$(srcdir)/'`src/fortran/hammin.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o hammin.lo `test -f 'src/fortran/hammin.f' || echo '$(srcdir)/'`src/fortran/hammin.f
  
  bounn.lo: src/fortran/bounn.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o bounn.lo `test -f 'src/fortran/bounn.f' || echo '$(srcdir)/'`src/fortran/bounn.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o bounn.lo `test -f 'src/fortran/bounn.f' || echo '$(srcdir)/'`src/fortran/bounn.f
  
  nstabl.lo: src/fortran/nstabl.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o nstabl.lo `test -f 'src/fortran/nstabl.f' || echo '$(srcdir)/'`src/fortran/nstabl.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o nstabl.lo `test -f 'src/fortran/nstabl.f' || echo '$(srcdir)/'`src/fortran/nstabl.f
  
  ino.lo: src/fortran/ino.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o ino.lo `test -f 'src/fortran/ino.f' || echo '$(srcdir)/'`src/fortran/ino.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o ino.lo `test -f 'src/fortran/ino.f' || echo '$(srcdir)/'`src/fortran/ino.f
  
  desia.lo: src/fortran/desia.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desia.lo `test -f 'src/fortran/desia.f' || echo '$(srcdir)/'`src/fortran/desia.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desia.lo `test -f 'src/fortran/desia.f' || echo '$(srcdir)/'`src/fortran/desia.f
  
  desi11.lo: src/fortran/desi11.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi11.lo `test -f 'src/fortran/desi11.f' || echo '$(srcdir)/'`src/fortran/desi11.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi11.lo `test -f 'src/fortran/desi11.f' || echo '$(srcdir)/'`src/fortran/desi11.f
  
  cmpse3.lo: src/fortran/cmpse3.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o cmpse3.lo `test -f 'src/fortran/cmpse3.f' || echo '$(srcdir)/'`src/fortran/cmpse3.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o cmpse3.lo `test -f 'src/fortran/cmpse3.f' || echo '$(srcdir)/'`src/fortran/cmpse3.f
  
  cheby.lo: src/fortran/cheby.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o cheby.lo `test -f 'src/fortran/cheby.f' || echo '$(srcdir)/'`src/fortran/cheby.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o cheby.lo `test -f 'src/fortran/cheby.f' || echo '$(srcdir)/'`src/fortran/cheby.f
  
  trbize.lo: src/fortran/trbize.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o trbize.lo `test -f 'src/fortran/trbize.f' || echo '$(srcdir)/'`src/fortran/trbize.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o trbize.lo `test -f 'src/fortran/trbize.f' || echo '$(srcdir)/'`src/fortran/trbize.f
  
  r2tx.lo: src/fortran/r2tx.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o r2tx.lo `test -f 'src/fortran/r2tx.f' || echo '$(srcdir)/'`src/fortran/r2tx.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o r2tx.lo `test -f 'src/fortran/r2tx.f' || echo '$(srcdir)/'`src/fortran/r2tx.f
  
  deli2.lo: src/fortran/deli2.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o deli2.lo `test -f 'src/fortran/deli2.f' || echo '$(srcdir)/'`src/fortran/deli2.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o deli2.lo `test -f 'src/fortran/deli2.f' || echo '$(srcdir)/'`src/fortran/deli2.f
  
  gee.lo: src/fortran/gee.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o gee.lo `test -f 'src/fortran/gee.f' || echo '$(srcdir)/'`src/fortran/gee.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o gee.lo `test -f 'src/fortran/gee.f' || echo '$(srcdir)/'`src/fortran/gee.f
  
  r4tx.lo: src/fortran/r4tx.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o r4tx.lo `test -f 'src/fortran/r4tx.f' || echo '$(srcdir)/'`src/fortran/r4tx.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o r4tx.lo `test -f 'src/fortran/r4tx.f' || echo '$(srcdir)/'`src/fortran/r4tx.f
  
  transn.lo: src/fortran/transn.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o transn.lo `test -f 'src/fortran/transn.f' || echo '$(srcdir)/'`src/fortran/transn.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o transn.lo `test -f 'src/fortran/transn.f' || echo '$(srcdir)/'`src/fortran/transn.f
  
  r8tx.lo: src/fortran/r8tx.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o r8tx.lo `test -f 'src/fortran/r8tx.f' || echo '$(srcdir)/'`src/fortran/r8tx.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o r8tx.lo `test -f 'src/fortran/r8tx.f' || echo '$(srcdir)/'`src/fortran/r8tx.f
  
  kaiser.lo: src/fortran/kaiser.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o kaiser.lo `test -f 'src/fortran/kaiser.f' || echo '$(srcdir)/'`src/fortran/kaiser.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o kaiser.lo `test -f 'src/fortran/kaiser.f' || echo '$(srcdir)/'`src/fortran/kaiser.f
  
  deli11.lo: src/fortran/deli11.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o deli11.lo `test -f 'src/fortran/deli11.f' || echo '$(srcdir)/'`src/fortran/deli11.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o deli11.lo `test -f 'src/fortran/deli11.f' || echo '$(srcdir)/'`src/fortran/deli11.f
  
  compel.lo: src/fortran/compel.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o compel.lo `test -f 'src/fortran/compel.f' || echo '$(srcdir)/'`src/fortran/compel.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o compel.lo `test -f 'src/fortran/compel.f' || echo '$(srcdir)/'`src/fortran/compel.f
  
  filbut.lo: src/fortran/filbut.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o filbut.lo `test -f 'src/fortran/filbut.f' || echo '$(srcdir)/'`src/fortran/filbut.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o filbut.lo `test -f 'src/fortran/filbut.f' || echo '$(srcdir)/'`src/fortran/filbut.f
  
  desi01.lo: src/fortran/desi01.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi01.lo `test -f 'src/fortran/desi01.f' || echo '$(srcdir)/'`src/fortran/desi01.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi01.lo `test -f 'src/fortran/desi01.f' || echo '$(srcdir)/'`src/fortran/desi01.f
  
  desi22.lo: src/fortran/desi22.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi22.lo `test -f 'src/fortran/desi22.f' || echo '$(srcdir)/'`src/fortran/desi22.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi22.lo `test -f 'src/fortran/desi22.f' || echo '$(srcdir)/'`src/fortran/desi22.f
  
  amell.lo: src/fortran/amell.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o amell.lo `test -f 'src/fortran/amell.f' || echo '$(srcdir)/'`src/fortran/amell.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o amell.lo `test -f 'src/fortran/amell.f' || echo '$(srcdir)/'`src/fortran/amell.f
  
  desi24.lo: src/fortran/desi24.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi24.lo `test -f 'src/fortran/desi24.f' || echo '$(srcdir)/'`src/fortran/desi24.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi24.lo `test -f 'src/fortran/desi24.f' || echo '$(srcdir)/'`src/fortran/desi24.f
  
  dellk.lo: src/fortran/dellk.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dellk.lo `test -f 'src/fortran/dellk.f' || echo '$(srcdir)/'`src/fortran/dellk.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dellk.lo `test -f 'src/fortran/dellk.f' || echo '$(srcdir)/'`src/fortran/dellk.f
  
  syredi.lo: src/fortran/syredi.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o syredi.lo `test -f 'src/fortran/syredi.f' || echo '$(srcdir)/'`src/fortran/syredi.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o syredi.lo `test -f 'src/fortran/syredi.f' || echo '$(srcdir)/'`src/fortran/syredi.f
  
  dpspln.lo: src/fortran/dpspln.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dpspln.lo `test -f 'src/fortran/dpspln.f' || echo '$(srcdir)/'`src/fortran/dpspln.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dpspln.lo `test -f 'src/fortran/dpspln.f' || echo '$(srcdir)/'`src/fortran/dpspln.f
  
  coeft.lo: src/fortran/coeft.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o coeft.lo `test -f 'src/fortran/coeft.f' || echo '$(srcdir)/'`src/fortran/coeft.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o coeft.lo `test -f 'src/fortran/coeft.f' || echo '$(srcdir)/'`src/fortran/coeft.f
  
  tranpo.lo: src/fortran/tranpo.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o tranpo.lo `test -f 'src/fortran/tranpo.f' || echo '$(srcdir)/'`src/fortran/tranpo.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o tranpo.lo `test -f 'src/fortran/tranpo.f' || echo '$(srcdir)/'`src/fortran/tranpo.f
  
  blnumz.lo: src/fortran/blnumz.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o blnumz.lo `test -f 'src/fortran/blnumz.f' || echo '$(srcdir)/'`src/fortran/blnumz.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o blnumz.lo `test -f 'src/fortran/blnumz.f' || echo '$(srcdir)/'`src/fortran/blnumz.f
  
  sn.lo: src/fortran/sn.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sn.lo `test -f 'src/fortran/sn.f' || echo '$(srcdir)/'`src/fortran/sn.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sn.lo `test -f 'src/fortran/sn.f' || echo '$(srcdir)/'`src/fortran/sn.f
  
  bldenz.lo: src/fortran/bldenz.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o bldenz.lo `test -f 'src/fortran/bldenz.f' || echo '$(srcdir)/'`src/fortran/bldenz.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o bldenz.lo `test -f 'src/fortran/bldenz.f' || echo '$(srcdir)/'`src/fortran/bldenz.f
  
  dspln.lo: src/fortran/dspln.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dspln.lo `test -f 'src/fortran/dspln.f' || echo '$(srcdir)/'`src/fortran/dspln.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dspln.lo `test -f 'src/fortran/dspln.f' || echo '$(srcdir)/'`src/fortran/dspln.f
  
  belan.lo: src/fortran/belan.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o belan.lo `test -f 'src/fortran/belan.f' || echo '$(srcdir)/'`src/fortran/belan.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o belan.lo `test -f 'src/fortran/belan.f' || echo '$(srcdir)/'`src/fortran/belan.f
  
  desib.lo: src/fortran/desib.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desib.lo `test -f 'src/fortran/desib.f' || echo '$(srcdir)/'`src/fortran/desib.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desib.lo `test -f 'src/fortran/desib.f' || echo '$(srcdir)/'`src/fortran/desib.f
  
  freque.lo: src/fortran/freque.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o freque.lo `test -f 'src/fortran/freque.f' || echo '$(srcdir)/'`src/fortran/freque.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o freque.lo `test -f 'src/fortran/freque.f' || echo '$(srcdir)/'`src/fortran/freque.f
  
  desi12.lo: src/fortran/desi12.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi12.lo `test -f 'src/fortran/desi12.f' || echo '$(srcdir)/'`src/fortran/desi12.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi12.lo `test -f 'src/fortran/desi12.f' || echo '$(srcdir)/'`src/fortran/desi12.f
  
  cmpse2.lo: src/fortran/cmpse2.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o cmpse2.lo `test -f 'src/fortran/cmpse2.f' || echo '$(srcdir)/'`src/fortran/cmpse2.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o cmpse2.lo `test -f 'src/fortran/cmpse2.f' || echo '$(srcdir)/'`src/fortran/cmpse2.f
  
  desi14.lo: src/fortran/desi14.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi14.lo `test -f 'src/fortran/desi14.f' || echo '$(srcdir)/'`src/fortran/desi14.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi14.lo `test -f 'src/fortran/desi14.f' || echo '$(srcdir)/'`src/fortran/desi14.f
  
  delip.lo: src/fortran/delip.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o delip.lo `test -f 'src/fortran/delip.f' || echo '$(srcdir)/'`src/fortran/delip.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o delip.lo `test -f 'src/fortran/delip.f' || echo '$(srcdir)/'`src/fortran/delip.f
  
  deli1.lo: src/fortran/deli1.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o deli1.lo `test -f 'src/fortran/deli1.f' || echo '$(srcdir)/'`src/fortran/deli1.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o deli1.lo `test -f 'src/fortran/deli1.f' || echo '$(srcdir)/'`src/fortran/deli1.f
  
  trbipo.lo: src/fortran/trbipo.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o trbipo.lo `test -f 'src/fortran/trbipo.f' || echo '$(srcdir)/'`src/fortran/trbipo.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o trbipo.lo `test -f 'src/fortran/trbipo.f' || echo '$(srcdir)/'`src/fortran/trbipo.f
  
  rpem.lo: src/fortran/rpem.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o rpem.lo `test -f 'src/fortran/rpem.f' || echo '$(srcdir)/'`src/fortran/rpem.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o rpem.lo `test -f 'src/fortran/rpem.f' || echo '$(srcdir)/'`src/fortran/rpem.f
  
  dfft2.lo: src/fortran/dfft2.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dfft2.lo `test -f 'src/fortran/dfft2.f' || echo '$(srcdir)/'`src/fortran/dfft2.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dfft2.lo `test -f 'src/fortran/dfft2.f' || echo '$(srcdir)/'`src/fortran/dfft2.f
  
  dgee01.lo: src/fortran/dgee01.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dgee01.lo `test -f 'src/fortran/dgee01.f' || echo '$(srcdir)/'`src/fortran/dgee01.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dgee01.lo `test -f 'src/fortran/dgee01.f' || echo '$(srcdir)/'`src/fortran/dgee01.f
  
  romeg.lo: src/fortran/romeg.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o romeg.lo `test -f 'src/fortran/romeg.f' || echo '$(srcdir)/'`src/fortran/romeg.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o romeg.lo `test -f 'src/fortran/romeg.f' || echo '$(srcdir)/'`src/fortran/romeg.f
  
  snell.lo: src/fortran/snell.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o snell.lo `test -f 'src/fortran/snell.f' || echo '$(srcdir)/'`src/fortran/snell.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o snell.lo `test -f 'src/fortran/snell.f' || echo '$(srcdir)/'`src/fortran/snell.f
  
  fft842.lo: src/fortran/fft842.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o fft842.lo `test -f 'src/fortran/fft842.f' || echo '$(srcdir)/'`src/fortran/fft842.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o fft842.lo `test -f 'src/fortran/fft842.f' || echo '$(srcdir)/'`src/fortran/fft842.f
  
  tg02ad.lo: src/fortran/tg02ad.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o tg02ad.lo `test -f 'src/fortran/tg02ad.f' || echo '$(srcdir)/'`src/fortran/tg02ad.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o tg02ad.lo `test -f 'src/fortran/tg02ad.f' || echo '$(srcdir)/'`src/fortran/tg02ad.f
  
  remez.lo: src/fortran/remez.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o remez.lo `test -f 'src/fortran/remez.f' || echo '$(srcdir)/'`src/fortran/remez.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o remez.lo `test -f 'src/fortran/remez.f' || echo '$(srcdir)/'`src/fortran/remez.f
  
  poles.lo: src/fortran/poles.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o poles.lo `test -f 'src/fortran/poles.f' || echo '$(srcdir)/'`src/fortran/poles.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o poles.lo `test -f 'src/fortran/poles.f' || echo '$(srcdir)/'`src/fortran/poles.f
  
  desi00.lo: src/fortran/desi00.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi00.lo `test -f 'src/fortran/desi00.f' || echo '$(srcdir)/'`src/fortran/desi00.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi00.lo `test -f 'src/fortran/desi00.f' || echo '$(srcdir)/'`src/fortran/desi00.f
  
  desi21.lo: src/fortran/desi21.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi21.lo `test -f 'src/fortran/desi21.f' || echo '$(srcdir)/'`src/fortran/desi21.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o desi21.lo `test -f 'src/fortran/desi21.f' || echo '$(srcdir)/'`src/fortran/desi21.f
  
  dfftmx.lo: src/fortran/dfftmx.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dfftmx.lo `test -f 'src/fortran/dfftmx.f' || echo '$(srcdir)/'`src/fortran/dfftmx.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o dfftmx.lo `test -f 'src/fortran/dfftmx.f' || echo '$(srcdir)/'`src/fortran/dfftmx.f
  
 -sci_delip.lo: sci_gateway/fortran/sci_delip.f
 -      $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sci_delip.lo `test -f 'sci_gateway/fortran/sci_delip.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_delip.f
 -
 -sci_fft.lo: sci_gateway/fortran/sci_fft.f
 -      $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sci_fft.lo `test -f 'sci_gateway/fortran/sci_fft.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_fft.f
 -
 -sci_syredi.lo: sci_gateway/fortran/sci_syredi.f
 -      $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sci_syredi.lo `test -f 'sci_gateway/fortran/sci_syredi.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_syredi.f
 -
 -sci_remez.lo: sci_gateway/fortran/sci_remez.f
 -      $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sci_remez.lo `test -f 'sci_gateway/fortran/sci_remez.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_remez.f
 -
 -sci_rpem.lo: sci_gateway/fortran/sci_rpem.f
 -      $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sci_rpem.lo `test -f 'sci_gateway/fortran/sci_rpem.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_rpem.f
 -
 -sci_corr.lo: sci_gateway/fortran/sci_corr.f
 -      $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sci_corr.lo `test -f 'sci_gateway/fortran/sci_corr.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_corr.f
 -
 -sci_fiir.lo: sci_gateway/fortran/sci_fiir.f
 -      $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sci_fiir.lo `test -f 'sci_gateway/fortran/sci_fiir.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_fiir.f
 -
 -sci_amell.lo: sci_gateway/fortran/sci_amell.f
 -      $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sci_amell.lo `test -f 'sci_gateway/fortran/sci_amell.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_amell.f
 -
  bgetx.lo: sci_gateway/fortran/bgetx.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o bgetx.lo `test -f 'sci_gateway/fortran/bgetx.f' || echo '$(srcdir)/'`sci_gateway/fortran/bgetx.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o bgetx.lo `test -f 'sci_gateway/fortran/bgetx.f' || echo '$(srcdir)/'`sci_gateway/fortran/bgetx.f
  
  bgety.lo: sci_gateway/fortran/bgety.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o bgety.lo `test -f 'sci_gateway/fortran/bgety.f' || echo '$(srcdir)/'`sci_gateway/fortran/bgety.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o bgety.lo `test -f 'sci_gateway/fortran/bgety.f' || echo '$(srcdir)/'`sci_gateway/fortran/bgety.f
  
  Ex-corr.lo: sci_gateway/fortran/Ex-corr.f
-       $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o Ex-corr.lo `test -f 'sci_gateway/fortran/Ex-corr.f' || echo '$(srcdir)/'`sci_gateway/fortran/Ex-corr.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o Ex-corr.lo `test -f 'sci_gateway/fortran/Ex-corr.f' || echo '$(srcdir)/'`sci_gateway/fortran/Ex-corr.f
  
  mostlyclean-libtool:
        -rm -f *.lo
@@@ -978,28 -1060,11 +1011,31 @@@ install-libscisignal_processing_la_sci_
  
  uninstall-libscisignal_processing_la_sci_gatewayDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(libscisignal_processing_la_sci_gateway_DATA)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(libscisignal_processing_la_sci_gatewaydir)/$$f'"; \
-         rm -f "$(DESTDIR)$(libscisignal_processing_la_sci_gatewaydir)/$$f"; \
-       done
+       @list='$(libscisignal_processing_la_sci_gateway_DATA)'; test -n "$(libscisignal_processing_la_sci_gatewaydir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscisignal_processing_la_sci_gatewaydir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscisignal_processing_la_sci_gatewaydir)" && rm -f $$files
 +install-libscisignal_processing_la_includeHEADERS: $(libscisignal_processing_la_include_HEADERS)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libscisignal_processing_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libscisignal_processing_la_includedir)"
-       @list='$(libscisignal_processing_la_include_HEADERS)'; for p in $$list; do \
++      @list='$(libscisignal_processing_la_include_HEADERS)'; test -n "$(libscisignal_processing_la_includedir)" || list=; \
++      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(libscisignal_processing_la_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libscisignal_processing_la_includedir)/$$f'"; \
-         $(libscisignal_processing_la_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libscisignal_processing_la_includedir)/$$f"; \
++        echo "$$d$$p"; \
++      done | $(am__base_list) | \
++      while read files; do \
++        echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscisignal_processing_la_includedir)'"; \
++        $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscisignal_processing_la_includedir)" || exit $$?; \
 +      done
 +
 +uninstall-libscisignal_processing_la_includeHEADERS:
 +      @$(NORMAL_UNINSTALL)
-       @list='$(libscisignal_processing_la_include_HEADERS)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(libscisignal_processing_la_includedir)/$$f'"; \
-         rm -f "$(DESTDIR)$(libscisignal_processing_la_includedir)/$$f"; \
-       done
++      @list='$(libscisignal_processing_la_include_HEADERS)'; test -n "$(libscisignal_processing_la_includedir)" || list=; \
++      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++      test -n "$$files" || exit 0; \
++      echo " ( cd '$(DESTDIR)$(libscisignal_processing_la_includedir)' && rm -f" $$files ")"; \
++      cd "$(DESTDIR)$(libscisignal_processing_la_includedir)" && rm -f $$files
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../core/includes;../../../localization/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../windows_tools/includes;../../../api_scilab/includes"
 +                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../core/includes;../../../localization/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../windows_tools/includes;../../../api_scilab/includes;../../../operations/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;STATISTICS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
Simple merge
Simple merge
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl"
 +                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;STRING_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -43,8 -43,9 +43,9 @@@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="/arch:IA32"
                                Optimization="0"
 -                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes"
 +                              AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes;../operations/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;TIME_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@@ -70,16 -70,9 +70,10 @@@ libsciumfpack_la_CFLAGS= -I$(srcdir)/in
                        -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
 +                      -I$(top_srcdir)/modules/mexlib/includes \
                        -I$(top_srcdir)/modules/api_scilab/includes \
 -                      -I$(top_srcdir)/modules/mexlib/includes
 +                      -I$(top_srcdir)/modules/operations/includes
  
- #### umfpack : include files ####
- libsciumfpack_la_includedir=$(pkgincludedir)/umfpack
- libsciumfpack_la_include_HEADERS = includes/gw_umfpack.h \
- includes/with_umfpack.h \
- includes/dynlib_umfpack.h
  else
  
  UMFPACK_C_SOURCES = src/noumfpack/noumfpack.c
@@@ -473,18 -471,10 +471,11 @@@ libsciumfpack_la_etc_DATA = etc/umfpack
  @UMFPACK_TRUE@                        -I$(srcdir)/src/c/ \
  @UMFPACK_TRUE@                        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
  @UMFPACK_TRUE@                        -I$(top_srcdir)/modules/output_stream/includes \
 +@UMFPACK_TRUE@                        -I$(top_srcdir)/modules/mexlib/includes \
  @UMFPACK_TRUE@                        -I$(top_srcdir)/modules/api_scilab/includes \
 -@UMFPACK_TRUE@                        -I$(top_srcdir)/modules/mexlib/includes
 +@UMFPACK_TRUE@                        -I$(top_srcdir)/modules/operations/includes
  
  
- #### umfpack : include files ####
- @UMFPACK_TRUE@libsciumfpack_la_includedir = $(pkgincludedir)/umfpack
- @UMFPACK_TRUE@libsciumfpack_la_include_HEADERS = includes/gw_umfpack.h \
- @UMFPACK_TRUE@includes/with_umfpack.h \
- @UMFPACK_TRUE@includes/dynlib_umfpack.h
  # Where all the Scilab stuff is installed (macros, help, ...)
  mydatadir = $(pkgdatadir)/modules/$(modulename)