[cleanup] all gw_... .c removed 97/16797/5
Cedric Delamarre [Mon, 6 Jul 2015 13:08:52 +0000 (15:08 +0200)]
Change-Id: Iabcadf2b4b59e1af7117be2d259c054ab4159c92

202 files changed:
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/arnoldi.vcxproj
scilab/modules/arnoldi/arnoldi.vcxproj.filters
scilab/modules/arnoldi/sci_gateway/c/gw_arnoldi.c [deleted file]
scilab/modules/cacsd/src/c/cacsd.vcxproj
scilab/modules/cacsd/src/c/cacsd.vcxproj.filters
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.vcxproj
scilab/modules/call_scilab/call_scilab.vcxproj.filters
scilab/modules/call_scilab/sci_gateway/c/gw_call_scilab.c [deleted file]
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/sci_gateway/c/gw_console.c [deleted file]
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/c/console.vcxproj.filters
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/console/src/noconsole/noconsole.vcxproj.filters
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/sci_gateway/c/gw_core.c [deleted file]
scilab/modules/core/sci_gateway/c/gw_user.c [deleted file]
scilab/modules/core/sci_gateway/c/gw_user2.c [deleted file]
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/core/src/c/gw_dynamic_generic.c [deleted file]
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/sci_gateway/c/gw_data_structures1.c [deleted file]
scilab/modules/data_structures/sci_gateway/c/gw_data_structures2.c [deleted file]
scilab/modules/data_structures/src/c/data_structures.vcxproj
scilab/modules/data_structures/src/c/data_structures.vcxproj.filters
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations1.c [deleted file]
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations2.c [deleted file]
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations3.c [deleted file]
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations4.c [deleted file]
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations6.c [deleted file]
scilab/modules/external_objects/Makefile.am
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects/external_objects.vcxproj
scilab/modules/external_objects/external_objects.vcxproj.filters
scilab/modules/external_objects/sci_gateway/c/gw_external_objects.c [deleted file]
scilab/modules/external_objects_java/Makefile.am
scilab/modules/external_objects_java/Makefile.in
scilab/modules/external_objects_java/external_objects_java.vcxproj
scilab/modules/external_objects_java/external_objects_java.vcxproj.filters
scilab/modules/external_objects_java/sci_gateway/c/gw_external_objects_java.c [deleted file]
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fftw/fftw.vcxproj
scilab/modules/fftw/fftw.vcxproj.filters
scilab/modules/fftw/sci_gateway/c/gw_fftw.c [deleted file]
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/sci_gateway/c/gw_fileio.c [deleted file]
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/sci_gateway/c/gw_functions.c [deleted file]
scilab/modules/functions/src/c/functions.vcxproj
scilab/modules/functions/src/c/functions.vcxproj.filters
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphic_export/graphic_export.vcxproj.filters
scilab/modules/graphic_export/sci_gateway/c/gw_graphic_export.c [deleted file]
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/sci_gateway/c/gw_graphics.c [deleted file]
scilab/modules/gui/Makefile.am [changed mode: 0755->0644]
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/c/gw_gui.c [deleted file]
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/sci_gateway/c/gw_helptools.c [deleted file]
scilab/modules/helptools/src/c/helptools.vcxproj
scilab/modules/helptools/src/c/helptools.vcxproj.filters
scilab/modules/history_browser/sci_gateway/c/gw_history_browser.c [deleted file]
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/sci_gateway/c/gw_history_manager.c [deleted file]
scilab/modules/history_manager/src/c/history_manager.vcxproj
scilab/modules/history_manager/src/c/history_manager.vcxproj.filters
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/integer/sci_gateway/c/gw_integer.c [deleted file]
scilab/modules/integer/src/c/integer.vcxproj
scilab/modules/integer/src/c/integer.vcxproj.filters
scilab/modules/interpolation/sci_gateway/c/gw_interpolation.c [deleted file]
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/sci_gateway/c/gw_io.c [deleted file]
scilab/modules/io/src/c/io.vcxproj
scilab/modules/io/src/c/io.vcxproj.filters
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/libjvm.vcxproj.filters
scilab/modules/jvm/libjvm_export.def
scilab/modules/jvm/sci_gateway/c/gw_jvm.c [deleted file]
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra.c [deleted file]
scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra2.c [deleted file]
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj.filters
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/sci_gateway/c/gw_localization.c [deleted file]
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/matio/matio.vcxproj
scilab/modules/matio/matio.vcxproj.filters
scilab/modules/matio/sci_gateway/c/gw_matio.c [deleted file]
scilab/modules/mpi/Makefile.am
scilab/modules/mpi/Makefile.in
scilab/modules/mpi/mpi.vcxproj
scilab/modules/mpi/mpi.vcxproj.filters
scilab/modules/mpi/sci_gateway/c/gw_mpi.c [deleted file]
scilab/modules/optimization/sci_gateway/c/gw_optimization.c [deleted file]
scilab/modules/optimization/src/c/optimization.vcxproj
scilab/modules/optimization/src/c/optimization.vcxproj.filters
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/sci_gateway/c/gw_output_stream.c [deleted file]
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/output_stream/src/c/output_stream.vcxproj.filters
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/sci_gateway/c/gw_parallel.c [deleted file]
scilab/modules/parallel/src/c/parallel.vcxproj
scilab/modules/parallel/src/c/parallel.vcxproj.filters
scilab/modules/polynomials/sci_gateway/c/gw_polynomials.c [deleted file]
scilab/modules/preferences/Makefile.am
scilab/modules/preferences/Makefile.in
scilab/modules/preferences/sci_gateway/c/gw_preferences.c [deleted file]
scilab/modules/preferences/src/c/preferences.vcxproj
scilab/modules/preferences/src/c/preferences.vcxproj.filters
scilab/modules/randlib/sci_gateway/c/gw_randlib.c [deleted file]
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/sci_gateway/c/gw_scicos.c [deleted file]
scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj
scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj.filters
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/sci_gateway/c/gw_scinotes.c [deleted file]
scilab/modules/scinotes/src/c/scinotes.vcxproj
scilab/modules/scinotes/src/c/scinotes.vcxproj.filters
scilab/modules/signal_processing/sci_gateway/c/gw_signal.c [deleted file]
scilab/modules/signal_processing/src/c/signal_processing.vcxproj
scilab/modules/signal_processing/src/c/signal_processing.vcxproj.filters
scilab/modules/sound/Makefile.am
scilab/modules/sound/Makefile.in
scilab/modules/sound/sci_gateway/c/gw_sound.c [deleted file]
scilab/modules/sound/sound.vcxproj
scilab/modules/sound/sound.vcxproj.filters
scilab/modules/sparse/sci_gateway/c/gw_sparse.c [deleted file]
scilab/modules/sparse/src/c/sparse.vcxproj
scilab/modules/sparse/src/c/sparse.vcxproj.filters
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/sci_gateway/c/gw_special_functions.c [deleted file]
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/special_functions/src/c/special_functions.vcxproj.filters
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/sci_gateway/c/gw_spreadsheet.c [deleted file]
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/spreadsheet/spreadsheet.vcxproj.filters
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/symbolic/sci_gateway/c/gw_symbolic.c [deleted file]
scilab/modules/symbolic/src/c/symbolic.vcxproj
scilab/modules/symbolic/src/c/symbolic.vcxproj.filters
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/sci_gateway/c/gw_tclsci.c [deleted file]
scilab/modules/tclsci/tclsci.vcxproj
scilab/modules/tclsci/tclsci.vcxproj.filters
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/time/sci_gateway/c/gw_time.c [deleted file]
scilab/modules/time/time.vcxproj
scilab/modules/time/time.vcxproj.filters
scilab/modules/windows_tools/sci_gateway/c/gw_windows_tools.c [deleted file]
scilab/modules/windows_tools/src/c/windows_tools.vcxproj
scilab/modules/windows_tools/src/c/windows_tools.vcxproj.filters
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in
scilab/modules/xml/sci_gateway/c/gw_xml.c [deleted file]
scilab/modules/xml/xml.vcxproj
scilab/modules/xml/xml.vcxproj.filters

index 1ebecdb..8b0b1e3 100644 (file)
@@ -12,7 +12,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_zneupd \
     sci_gateway/c/sci_dseupd.c \
     sci_gateway/c/sci_zneupd.c \
-    sci_gateway/c/gw_arnoldi.c \
     sci_gateway/c/sci_dnaupd.c \
     sci_gateway/c/sci_dneupd.c \
     sci_gateway/c/sci_dsaupd.c \
index 50d9890..5578519 100644 (file)
@@ -171,7 +171,6 @@ am__objects_1 = src/c/libsciarnoldi_la-eigs.lo \
        src/c/libsciarnoldi_la-eigs_dependencies.lo
 am__objects_2 = sci_gateway/c/libsciarnoldi_la-sci_dseupd.lo \
        sci_gateway/c/libsciarnoldi_la-sci_zneupd.lo \
-       sci_gateway/c/libsciarnoldi_la-gw_arnoldi.lo \
        sci_gateway/c/libsciarnoldi_la-sci_dnaupd.lo \
        sci_gateway/c/libsciarnoldi_la-sci_dneupd.lo \
        sci_gateway/c/libsciarnoldi_la-sci_dsaupd.lo \
@@ -542,7 +541,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_zneupd \
     sci_gateway/c/sci_dseupd.c \
     sci_gateway/c/sci_zneupd.c \
-    sci_gateway/c/gw_arnoldi.c \
     sci_gateway/c/sci_dnaupd.c \
     sci_gateway/c/sci_dneupd.c \
     sci_gateway/c/sci_dsaupd.c \
@@ -753,9 +751,6 @@ sci_gateway/c/libsciarnoldi_la-sci_dseupd.lo:  \
 sci_gateway/c/libsciarnoldi_la-sci_zneupd.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciarnoldi_la-gw_arnoldi.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libsciarnoldi_la-sci_dnaupd.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -785,7 +780,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciarnoldi_la-gw_arnoldi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciarnoldi_la-sci_dnaupd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciarnoldi_la-sci_dneupd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciarnoldi_la-sci_dsaupd.Plo@am__quote@
@@ -848,13 +842,6 @@ sci_gateway/c/libsciarnoldi_la-sci_zneupd.lo: sci_gateway/c/sci_zneupd.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciarnoldi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciarnoldi_la-sci_zneupd.lo `test -f 'sci_gateway/c/sci_zneupd.c' || echo '$(srcdir)/'`sci_gateway/c/sci_zneupd.c
 
-sci_gateway/c/libsciarnoldi_la-gw_arnoldi.lo: sci_gateway/c/gw_arnoldi.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciarnoldi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciarnoldi_la-gw_arnoldi.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciarnoldi_la-gw_arnoldi.Tpo -c -o sci_gateway/c/libsciarnoldi_la-gw_arnoldi.lo `test -f 'sci_gateway/c/gw_arnoldi.c' || echo '$(srcdir)/'`sci_gateway/c/gw_arnoldi.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciarnoldi_la-gw_arnoldi.Tpo sci_gateway/c/$(DEPDIR)/libsciarnoldi_la-gw_arnoldi.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_arnoldi.c' object='sci_gateway/c/libsciarnoldi_la-gw_arnoldi.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciarnoldi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciarnoldi_la-gw_arnoldi.lo `test -f 'sci_gateway/c/gw_arnoldi.c' || echo '$(srcdir)/'`sci_gateway/c/gw_arnoldi.c
-
 sci_gateway/c/libsciarnoldi_la-sci_dnaupd.lo: sci_gateway/c/sci_dnaupd.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciarnoldi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciarnoldi_la-sci_dnaupd.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciarnoldi_la-sci_dnaupd.Tpo -c -o sci_gateway/c/libsciarnoldi_la-sci_dnaupd.lo `test -f 'sci_gateway/c/sci_dnaupd.c' || echo '$(srcdir)/'`sci_gateway/c/sci_dnaupd.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciarnoldi_la-sci_dnaupd.Tpo sci_gateway/c/$(DEPDIR)/libsciarnoldi_la-sci_dnaupd.Plo
index afafa57..23773c0 100644 (file)
   <ItemGroup>
     <ClCompile Include="sci_gateway\c\sci_eigs.c" />
     <ClCompile Include="src\c\DllmainArnoldi.c" />
-    <ClCompile Include="sci_gateway\c\gw_arnoldi.c" />
     <ClCompile Include="sci_gateway\c\sci_dnaupd.c" />
     <ClCompile Include="sci_gateway\c\sci_dneupd.c" />
     <ClCompile Include="sci_gateway\c\sci_dsaupd.c" />
index 8940a82..14d3411 100644 (file)
@@ -27,9 +27,6 @@
     <ClCompile Include="src\c\DllmainArnoldi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\gw_arnoldi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_gateway\c\sci_dnaupd.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -89,5 +86,6 @@
     </None>
     <None Include="locales\arnoldi.pot" />
     <None Include="locales\arnoldi.pot" />
+    <None Include="locales\arnoldi.pot" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/scilab/modules/arnoldi/sci_gateway/c/gw_arnoldi.c b/scilab/modules/arnoldi/sci_gateway/c/gw_arnoldi.c
deleted file mode 100644 (file)
index cb2df37..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006-2008 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-#include <math.h>
-#include <string.h>
-/*--------------------------------------------------------------------------*/
-#include "gw_arnoldi.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-/*
-static gw_generic_table Tab[] =
-{
-  {sci_dsaupd,"dsaupd"},
-  {sci_dnaupd,"dnaupd"},
-  {sci_znaupd,"znaupd"},
-  {sci_dseupd,"dseupd"},
-  {sci_dneupd,"dneupd"},
-  {sci_zneupd,"zneupd"},
-  {sci_eigs,"%_eigs"}
-};
-*/
-/*--------------------------------------------------------------------------*/
-int gw_arnoldi(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
-
-
index 03db8d9..eda093f 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
index 2895f74..75f1f45 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -62,9 +62,6 @@
     <ClCompile Include="dmp2pm.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_cacsd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_findbd.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_tzer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\c\gw_cacsd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\dynlib_cacsd.h">
       <Filter>Resource File</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index ff6c1fa..c293476 100644 (file)
@@ -13,8 +13,7 @@ CALLSCILAB_C_SOURCES = \
 
 GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_fromjava.c \
-    sci_gateway/c/sci_fromc.c \
-    sci_gateway/c/gw_call_scilab.c
+    sci_gateway/c/sci_fromc.c
 
 libscicall_scilab_la_CPPFLAGS= \
     -I$(srcdir)/includes/ \
index ba71866..63b373f 100644 (file)
@@ -180,8 +180,7 @@ am__v_lt_0 = --silent
 am__v_lt_1 = 
 libscicall_scilab_la_DEPENDENCIES = libscicall_scilab-algo.la
 am__objects_2 = sci_gateway/c/libscicall_scilab_la-sci_fromjava.lo \
-       sci_gateway/c/libscicall_scilab_la-sci_fromc.lo \
-       sci_gateway/c/libscicall_scilab_la-gw_call_scilab.lo
+       sci_gateway/c/libscicall_scilab_la-sci_fromc.lo
 am_libscicall_scilab_la_OBJECTS = $(am__objects_2)
 libscicall_scilab_la_OBJECTS = $(am_libscicall_scilab_la_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -545,8 +544,7 @@ CALLSCILAB_C_SOURCES = \
 
 GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_fromjava.c \
-    sci_gateway/c/sci_fromc.c \
-    sci_gateway/c/gw_call_scilab.c
+    sci_gateway/c/sci_fromc.c
 
 libscicall_scilab_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
@@ -783,9 +781,6 @@ sci_gateway/c/libscicall_scilab_la-sci_fromjava.lo:  \
 sci_gateway/c/libscicall_scilab_la-sci_fromc.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscicall_scilab_la-gw_call_scilab.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 
 libscicall_scilab.la: $(libscicall_scilab_la_OBJECTS) $(libscicall_scilab_la_DEPENDENCIES) $(EXTRA_libscicall_scilab_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(LINK) -rpath $(pkglibdir) $(libscicall_scilab_la_OBJECTS) $(libscicall_scilab_la_LIBADD) $(LIBS)
@@ -800,7 +795,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscicall_scilab_la-gw_call_scilab.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscicall_scilab_la-sci_fromc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscicall_scilab_la-sci_fromjava.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscicall_scilab_algo_la-SendScilabJobs.Plo@am__quote@
@@ -874,13 +868,6 @@ sci_gateway/c/libscicall_scilab_la-sci_fromc.lo: sci_gateway/c/sci_fromc.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicall_scilab_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscicall_scilab_la-sci_fromc.lo `test -f 'sci_gateway/c/sci_fromc.c' || echo '$(srcdir)/'`sci_gateway/c/sci_fromc.c
 
-sci_gateway/c/libscicall_scilab_la-gw_call_scilab.lo: sci_gateway/c/gw_call_scilab.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicall_scilab_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscicall_scilab_la-gw_call_scilab.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscicall_scilab_la-gw_call_scilab.Tpo -c -o sci_gateway/c/libscicall_scilab_la-gw_call_scilab.lo `test -f 'sci_gateway/c/gw_call_scilab.c' || echo '$(srcdir)/'`sci_gateway/c/gw_call_scilab.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscicall_scilab_la-gw_call_scilab.Tpo sci_gateway/c/$(DEPDIR)/libscicall_scilab_la-gw_call_scilab.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_call_scilab.c' object='sci_gateway/c/libscicall_scilab_la-gw_call_scilab.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicall_scilab_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscicall_scilab_la-gw_call_scilab.lo `test -f 'sci_gateway/c/gw_call_scilab.c' || echo '$(srcdir)/'`sci_gateway/c/gw_call_scilab.c
-
 mostlyclean-libtool:
        -rm -f *.lo
 
index 73626a2..75b5dc4 100644 (file)
@@ -216,7 +216,6 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile Include="src\c\DllmainCall_scilab.c" />
     <ClCompile Include="src\c\fromc.c" />
     <ClCompile Include="src\c\fromjava.c" />
-    <ClCompile Include="sci_gateway\c\gw_call_scilab.c" />
     <ClCompile Include="sci_gateway\c\sci_fromc.c" />
     <ClCompile Include="sci_gateway\c\sci_fromjava.c" />
     <ClCompile Include="src\c\SendScilabJobs.c" />
index 6ed2288..706c988 100644 (file)
@@ -36,9 +36,6 @@
     <ClCompile Include="src\c\fromjava.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\gw_call_scilab.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_gateway\c\sci_fromc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/call_scilab/sci_gateway/c/gw_call_scilab.c b/scilab/modules/call_scilab/sci_gateway/c/gw_call_scilab.c
deleted file mode 100644 (file)
index 77d77f7..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2009 - DIGITEO - Sylvestre LEDRU
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-#include <string.h>
-#include "gw_call_scilab.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-int gw_call_scilab(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index 154c85b..61c5f68 100644 (file)
@@ -69,7 +69,6 @@ endif
 
 libsciconsole_minimal_la_SOURCES = \
     src/noconsole/noconsole.c \
-    sci_gateway/c/gw_console.c \
     sci_gateway/cpp/sci_clc.cpp \
     sci_gateway/cpp/sci_tohome.cpp \
     sci_gateway/cpp/sci_lines.cpp \
index 9cece59..f851ba4 100644 (file)
@@ -187,7 +187,6 @@ libsciconsole_minimal_la_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
 am_libsciconsole_minimal_la_OBJECTS =  \
        src/noconsole/libsciconsole_minimal_la-noconsole.lo \
-       sci_gateway/c/libsciconsole_minimal_la-gw_console.lo \
        sci_gateway/cpp/libsciconsole_minimal_la-sci_clc.lo \
        sci_gateway/cpp/libsciconsole_minimal_la-sci_tohome.lo \
        sci_gateway/cpp/libsciconsole_minimal_la-sci_lines.lo \
@@ -661,7 +660,6 @@ BUILT_SOURCES = $(am__append_1) $(am__append_2)
 # List of the c files
 libsciconsole_minimal_la_SOURCES = \
     src/noconsole/noconsole.c \
-    sci_gateway/c/gw_console.c \
     sci_gateway/cpp/sci_clc.cpp \
     sci_gateway/cpp/sci_tohome.cpp \
     sci_gateway/cpp/sci_lines.cpp \
@@ -949,15 +947,6 @@ src/noconsole/$(DEPDIR)/$(am__dirstamp):
 src/noconsole/libsciconsole_minimal_la-noconsole.lo:  \
        src/noconsole/$(am__dirstamp) \
        src/noconsole/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c
-       @: > sci_gateway/c/$(am__dirstamp)
-sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
-       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciconsole_minimal_la-gw_console.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp
        @: > sci_gateway/cpp/$(am__dirstamp)
@@ -1102,8 +1091,6 @@ libsciconsole.la: $(libsciconsole_la_OBJECTS) $(libsciconsole_la_DEPENDENCIES) $
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f sci_gateway/c/*.$(OBJEXT)
-       -rm -f sci_gateway/c/*.lo
        -rm -f sci_gateway/cpp/*.$(OBJEXT)
        -rm -f sci_gateway/cpp/*.lo
        -rm -f src/c/*.$(OBJEXT)
@@ -1122,7 +1109,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciconsole_minimal_la-gw_console.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciconsole_minimal_la-console_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciconsole_minimal_la-sci_clc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciconsole_minimal_la-sci_iswaitingforinput.Plo@am__quote@
@@ -1196,13 +1182,6 @@ src/noconsole/libsciconsole_minimal_la-noconsole.lo: src/noconsole/noconsole.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_minimal_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/noconsole/libsciconsole_minimal_la-noconsole.lo `test -f 'src/noconsole/noconsole.c' || echo '$(srcdir)/'`src/noconsole/noconsole.c
 
-sci_gateway/c/libsciconsole_minimal_la-gw_console.lo: sci_gateway/c/gw_console.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_minimal_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciconsole_minimal_la-gw_console.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciconsole_minimal_la-gw_console.Tpo -c -o sci_gateway/c/libsciconsole_minimal_la-gw_console.lo `test -f 'sci_gateway/c/gw_console.c' || echo '$(srcdir)/'`sci_gateway/c/gw_console.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciconsole_minimal_la-gw_console.Tpo sci_gateway/c/$(DEPDIR)/libsciconsole_minimal_la-gw_console.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_console.c' object='sci_gateway/c/libsciconsole_minimal_la-gw_console.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_minimal_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciconsole_minimal_la-gw_console.lo `test -f 'sci_gateway/c/gw_console.c' || echo '$(srcdir)/'`sci_gateway/c/gw_console.c
-
 src/c/libsciconsole_minimal_la-clc.lo: src/c/clc.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_minimal_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/libsciconsole_minimal_la-clc.lo -MD -MP -MF src/c/$(DEPDIR)/libsciconsole_minimal_la-clc.Tpo -c -o src/c/libsciconsole_minimal_la-clc.lo `test -f 'src/c/clc.c' || echo '$(srcdir)/'`src/c/clc.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/$(DEPDIR)/libsciconsole_minimal_la-clc.Tpo src/c/$(DEPDIR)/libsciconsole_minimal_la-clc.Plo
@@ -1512,7 +1491,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
        -rm -rf sci_gateway/cpp/.libs sci_gateway/cpp/_libs
        -rm -rf src/c/.libs src/c/_libs
        -rm -rf src/c/cmdLine/.libs src/c/cmdLine/_libs
@@ -1723,8 +1701,6 @@ 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)
-       -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sci_gateway/c/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(am__dirstamp)
        -rm -f src/c/$(DEPDIR)/$(am__dirstamp)
@@ -1750,7 +1726,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/c/cmdLine/$(DEPDIR) src/c/others/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR) src/noconsole/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/c/cmdLine/$(DEPDIR) src/c/others/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR) src/noconsole/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -1799,7 +1775,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/c/cmdLine/$(DEPDIR) src/c/others/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR) src/noconsole/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/c/cmdLine/$(DEPDIR) src/c/others/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR) src/noconsole/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/scilab/modules/console/sci_gateway/c/gw_console.c b/scilab/modules/console/sci_gateway/c/gw_console.c
deleted file mode 100644 (file)
index fe5aa4f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_console.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-int gw_console(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index 02d90ea..f7bc1ec 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\sci_gateway\c\gw_console.c" />
     <ClCompile Include="..\cpp\scilabRead.cpp" />
     <ClCompile Include="..\jni\CallScilabBridge.cpp" />
     <ClCompile Include="..\cpp\ClearConsole.cpp" />
index 260fb78..3065351 100644 (file)
@@ -71,9 +71,6 @@
     <ClCompile Include="..\cpp\SetConsolePrompt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_console.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="clc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index f0258db..9848602 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
     <ClCompile Include="..\..\sci_gateway\cpp\sci_lines.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_prompt.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_tohome.cpp" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_console.c" />
     <ClCompile Include="..\cpp\scilabRead.cpp" />
     <ClCompile Include="..\c\clc.c" />
     <ClCompile Include="..\c\DllmainConsole.c" />
index 46a6e14..9d725af 100644 (file)
@@ -21,9 +21,6 @@
     <ClCompile Include="noconsole.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_console.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\c\DllmainConsole.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index aecc4fa..fbb6ca2 100644 (file)
@@ -26,7 +26,6 @@ CORE_C_SOURCES = \
     src/c/freeArrayOfString.c \
     src/c/getstaticdebuginfo.c \
     src/c/getdynamicdebuginfo.c \
-    src/c/gw_dynamic_generic.c \
     src/c/dynamic_gateways.c \
     src/c/setPrecisionFPU.c \
     src/c/getos.c \
@@ -74,9 +73,6 @@ CORE_FORTRAN_SOURCES = \
        src/fortran/read_inter.f
 
 GATEWAY_C_SOURCES = \
-       sci_gateway/c/gw_core.c \
-       sci_gateway/c/gw_user.c \
-       sci_gateway/c/gw_user2.c \
        sci_gateway/c/sci_type.c \
        sci_gateway/c/sci_getdebuginfo.c
 
index e54f7b0..51bb4a3 100644 (file)
@@ -193,7 +193,6 @@ am__objects_1 = src/c/libscicore_algo_la-csignal.lo \
        src/c/libscicore_algo_la-freeArrayOfString.lo \
        src/c/libscicore_algo_la-getstaticdebuginfo.lo \
        src/c/libscicore_algo_la-getdynamicdebuginfo.lo \
-       src/c/libscicore_algo_la-gw_dynamic_generic.lo \
        src/c/libscicore_algo_la-dynamic_gateways.lo \
        src/c/libscicore_algo_la-setPrecisionFPU.lo \
        src/c/libscicore_algo_la-getos.lo \
@@ -241,10 +240,7 @@ am__v_lt_1 =
 @MAINTAINER_MODE_TRUE@am_libscicore_algo_la_rpath =
 am__DEPENDENCIES_1 =
 libscicore_la_DEPENDENCIES = libscicore-algo.la $(am__DEPENDENCIES_1)
-am__objects_4 = sci_gateway/c/libscicore_la-gw_core.lo \
-       sci_gateway/c/libscicore_la-gw_user.lo \
-       sci_gateway/c/libscicore_la-gw_user2.lo \
-       sci_gateway/c/libscicore_la-sci_type.lo \
+am__objects_4 = sci_gateway/c/libscicore_la-sci_type.lo \
        sci_gateway/c/libscicore_la-sci_getdebuginfo.lo
 am__objects_5 = sci_gateway/cpp/libscicore_la-core_gw.lo \
        sci_gateway/cpp/libscicore_la-sci_getmodules.lo \
@@ -691,7 +687,6 @@ CORE_C_SOURCES = \
     src/c/freeArrayOfString.c \
     src/c/getstaticdebuginfo.c \
     src/c/getdynamicdebuginfo.c \
-    src/c/gw_dynamic_generic.c \
     src/c/dynamic_gateways.c \
     src/c/setPrecisionFPU.c \
     src/c/getos.c \
@@ -739,9 +734,6 @@ CORE_FORTRAN_SOURCES = \
        src/fortran/read_inter.f
 
 GATEWAY_C_SOURCES = \
-       sci_gateway/c/gw_core.c \
-       sci_gateway/c/gw_user.c \
-       sci_gateway/c/gw_user2.c \
        sci_gateway/c/sci_type.c \
        sci_gateway/c/sci_getdebuginfo.c
 
@@ -1085,8 +1077,6 @@ src/c/libscicore_algo_la-getstaticdebuginfo.lo: src/c/$(am__dirstamp) \
        src/c/$(DEPDIR)/$(am__dirstamp)
 src/c/libscicore_algo_la-getdynamicdebuginfo.lo:  \
        src/c/$(am__dirstamp) src/c/$(DEPDIR)/$(am__dirstamp)
-src/c/libscicore_algo_la-gw_dynamic_generic.lo: src/c/$(am__dirstamp) \
-       src/c/$(DEPDIR)/$(am__dirstamp)
 src/c/libscicore_algo_la-dynamic_gateways.lo: src/c/$(am__dirstamp) \
        src/c/$(DEPDIR)/$(am__dirstamp)
 src/c/libscicore_algo_la-setPrecisionFPU.lo: src/c/$(am__dirstamp) \
@@ -1198,13 +1188,6 @@ sci_gateway/c/$(am__dirstamp):
 sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
        @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscicore_la-gw_core.lo: sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscicore_la-gw_user.lo: sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscicore_la-gw_user2.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscicore_la-sci_type.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -1353,9 +1336,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscicore_la-gw_core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscicore_la-gw_user.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscicore_la-gw_user2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscicore_la-sci_getdebuginfo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscicore_la-sci_type.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscicore_la-core_gw.Plo@am__quote@
@@ -1414,7 +1394,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscicore_algo_la-getos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscicore_algo_la-getstaticdebuginfo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscicore_algo_la-getversion.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscicore_algo_la-gw_dynamic_generic.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscicore_algo_la-isanan.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscicore_algo_la-islittleendian.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscicore_algo_la-loadversion.Plo@am__quote@
@@ -1588,13 +1567,6 @@ src/c/libscicore_algo_la-getdynamicdebuginfo.lo: src/c/getdynamicdebuginfo.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libscicore_algo_la-getdynamicdebuginfo.lo `test -f 'src/c/getdynamicdebuginfo.c' || echo '$(srcdir)/'`src/c/getdynamicdebuginfo.c
 
-src/c/libscicore_algo_la-gw_dynamic_generic.lo: src/c/gw_dynamic_generic.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/libscicore_algo_la-gw_dynamic_generic.lo -MD -MP -MF src/c/$(DEPDIR)/libscicore_algo_la-gw_dynamic_generic.Tpo -c -o src/c/libscicore_algo_la-gw_dynamic_generic.lo `test -f 'src/c/gw_dynamic_generic.c' || echo '$(srcdir)/'`src/c/gw_dynamic_generic.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/$(DEPDIR)/libscicore_algo_la-gw_dynamic_generic.Tpo src/c/$(DEPDIR)/libscicore_algo_la-gw_dynamic_generic.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/gw_dynamic_generic.c' object='src/c/libscicore_algo_la-gw_dynamic_generic.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libscicore_algo_la-gw_dynamic_generic.lo `test -f 'src/c/gw_dynamic_generic.c' || echo '$(srcdir)/'`src/c/gw_dynamic_generic.c
-
 src/c/libscicore_algo_la-dynamic_gateways.lo: src/c/dynamic_gateways.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/libscicore_algo_la-dynamic_gateways.lo -MD -MP -MF src/c/$(DEPDIR)/libscicore_algo_la-dynamic_gateways.Tpo -c -o src/c/libscicore_algo_la-dynamic_gateways.lo `test -f 'src/c/dynamic_gateways.c' || echo '$(srcdir)/'`src/c/dynamic_gateways.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/$(DEPDIR)/libscicore_algo_la-dynamic_gateways.Tpo src/c/$(DEPDIR)/libscicore_algo_la-dynamic_gateways.Plo
@@ -1721,27 +1693,6 @@ src/c/hashtable/libscicore_algo_la-hashtable_utility.lo: src/c/hashtable/hashtab
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/hashtable/libscicore_algo_la-hashtable_utility.lo `test -f 'src/c/hashtable/hashtable_utility.c' || echo '$(srcdir)/'`src/c/hashtable/hashtable_utility.c
 
-sci_gateway/c/libscicore_la-gw_core.lo: sci_gateway/c/gw_core.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscicore_la-gw_core.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscicore_la-gw_core.Tpo -c -o sci_gateway/c/libscicore_la-gw_core.lo `test -f 'sci_gateway/c/gw_core.c' || echo '$(srcdir)/'`sci_gateway/c/gw_core.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscicore_la-gw_core.Tpo sci_gateway/c/$(DEPDIR)/libscicore_la-gw_core.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_core.c' object='sci_gateway/c/libscicore_la-gw_core.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscicore_la-gw_core.lo `test -f 'sci_gateway/c/gw_core.c' || echo '$(srcdir)/'`sci_gateway/c/gw_core.c
-
-sci_gateway/c/libscicore_la-gw_user.lo: sci_gateway/c/gw_user.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscicore_la-gw_user.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscicore_la-gw_user.Tpo -c -o sci_gateway/c/libscicore_la-gw_user.lo `test -f 'sci_gateway/c/gw_user.c' || echo '$(srcdir)/'`sci_gateway/c/gw_user.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscicore_la-gw_user.Tpo sci_gateway/c/$(DEPDIR)/libscicore_la-gw_user.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_user.c' object='sci_gateway/c/libscicore_la-gw_user.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscicore_la-gw_user.lo `test -f 'sci_gateway/c/gw_user.c' || echo '$(srcdir)/'`sci_gateway/c/gw_user.c
-
-sci_gateway/c/libscicore_la-gw_user2.lo: sci_gateway/c/gw_user2.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscicore_la-gw_user2.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscicore_la-gw_user2.Tpo -c -o sci_gateway/c/libscicore_la-gw_user2.lo `test -f 'sci_gateway/c/gw_user2.c' || echo '$(srcdir)/'`sci_gateway/c/gw_user2.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscicore_la-gw_user2.Tpo sci_gateway/c/$(DEPDIR)/libscicore_la-gw_user2.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_user2.c' object='sci_gateway/c/libscicore_la-gw_user2.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscicore_la-gw_user2.lo `test -f 'sci_gateway/c/gw_user2.c' || echo '$(srcdir)/'`sci_gateway/c/gw_user2.c
-
 sci_gateway/c/libscicore_la-sci_type.lo: sci_gateway/c/sci_type.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscicore_la-sci_type.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscicore_la-sci_type.Tpo -c -o sci_gateway/c/libscicore_la-sci_type.lo `test -f 'sci_gateway/c/sci_type.c' || echo '$(srcdir)/'`sci_gateway/c/sci_type.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscicore_la-sci_type.Tpo sci_gateway/c/$(DEPDIR)/libscicore_la-sci_type.Plo
diff --git a/scilab/modules/core/sci_gateway/c/gw_core.c b/scilab/modules/core/sci_gateway/c/gw_core.c
deleted file mode 100644 (file)
index 30c20b8..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-#include <string.h>
-#include "gw_core.h"
-#include "sci_malloc.h"
-#include "api_scilab.h"
-#include "machine.h"
-/*--------------------------------------------------------------------------*/
-int gw_core(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/core/sci_gateway/c/gw_user.c b/scilab/modules/core/sci_gateway/c/gw_user.c
deleted file mode 100644 (file)
index 8d02d96..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-#include "api_scilab.h"
-#include "gw_user.h"
-/*--------------------------------------------------------------------------*/
-int gw_user(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
-
diff --git a/scilab/modules/core/sci_gateway/c/gw_user2.c b/scilab/modules/core/sci_gateway/c/gw_user2.c
deleted file mode 100644 (file)
index 3588ad9..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-#include "gw_user2.h"
-/*--------------------------------------------------------------------------*/
-int gw_user2(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
-
index 6a28f60..4aca97b 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -273,10 +273,6 @@ cd ..
     <ClCompile Include="getstaticDebugInfo_Windows.c" />
     <ClCompile Include="getversion.c" />
     <ClCompile Include="GetXmlFileEncoding.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_core.c" />
-    <ClCompile Include="gw_dynamic_generic.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_user.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_user2.c" />
     <ClCompile Include="hashtable\hashtable.c" />
     <ClCompile Include="hashtable\hashtable_utility.c" />
     <ClCompile Include="InitializePreferences.c" />
@@ -470,4 +466,4 @@ cd ..
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index 4c7ad2b..75fb0d1 100644 (file)
     <ClCompile Include="GetXmlFileEncoding.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_core.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gw_dynamic_generic.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_user.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_user2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="isanan.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/core/src/c/gw_dynamic_generic.c b/scilab/modules/core/src/c/gw_dynamic_generic.c
deleted file mode 100644 (file)
index 826f9d5..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include "gw_dynamic_generic.h"
-/*--------------------------------------------------------------------------*/
-int gw_dynamic_generic(char *moduleName,
-                       char **dynlibName,
-                       char **gatewayName,
-                       DynLibHandle *hModuleLib,
-                       void* ptrGatewayFunction)
-{
-    //dynamic_gateway_error_code err;
-    //if (*dynlibName == NULL)
-    //{
-    // *dynlibName = buildModuleDynLibraryName(moduleName, DYNLIB_NAME_FORMAT_AUTO);
-    //}
-
-    //if (*gatewayName == NULL)
-    //{
-    // *gatewayName = buildGatewayName(moduleName);
-    //}
-
-    //err = callDynamicGateway(moduleName,*dynlibName,
-    //                                         *gatewayName,
-    //                                         hModuleLib,
-    //                                         ptrGatewayFunction);
-    //displayErrorGateway(err,*dynlibName,*gatewayName);
-    //
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index c0835f6..79063ba 100644 (file)
@@ -4,10 +4,6 @@
 # This file is distributed under the same license as the Scilab package.
 
 
-GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_data_structures1.c \
-    sci_gateway/c/gw_data_structures2.c
-
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/data_structures_gw.cpp \
     sci_gateway/cpp/sci_getfield.cpp \
@@ -39,10 +35,10 @@ else
 noinst_LTLIBRARIES = libscidata_structures.la
 endif
 
-libscidata_structures_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscidata_structures_la_SOURCES = $(GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
-CHECK_SRC= $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+CHECK_SRC= $(GATEWAY_CPP_SOURCES)
 INCLUDE_FLAGS = $(libscidata_structures_la_CFLAGS)
 
 #### Target ######
index 5c3144e..de8df79 100644 (file)
@@ -164,16 +164,12 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libscidata_structures_la_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
-am__objects_1 =  \
-       sci_gateway/c/libscidata_structures_la-gw_data_structures1.lo \
-       sci_gateway/c/libscidata_structures_la-gw_data_structures2.lo
-am__objects_2 = sci_gateway/cpp/libscidata_structures_la-data_structures_gw.lo \
+am__objects_1 = sci_gateway/cpp/libscidata_structures_la-data_structures_gw.lo \
        sci_gateway/cpp/libscidata_structures_la-sci_getfield.lo \
        sci_gateway/cpp/libscidata_structures_la-sci_setfield.lo \
        sci_gateway/cpp/libscidata_structures_la-sci_rlist.lo \
        sci_gateway/cpp/libscidata_structures_la-sci_definedfields.lo
-am_libscidata_structures_la_OBJECTS = $(am__objects_1) \
-       $(am__objects_2)
+am_libscidata_structures_la_OBJECTS = $(am__objects_1)
 libscidata_structures_la_OBJECTS =  \
        $(am_libscidata_structures_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -199,24 +195,6 @@ 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) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -549,10 +527,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 yacc_present = @yacc_present@
-GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_data_structures1.c \
-    sci_gateway/c/gw_data_structures2.c
-
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/data_structures_gw.cpp \
     sci_gateway/cpp/sci_getfield.cpp \
@@ -580,10 +554,10 @@ libscidata_structures_la_CPPFLAGS = \
 
 @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscidata_structures.la
 @MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscidata_structures.la
-libscidata_structures_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscidata_structures_la_SOURCES = $(GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
-CHECK_SRC = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+CHECK_SRC = $(GATEWAY_CPP_SOURCES)
 INCLUDE_FLAGS = $(libscidata_structures_la_CFLAGS)
 
 #### Target ######
@@ -679,7 +653,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
+.SUFFIXES: .sci .bin .cpp .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 \
@@ -757,18 +731,6 @@ clean-pkglibLTLIBRARIES:
          echo rm -f $${locs}; \
          rm -f $${locs}; \
        }
-sci_gateway/c/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c
-       @: > sci_gateway/c/$(am__dirstamp)
-sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
-       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscidata_structures_la-gw_data_structures1.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscidata_structures_la-gw_data_structures2.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp
        @: > sci_gateway/cpp/$(am__dirstamp)
@@ -796,60 +758,18 @@ libscidata_structures.la: $(libscidata_structures_la_OBJECTS) $(libscidata_struc
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f sci_gateway/c/*.$(OBJEXT)
-       -rm -f sci_gateway/c/*.lo
        -rm -f sci_gateway/cpp/*.$(OBJEXT)
        -rm -f sci_gateway/cpp/*.lo
 
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscidata_structures_la-gw_data_structures1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscidata_structures_la-gw_data_structures2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscidata_structures_la-data_structures_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscidata_structures_la-sci_definedfields.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscidata_structures_la-sci_getfield.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscidata_structures_la-sci_rlist.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscidata_structures_la-sci_setfield.Plo@am__quote@
 
-.c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-sci_gateway/c/libscidata_structures_la-gw_data_structures1.lo: sci_gateway/c/gw_data_structures1.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscidata_structures_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscidata_structures_la-gw_data_structures1.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscidata_structures_la-gw_data_structures1.Tpo -c -o sci_gateway/c/libscidata_structures_la-gw_data_structures1.lo `test -f 'sci_gateway/c/gw_data_structures1.c' || echo '$(srcdir)/'`sci_gateway/c/gw_data_structures1.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscidata_structures_la-gw_data_structures1.Tpo sci_gateway/c/$(DEPDIR)/libscidata_structures_la-gw_data_structures1.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_data_structures1.c' object='sci_gateway/c/libscidata_structures_la-gw_data_structures1.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscidata_structures_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscidata_structures_la-gw_data_structures1.lo `test -f 'sci_gateway/c/gw_data_structures1.c' || echo '$(srcdir)/'`sci_gateway/c/gw_data_structures1.c
-
-sci_gateway/c/libscidata_structures_la-gw_data_structures2.lo: sci_gateway/c/gw_data_structures2.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscidata_structures_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscidata_structures_la-gw_data_structures2.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscidata_structures_la-gw_data_structures2.Tpo -c -o sci_gateway/c/libscidata_structures_la-gw_data_structures2.lo `test -f 'sci_gateway/c/gw_data_structures2.c' || echo '$(srcdir)/'`sci_gateway/c/gw_data_structures2.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscidata_structures_la-gw_data_structures2.Tpo sci_gateway/c/$(DEPDIR)/libscidata_structures_la-gw_data_structures2.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_data_structures2.c' object='sci_gateway/c/libscidata_structures_la-gw_data_structures2.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscidata_structures_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscidata_structures_la-gw_data_structures2.lo `test -f 'sci_gateway/c/gw_data_structures2.c' || echo '$(srcdir)/'`sci_gateway/c/gw_data_structures2.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -914,7 +834,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
        -rm -rf sci_gateway/cpp/.libs sci_gateway/cpp/_libs
 install-libscidata_structures_la_etcDATA: $(libscidata_structures_la_etc_DATA)
        @$(NORMAL_INSTALL)
@@ -1096,8 +1015,6 @@ 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)
-       -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sci_gateway/c/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(am__dirstamp)
 
@@ -1110,7 +1027,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -1159,7 +1076,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/scilab/modules/data_structures/sci_gateway/c/gw_data_structures1.c b/scilab/modules/data_structures/sci_gateway/c/gw_data_structures1.c
deleted file mode 100644 (file)
index 1eb5b44..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006-2008 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_data_structures1.h"
-#include "callFunctionFromGateway.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "Scierror.h"
-/*--------------------------------------------------------------------------*/
-int gw_data_structures1(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
-int C2F(gwdatastructures1)(void)
-{
-    return gw_data_structures1();
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/data_structures/sci_gateway/c/gw_data_structures2.c b/scilab/modules/data_structures/sci_gateway/c/gw_data_structures2.c
deleted file mode 100644 (file)
index b518bfc..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007-2008 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_data_structures2.h"
-#include "callFunctionFromGateway.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "Scierror.h"
-/*--------------------------------------------------------------------------*/
-int gw_data_structures2(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index a2b9cf2..2493e55 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -200,8 +200,6 @@ lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
     <ClCompile Include="..\..\sci_gateway\cpp\sci_rlist.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_setfield.cpp" />
     <ClCompile Include="DllmainData_structures.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_data_structures1.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_data_structures2.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\data_structures_gw.hxx" />
@@ -250,4 +248,4 @@ lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index d1b0904..136dcee 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
     <ClCompile Include="DllmainData_structures.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_data_structures1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_data_structures2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\data_structures_gw.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -90,4 +84,4 @@
       <Filter>Resource File</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations1.c b/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations1.c
deleted file mode 100644 (file)
index 04e422b..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- * ...
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-/*--------------------------------------------------------------------------*/
-#include "gw_differential_equations1.h"
-#include "callFunctionFromGateway.h"
-#include "api_scilab.h"
-#include "MALLOC.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[] =
-{
-    {NULL, ""} //
-};
-/*--------------------------------------------------------------------------*/
-int gw_differential_equations1(void)
-{
-    if (pvApiCtx == NULL)
-    {
-        pvApiCtx = (StrCtx*)MALLOC(sizeof(StrCtx));
-    }
-
-    pvApiCtx->pstName = (char*)Tab[Fin - 1].name;
-    callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations2.c b/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations2.c
deleted file mode 100644 (file)
index a549045..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- * ...
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-/*--------------------------------------------------------------------------*/
-#include "gw_differential_equations2.h"
-#include "callFunctionFromGateway.h"
-#include "api_scilab.h"
-#include "MALLOC.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[] =
-{
-    {NULL, ""}, // impl
-    {NULL, ""}, // dassl
-    {NULL, ""}, // dasrt
-    {NULL, ""} // daskr
-};
-
-/*--------------------------------------------------------------------------*/
-int gw_differential_equations2(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations3.c b/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations3.c
deleted file mode 100644 (file)
index 85db0b4..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- * ...
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_differential_equations3.h"
-#include "callFunctionFromGateway.h"
-#include "api_scilab.h"
-#include "MALLOC.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[] =
-{
-    {NULL, ""} // odedc
-};
-/*--------------------------------------------------------------------------*/
-int gw_differential_equations3(void)
-{
-    if (pvApiCtx == NULL)
-    {
-        pvApiCtx = (StrCtx*)MALLOC(sizeof(StrCtx));
-    }
-
-    pvApiCtx->pstName = (char*)Tab[Fin - 1].name;
-    callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations4.c b/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations4.c
deleted file mode 100644 (file)
index 145ca84..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- * ...
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_differential_equations4.h"
-#include "callFunctionFromGateway.h"
-#include "api_scilab.h"
-#include "MALLOC.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[] =
-{
-    {NULL, ""}, // intg
-    {NULL, ""}, // int2d
-    {NULL, ""}, // int3d
-    {NULL, ""} // feval
-};
-/*--------------------------------------------------------------------------*/
-int gw_differential_equations4(void)
-{
-    if (pvApiCtx == NULL)
-    {
-        pvApiCtx = (StrCtx*)MALLOC(sizeof(StrCtx));
-    }
-
-    pvApiCtx->pstName = (char*)Tab[Fin - 1].name;
-    callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations6.c b/scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations6.c
deleted file mode 100644 (file)
index b797180..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- * ...
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-/*--------------------------------------------------------------------------*/
-#include "gw_differential_equations6.h"
-#include "callFunctionFromGateway.h"
-#include "api_scilab.h"
-#include "MALLOC.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[] =
-{
-    {NULL, ""} // bvode
-};
-/*--------------------------------------------------------------------------*/
-int gw_differential_equations6(void)
-{
-    if (pvApiCtx == NULL)
-    {
-        pvApiCtx = (StrCtx*)MALLOC(sizeof(StrCtx));
-    }
-
-    pvApiCtx->pstName = (char*)Tab[Fin - 1].name;
-    callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index 4ead0fa..85ebef3 100644 (file)
@@ -15,7 +15,7 @@ modulename=external_objects
 
 #### external_objects : Conf files ####
 libsciexternal_objects_la_rootdir = $(mydatadir)
-libsciexternal_objects_la_root_DATA =  license.txt 
+libsciexternal_objects_la_root_DATA =  license.txt
 
 
 #### external_objects : init scripts & configuration files ####
@@ -26,9 +26,9 @@ libsciexternal_objects_la_etc_DATA = \
 
 include $(top_srcdir)/Makefile.incl.am
 
-EXTERNAL_OBJECTS_JNI_SOURCES = 
+EXTERNAL_OBJECTS_JNI_SOURCES =
 
-EXTERNAL_OBJECTS_C_SOURCES = 
+EXTERNAL_OBJECTS_C_SOURCES =
 
 EXTERNAL_OBJECTS_CPP_SOURCES = \
     src/cpp/ScilabEnvironments.cpp \
@@ -80,8 +80,6 @@ EXTERNAL_OBJECTS_CPP_SOURCES = \
     src/cpp/wrapInFloat.cpp \
     src/cpp/EOType.cpp
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_external_objects.c
-
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/sci_percent_EObj_e.cpp \
        sci_gateway/cpp/sci_percent_EObj_p.cpp \
@@ -145,13 +143,13 @@ libsciexternal_objects_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/threads/includes \
     -I$(top_srcdir)/modules/console/includes
 
-pkglib_LTLIBRARIES = libsciexternal_objects.la 
-noinst_LTLIBRARIES = libsciexternal_objects-algo.la 
+pkglib_LTLIBRARIES = libsciexternal_objects.la
+noinst_LTLIBRARIES = libsciexternal_objects-algo.la
 
 libsciexternal_objects_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
 
 libsciexternal_objects_algo_la_SOURCES = $(EXTERNAL_OBJECTS_C_SOURCES) $(EXTERNAL_OBJECTS_JNI_SOURCES) $(EXTERNAL_OBJECTS_CPP_SOURCES)
-libsciexternal_objects_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) 
+libsciexternal_objects_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 libsciexternal_objects_algo_la_CFLAGS = $(libsciexternal_objects_la_CFLAGS)
 libsciexternal_objects_algo_la_CPPFLAGS = $(libsciexternal_objects_la_CPPFLAGS)
 
index ed98113..757b263 100644 (file)
@@ -235,8 +235,7 @@ am__DEPENDENCIES_1 =
 libsciexternal_objects_la_DEPENDENCIES =  \
        libsciexternal_objects-algo.la $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
-am__objects_3 = sci_gateway/c/libsciexternal_objects_la-gw_external_objects.lo
-am__objects_4 = sci_gateway/cpp/libsciexternal_objects_la-sci_percent_EObj_e.lo \
+am__objects_3 = sci_gateway/cpp/libsciexternal_objects_la-sci_percent_EObj_e.lo \
        sci_gateway/cpp/libsciexternal_objects_la-sci_percent_EObj_p.lo \
        sci_gateway/cpp/libsciexternal_objects_la-sci_percent_foo_i_EObj.lo \
        sci_gateway/cpp/libsciexternal_objects_la-sci_percent_EClass_e.lo \
@@ -267,8 +266,7 @@ am__objects_4 = sci_gateway/cpp/libsciexternal_objects_la-sci_percent_EObj_e.lo
        sci_gateway/cpp/libsciexternal_objects_la-sci_doubleExclam_invoke_.lo \
        sci_gateway/cpp/libsciexternal_objects_la-sci_invoke_lu.lo \
        sci_gateway/cpp/libsciexternal_objects_la-sci_percent_EObj_disp.lo
-am_libsciexternal_objects_la_OBJECTS = $(am__objects_3) \
-       $(am__objects_4)
+am_libsciexternal_objects_la_OBJECTS = $(am__objects_3)
 libsciexternal_objects_la_OBJECTS =  \
        $(am_libsciexternal_objects_la_OBJECTS)
 libsciexternal_objects_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
@@ -291,24 +289,6 @@ 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) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -650,7 +630,7 @@ modulename = external_objects
 
 #### external_objects : Conf files ####
 libsciexternal_objects_la_rootdir = $(mydatadir)
-libsciexternal_objects_la_root_DATA = license.txt 
+libsciexternal_objects_la_root_DATA = license.txt
 
 #### external_objects : init scripts & configuration files ####
 libsciexternal_objects_la_etcdir = $(mydatadir)/etc
@@ -783,7 +763,6 @@ EXTERNAL_OBJECTS_CPP_SOURCES = \
     src/cpp/wrapInFloat.cpp \
     src/cpp/EOType.cpp
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_external_objects.c
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/sci_percent_EObj_e.cpp \
        sci_gateway/cpp/sci_percent_EObj_p.cpp \
@@ -846,11 +825,11 @@ libsciexternal_objects_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/threads/includes \
     -I$(top_srcdir)/modules/console/includes
 
-pkglib_LTLIBRARIES = libsciexternal_objects.la 
-noinst_LTLIBRARIES = libsciexternal_objects-algo.la 
+pkglib_LTLIBRARIES = libsciexternal_objects.la
+noinst_LTLIBRARIES = libsciexternal_objects-algo.la
 libsciexternal_objects_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
 libsciexternal_objects_algo_la_SOURCES = $(EXTERNAL_OBJECTS_C_SOURCES) $(EXTERNAL_OBJECTS_JNI_SOURCES) $(EXTERNAL_OBJECTS_CPP_SOURCES)
-libsciexternal_objects_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) 
+libsciexternal_objects_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 libsciexternal_objects_algo_la_CFLAGS = $(libsciexternal_objects_la_CFLAGS)
 libsciexternal_objects_algo_la_CPPFLAGS = $(libsciexternal_objects_la_CPPFLAGS)
 libsciexternal_objects_la_LIBADD = libsciexternal_objects-algo.la $(X_LIBS) $(X_EXTRA_LIBS)
@@ -885,7 +864,7 @@ includes/ScilabStream.hxx
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
+.SUFFIXES: .sci .bin .cpp .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 \
@@ -1068,15 +1047,6 @@ src/cpp/libsciexternal_objects_algo_la-EOType.lo:  \
 
 libsciexternal_objects-algo.la: $(libsciexternal_objects_algo_la_OBJECTS) $(libsciexternal_objects_algo_la_DEPENDENCIES) $(EXTRA_libsciexternal_objects_algo_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK)  $(libsciexternal_objects_algo_la_OBJECTS) $(libsciexternal_objects_algo_la_LIBADD) $(LIBS)
-sci_gateway/c/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c
-       @: > sci_gateway/c/$(am__dirstamp)
-sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
-       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciexternal_objects_la-gw_external_objects.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp
        @: > sci_gateway/cpp/$(am__dirstamp)
@@ -1182,8 +1152,6 @@ libsciexternal_objects.la: $(libsciexternal_objects_la_OBJECTS) $(libsciexternal
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f sci_gateway/c/*.$(OBJEXT)
-       -rm -f sci_gateway/c/*.lo
        -rm -f sci_gateway/cpp/*.$(OBJEXT)
        -rm -f sci_gateway/cpp/*.lo
        -rm -f src/cpp/*.$(OBJEXT)
@@ -1192,7 +1160,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciexternal_objects_la-gw_external_objects.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_la-sci_doubleExclam_invoke_.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_la-sci_invoke_lu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_la-sci_percent_EClass_e.Plo@am__quote@
@@ -1273,37 +1240,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciexternal_objects_algo_la-wrapAsRef.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciexternal_objects_algo_la-wrapInFloat.Plo@am__quote@
 
-.c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-sci_gateway/c/libsciexternal_objects_la-gw_external_objects.lo: sci_gateway/c/gw_external_objects.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciexternal_objects_la_CPPFLAGS) $(CPPFLAGS) $(libsciexternal_objects_la_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciexternal_objects_la-gw_external_objects.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciexternal_objects_la-gw_external_objects.Tpo -c -o sci_gateway/c/libsciexternal_objects_la-gw_external_objects.lo `test -f 'sci_gateway/c/gw_external_objects.c' || echo '$(srcdir)/'`sci_gateway/c/gw_external_objects.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciexternal_objects_la-gw_external_objects.Tpo sci_gateway/c/$(DEPDIR)/libsciexternal_objects_la-gw_external_objects.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_external_objects.c' object='sci_gateway/c/libsciexternal_objects_la-gw_external_objects.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciexternal_objects_la_CPPFLAGS) $(CPPFLAGS) $(libsciexternal_objects_la_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciexternal_objects_la-gw_external_objects.lo `test -f 'sci_gateway/c/gw_external_objects.c' || echo '$(srcdir)/'`sci_gateway/c/gw_external_objects.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1886,7 +1822,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
        -rm -rf sci_gateway/cpp/.libs sci_gateway/cpp/_libs
        -rm -rf src/cpp/.libs src/cpp/_libs
 install-libsciexternal_objects_la_etcDATA: $(libsciexternal_objects_la_etc_DATA)
@@ -2090,8 +2025,6 @@ 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)
-       -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sci_gateway/c/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(am__dirstamp)
        -rm -f src/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -2106,7 +2039,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/cpp/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/cpp/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -2156,7 +2089,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/cpp/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/cpp/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
index 1af243f..cf04c43 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -244,7 +244,6 @@ lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_y_foo.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_z_foo.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_percent_foo_i_EObj.cpp" />
-    <ClCompile Include="sci_gateway\c\gw_external_objects.c" />
     <ClCompile Include="src\cpp\addNamedVariable.cpp" />
     <ClCompile Include="src\cpp\addToClasspath.cpp" />
     <ClCompile Include="src\cpp\array.cpp" />
index 0a2fd7c..66f4779 100644 (file)
@@ -77,9 +77,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="sci_gateway\c\gw_external_objects.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_gateway\cpp\sci_doubleExclam_invoke_.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/external_objects/sci_gateway/c/gw_external_objects.c b/scilab/modules/external_objects/sci_gateway/c/gw_external_objects.c
deleted file mode 100644 (file)
index 512d012..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - Scilab Enterprises - Calixte DENIZET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include "gw_external_objects.h"
-/*--------------------------------------------------------------------------*/
-/*  interface function */
-/*--------------------------------------------------------------------------*/
-//static gw_generic_table Tab[] =
-//{
-//    {sci_percent_EObj_e, "%_EObj_e"},
-//    {sci_percent_EObj_e, "%_EObj_6"},
-//    {sci_percent_EClass_e, "%_EClass_6"},
-//    {sci_percent_EObj_p, "%_EObj_p"},
-//    {sci_percent_EClass_e, "%_EClass_e"},
-//    {sci_percent_EObj_p, "%_EClass_p"},
-//    {sci_percent_foo_i_EObj, "%c_i__EObj"},
-//    {sci_percent_foo_i_EObj, "%s_i__EObj"},
-//    {sci_percent_foo_i_EObj, "%b_i__EObj"},
-//    {sci_percent_foo_i_EObj, "%i_i__EObj"},
-//    {sci_percent_foo_i_EObj, "%l_i__EObj"},
-//    {sci_percent_foo_i_EObj, "%_EObj_i__EObj"},
-//    {sci_percent_EObj_a_foo, "%_EObj_a_c"},
-//    {sci_percent_EObj_a_foo, "%_EObj_a_s"},
-//    {sci_percent_EObj_a_foo, "%_EObj_a_b"},
-//    {sci_percent_EObj_a_foo, "%_EObj_a_i"},
-//    {sci_percent_EObj_a_foo, "%_EObj_a__EObj"},
-//    {sci_percent_EObj_a_foo, "%c_a__EObj"},
-//    {sci_percent_EObj_a_foo, "%s_a__EObj"},
-//    {sci_percent_EObj_a_foo, "%b_a__EObj"},
-//    {sci_percent_EObj_a_foo, "%i_a__EObj"},
-//    {sci_percent_EObj_d_foo, "%_EObj_d_c"},
-//    {sci_percent_EObj_d_foo, "%_EObj_d_s"},
-//    {sci_percent_EObj_d_foo, "%_EObj_d_b"},
-//    {sci_percent_EObj_d_foo, "%_EObj_d_i"},
-//    {sci_percent_EObj_d_foo, "%_EObj_d__EObj"},
-//    {sci_percent_EObj_d_foo, "%c_d__EObj"},
-//    {sci_percent_EObj_d_foo, "%s_d__EObj"},
-//    {sci_percent_EObj_d_foo, "%b_d__EObj"},
-//    {sci_percent_EObj_d_foo, "%i_d__EObj"},
-//    {sci_percent_EObj_g_foo, "%_EObj_g_c"},
-//    {sci_percent_EObj_g_foo, "%_EObj_g_s"},
-//    {sci_percent_EObj_g_foo, "%_EObj_g_b"},
-//    {sci_percent_EObj_g_foo, "%_EObj_g_i"},
-//    {sci_percent_EObj_g_foo, "%_EObj_g__EObj"},
-//    {sci_percent_EObj_g_foo, "%c_g__EObj"},
-//    {sci_percent_EObj_g_foo, "%s_g__EObj"},
-//    {sci_percent_EObj_g_foo, "%b_g__EObj"},
-//    {sci_percent_EObj_g_foo, "%i_g__EObj"},
-//    {sci_percent_EObj_h_foo, "%_EObj_h_c"},
-//    {sci_percent_EObj_h_foo, "%_EObj_h_s"},
-//    {sci_percent_EObj_h_foo, "%_EObj_h_b"},
-//    {sci_percent_EObj_h_foo, "%_EObj_h_i"},
-//    {sci_percent_EObj_h_foo, "%_EObj_h__EObj"},
-//    {sci_percent_EObj_h_foo, "%c_h__EObj"},
-//    {sci_percent_EObj_h_foo, "%s_h__EObj"},
-//    {sci_percent_EObj_h_foo, "%b_h__EObj"},
-//    {sci_percent_EObj_h_foo, "%i_h__EObj"},
-//    {sci_percent_EObj_j_foo, "%_EObj_j_c"},
-//    {sci_percent_EObj_j_foo, "%_EObj_j_s"},
-//    {sci_percent_EObj_j_foo, "%_EObj_j_b"},
-//    {sci_percent_EObj_j_foo, "%_EObj_j_i"},
-//    {sci_percent_EObj_j_foo, "%_EObj_j__EObj"},
-//    {sci_percent_EObj_j_foo, "%c_j__EObj"},
-//    {sci_percent_EObj_j_foo, "%s_j__EObj"},
-//    {sci_percent_EObj_j_foo, "%b_j__EObj"},
-//    {sci_percent_EObj_j_foo, "%i_j__EObj"},
-//    {sci_percent_EObj_k_foo, "%_EObj_k_c"},
-//    {sci_percent_EObj_k_foo, "%_EObj_k_s"},
-//    {sci_percent_EObj_k_foo, "%_EObj_k_b"},
-//    {sci_percent_EObj_k_foo, "%_EObj_k_i"},
-//    {sci_percent_EObj_k_foo, "%_EObj_k__EObj"},
-//    {sci_percent_EObj_k_foo, "%c_k__EObj"},
-//    {sci_percent_EObj_k_foo, "%s_k__EObj"},
-//    {sci_percent_EObj_k_foo, "%b_k__EObj"},
-//    {sci_percent_EObj_k_foo, "%i_k__EObj"},
-//    {sci_percent_EObj_l_foo, "%_EObj_l_c"},
-//    {sci_percent_EObj_l_foo, "%_EObj_l_s"},
-//    {sci_percent_EObj_l_foo, "%_EObj_l_b"},
-//    {sci_percent_EObj_l_foo, "%_EObj_l_i"},
-//    {sci_percent_EObj_l_foo, "%_EObj_l__EObj"},
-//    {sci_percent_EObj_l_foo, "%c_l__EObj"},
-//    {sci_percent_EObj_l_foo, "%s_l__EObj"},
-//    {sci_percent_EObj_l_foo, "%b_l__EObj"},
-//    {sci_percent_EObj_l_foo, "%i_l__EObj"},
-//    {sci_percent_EObj_m_foo, "%_EObj_m_c"},
-//    {sci_percent_EObj_m_foo, "%_EObj_m_s"},
-//    {sci_percent_EObj_m_foo, "%_EObj_m_b"},
-//    {sci_percent_EObj_m_foo, "%_EObj_m_i"},
-//    {sci_percent_EObj_m_foo, "%_EObj_m__EObj"},
-//    {sci_percent_EObj_m_foo, "%c_m__EObj"},
-//    {sci_percent_EObj_m_foo, "%s_m__EObj"},
-//    {sci_percent_EObj_m_foo, "%b_m__EObj"},
-//    {sci_percent_EObj_m_foo, "%i_m__EObj"},
-//    {sci_percent_EObj_n_foo, "%_EObj_n_c"},
-//    {sci_percent_EObj_n_foo, "%_EObj_n_s"},
-//    {sci_percent_EObj_n_foo, "%_EObj_n_b"},
-//    {sci_percent_EObj_n_foo, "%_EObj_n_i"},
-//    {sci_percent_EObj_n_foo, "%_EObj_n__EObj"},
-//    {sci_percent_EObj_n_foo, "%c_n__EObj"},
-//    {sci_percent_EObj_n_foo, "%s_n__EObj"},
-//    {sci_percent_EObj_n_foo, "%b_n__EObj"},
-//    {sci_percent_EObj_n_foo, "%i_n__EObj"},
-//    {sci_percent_EObj_o_foo, "%_EObj_o_c"},
-//    {sci_percent_EObj_o_foo, "%_EObj_o_s"},
-//    {sci_percent_EObj_o_foo, "%_EObj_o_b"},
-//    {sci_percent_EObj_o_foo, "%_EObj_o_i"},
-//    {sci_percent_EObj_o_foo, "%_EObj_o__EObj"},
-//    {sci_percent_EObj_o_foo, "%c_o__EObj"},
-//    {sci_percent_EObj_o_foo, "%s_o__EObj"},
-//    {sci_percent_EObj_o_foo, "%b_o__EObj"},
-//    {sci_percent_EObj_o_foo, "%i_o__EObj"},
-//    {sci_percent_EObj_p_foo, "%_EObj_p_c"},
-//    {sci_percent_EObj_p_foo, "%_EObj_p_s"},
-//    {sci_percent_EObj_p_foo, "%_EObj_p_b"},
-//    {sci_percent_EObj_p_foo, "%_EObj_p_i"},
-//    {sci_percent_EObj_p_foo, "%_EObj_p__EObj"},
-//    {sci_percent_EObj_p_foo, "%c_p__EObj"},
-//    {sci_percent_EObj_p_foo, "%s_p__EObj"},
-//    {sci_percent_EObj_p_foo, "%b_p__EObj"},
-//    {sci_percent_EObj_p_foo, "%i_p__EObj"},
-//    {sci_percent_EObj_q_foo, "%_EObj_q_c"},
-//    {sci_percent_EObj_q_foo, "%_EObj_q_s"},
-//    {sci_percent_EObj_q_foo, "%_EObj_q_b"},
-//    {sci_percent_EObj_q_foo, "%_EObj_q_i"},
-//    {sci_percent_EObj_q_foo, "%_EObj_q__EObj"},
-//    {sci_percent_EObj_q_foo, "%c_q__EObj"},
-//    {sci_percent_EObj_q_foo, "%s_q__EObj"},
-//    {sci_percent_EObj_q_foo, "%b_q__EObj"},
-//    {sci_percent_EObj_q_foo, "%i_q__EObj"},
-//    {sci_percent_EObj_r_foo, "%_EObj_r_c"},
-//    {sci_percent_EObj_r_foo, "%_EObj_r_s"},
-//    {sci_percent_EObj_r_foo, "%_EObj_r_b"},
-//    {sci_percent_EObj_r_foo, "%_EObj_r_i"},
-//    {sci_percent_EObj_r_foo, "%_EObj_r__EObj"},
-//    {sci_percent_EObj_r_foo, "%c_r__EObj"},
-//    {sci_percent_EObj_r_foo, "%s_r__EObj"},
-//    {sci_percent_EObj_r_foo, "%b_r__EObj"},
-//    {sci_percent_EObj_r_foo, "%i_r__EObj"},
-//    {sci_percent_EObj_s_foo, "%_EObj_s_c"},
-//    {sci_percent_EObj_s_foo, "%_EObj_s_s"},
-//    {sci_percent_EObj_s_foo, "%_EObj_s_b"},
-//    {sci_percent_EObj_s_foo, "%_EObj_s_i"},
-//    {sci_percent_EObj_s_foo, "%_EObj_s__EObj"},
-//    {sci_percent_EObj_s_foo, "%c_s__EObj"},
-//    {sci_percent_EObj_s_foo, "%s_s__EObj"},
-//    {sci_percent_EObj_s_foo, "%b_s__EObj"},
-//    {sci_percent_EObj_s_foo, "%i_s__EObj"},
-//    {sci_percent_EObj_x_foo, "%_EObj_x_c"},
-//    {sci_percent_EObj_x_foo, "%_EObj_x_s"},
-//    {sci_percent_EObj_x_foo, "%_EObj_x_b"},
-//    {sci_percent_EObj_x_foo, "%_EObj_x_i"},
-//    {sci_percent_EObj_x_foo, "%_EObj_x__EObj"},
-//    {sci_percent_EObj_x_foo, "%c_x__EObj"},
-//    {sci_percent_EObj_x_foo, "%s_x__EObj"},
-//    {sci_percent_EObj_x_foo, "%b_x__EObj"},
-//    {sci_percent_EObj_x_foo, "%i_x__EObj"},
-//    {sci_percent_EObj_y_foo, "%_EObj_y_c"},
-//    {sci_percent_EObj_y_foo, "%_EObj_y_s"},
-//    {sci_percent_EObj_y_foo, "%_EObj_y_b"},
-//    {sci_percent_EObj_y_foo, "%_EObj_y_i"},
-//    {sci_percent_EObj_y_foo, "%_EObj_y__EObj"},
-//    {sci_percent_EObj_y_foo, "%c_y__EObj"},
-//    {sci_percent_EObj_y_foo, "%s_y__EObj"},
-//    {sci_percent_EObj_y_foo, "%b_y__EObj"},
-//    {sci_percent_EObj_y_foo, "%i_y__EObj"},
-//    {sci_percent_EObj_z_foo, "%_EObj_z_c"},
-//    {sci_percent_EObj_z_foo, "%_EObj_z_s"},
-//    {sci_percent_EObj_z_foo, "%_EObj_z_b"},
-//    {sci_percent_EObj_z_foo, "%_EObj_z_i"},
-//    {sci_percent_EObj_z_foo, "%_EObj_z__EObj"},
-//    {sci_percent_EObj_z_foo, "%c_z__EObj"},
-//    {sci_percent_EObj_z_foo, "%s_z__EObj"},
-//    {sci_percent_EObj_z_foo, "%b_z__EObj"},
-//    {sci_percent_EObj_z_foo, "%i_z__EObj"},
-//    {sci_percent_EObj_1_foo, "%_EObj_1_c"},
-//    {sci_percent_EObj_1_foo, "%_EObj_1_s"},
-//    {sci_percent_EObj_1_foo, "%_EObj_1_b"},
-//    {sci_percent_EObj_1_foo, "%_EObj_1_i"},
-//    {sci_percent_EObj_1_foo, "%_EObj_1__EObj"},
-//    {sci_percent_EObj_1_foo, "%c_1__EObj"},
-//    {sci_percent_EObj_1_foo, "%s_1__EObj"},
-//    {sci_percent_EObj_1_foo, "%b_1__EObj"},
-//    {sci_percent_EObj_1_foo, "%i_1__EObj"},
-//    {sci_percent_EObj_2_foo, "%_EObj_2_c"},
-//    {sci_percent_EObj_2_foo, "%_EObj_2_s"},
-//    {sci_percent_EObj_2_foo, "%_EObj_2_b"},
-//    {sci_percent_EObj_2_foo, "%_EObj_2_i"},
-//    {sci_percent_EObj_2_foo, "%_EObj_2__EObj"},
-//    {sci_percent_EObj_2_foo, "%c_2__EObj"},
-//    {sci_percent_EObj_2_foo, "%s_2__EObj"},
-//    {sci_percent_EObj_2_foo, "%b_2__EObj"},
-//    {sci_percent_EObj_2_foo, "%i_2__EObj"},
-//    {sci_percent_EObj_3_foo, "%_EObj_3_c"},
-//    {sci_percent_EObj_3_foo, "%_EObj_3_s"},
-//    {sci_percent_EObj_3_foo, "%_EObj_3_b"},
-//    {sci_percent_EObj_3_foo, "%_EObj_3_i"},
-//    {sci_percent_EObj_3_foo, "%_EObj_3__EObj"},
-//    {sci_percent_EObj_3_foo, "%c_3__EObj"},
-//    {sci_percent_EObj_3_foo, "%s_3__EObj"},
-//    {sci_percent_EObj_3_foo, "%b_3__EObj"},
-//    {sci_percent_EObj_3_foo, "%i_3__EObj"},
-//    {sci_percent_EObj_4_foo, "%_EObj_4_c"},
-//    {sci_percent_EObj_4_foo, "%_EObj_4_s"},
-//    {sci_percent_EObj_4_foo, "%_EObj_4_b"},
-//    {sci_percent_EObj_4_foo, "%_EObj_4_i"},
-//    {sci_percent_EObj_4_foo, "%_EObj_4__EObj"},
-//    {sci_percent_EObj_4_foo, "%c_4__EObj"},
-//    {sci_percent_EObj_4_foo, "%s_4__EObj"},
-//    {sci_percent_EObj_4_foo, "%b_4__EObj"},
-//    {sci_percent_EObj_4_foo, "%i_4__EObj"},
-//    {sci_percent_EObj_0, "%_EObj_0"},
-//    {sci_percent_EObj_5, "%_EObj_5"},
-//    {sci_percent_EObj_t, "%_EObj_t"},
-//    {sci_invoke_lu, "invoke_lu"},
-//    {sci_doubleExclam_invoke_, "!!_invoke_"},
-//    {sci_percent_EObj_disp, "%_EObj_disp"}
-//};
-
-/*--------------------------------------------------------------------------*/
-int gw_external_objects(void)
-{
-    return 0;
-}
-
-/*--------------------------------------------------------------------------*/
index 78cd6db..8720f81 100644 (file)
@@ -46,7 +46,6 @@ EXTERNAL_OBJECTS_JAVA_CPP_SOURCES = \
 #src/cpp/ScilabObjectsCPP.cpp
 # src/cpp/WrapAsDirectBuffer.cpp
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_external_objects_java.c \
     sci_gateway/cpp/sci_jimport.cpp \
     sci_gateway/cpp/sci_jgetclassname.cpp \
     sci_gateway/cpp/sci_jwrap.cpp \
index 0088d14..33e3a31 100644 (file)
@@ -200,7 +200,7 @@ libsciexternal_objects_java_la_DEPENDENCIES =  \
        $(top_builddir)/modules/commons/libscicommons.la \
        $(top_builddir)/modules/jvm/libscijvm.la $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
-am__objects_3 = sci_gateway/c/libsciexternal_objects_java_la-gw_external_objects_java.lo \
+am__objects_3 =  \
        sci_gateway/cpp/libsciexternal_objects_java_la-sci_jimport.lo \
        sci_gateway/cpp/libsciexternal_objects_java_la-sci_jgetclassname.lo \
        sci_gateway/cpp/libsciexternal_objects_java_la-sci_jwrap.lo \
@@ -252,24 +252,6 @@ 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) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -712,7 +694,6 @@ EXTERNAL_OBJECTS_JAVA_CPP_SOURCES = \
 #src/cpp/ScilabObjectsCPP.cpp
 # src/cpp/WrapAsDirectBuffer.cpp
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_external_objects_java.c \
     sci_gateway/cpp/sci_jimport.cpp \
     sci_gateway/cpp/sci_jgetclassname.cpp \
     sci_gateway/cpp/sci_jwrap.cpp \
@@ -819,7 +800,7 @@ all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
+.SUFFIXES: .sci .bin .cpp .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 \
@@ -934,15 +915,6 @@ src/jni/libsciexternal_objects_java_algo_la-ScilabOperations.lo:  \
 
 libsciexternal_objects_java-algo.la: $(libsciexternal_objects_java_algo_la_OBJECTS) $(libsciexternal_objects_java_algo_la_DEPENDENCIES) $(EXTRA_libsciexternal_objects_java_algo_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK)  $(libsciexternal_objects_java_algo_la_OBJECTS) $(libsciexternal_objects_java_algo_la_LIBADD) $(LIBS)
-sci_gateway/c/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c
-       @: > sci_gateway/c/$(am__dirstamp)
-sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
-       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciexternal_objects_java_la-gw_external_objects_java.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp
        @: > sci_gateway/cpp/$(am__dirstamp)
@@ -1036,8 +1008,6 @@ libsciexternal_objects_java.la: $(libsciexternal_objects_java_la_OBJECTS) $(libs
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f sci_gateway/c/*.$(OBJEXT)
-       -rm -f sci_gateway/c/*.lo
        -rm -f sci_gateway/cpp/*.$(OBJEXT)
        -rm -f sci_gateway/cpp/*.lo
        -rm -f src/cpp/*.$(OBJEXT)
@@ -1048,7 +1018,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciexternal_objects_java_la-gw_external_objects_java.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jallowClassReloading.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jarray.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jautoTranspose.Plo@am__quote@
@@ -1088,37 +1057,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/jni/$(DEPDIR)/libsciexternal_objects_java_algo_la-ScilabJavaObject.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/jni/$(DEPDIR)/libsciexternal_objects_java_algo_la-ScilabOperations.Plo@am__quote@
 
-.c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-sci_gateway/c/libsciexternal_objects_java_la-gw_external_objects_java.lo: sci_gateway/c/gw_external_objects_java.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciexternal_objects_java_la_CPPFLAGS) $(CPPFLAGS) $(libsciexternal_objects_java_la_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciexternal_objects_java_la-gw_external_objects_java.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciexternal_objects_java_la-gw_external_objects_java.Tpo -c -o sci_gateway/c/libsciexternal_objects_java_la-gw_external_objects_java.lo `test -f 'sci_gateway/c/gw_external_objects_java.c' || echo '$(srcdir)/'`sci_gateway/c/gw_external_objects_java.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciexternal_objects_java_la-gw_external_objects_java.Tpo sci_gateway/c/$(DEPDIR)/libsciexternal_objects_java_la-gw_external_objects_java.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_external_objects_java.c' object='sci_gateway/c/libsciexternal_objects_java_la-gw_external_objects_java.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciexternal_objects_java_la_CPPFLAGS) $(CPPFLAGS) $(libsciexternal_objects_java_la_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciexternal_objects_java_la-gw_external_objects_java.lo `test -f 'sci_gateway/c/gw_external_objects_java.c' || echo '$(srcdir)/'`sci_gateway/c/gw_external_objects_java.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1414,7 +1352,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
        -rm -rf sci_gateway/cpp/.libs sci_gateway/cpp/_libs
        -rm -rf src/cpp/.libs src/cpp/_libs
        -rm -rf src/jni/.libs src/jni/_libs
@@ -1642,8 +1579,6 @@ 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)
-       -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sci_gateway/c/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(am__dirstamp)
        -rm -f src/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -1661,7 +1596,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -1712,7 +1647,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
index cc10bf1..ede8b9f 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
     <ClCompile Include="sci_gateway\cpp\sci_junwraprem.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_jwrap.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_jwrapinfloat.cpp" />
-    <ClCompile Include="sci_gateway\c\gw_external_objects_java.c" />
     <ClCompile Include="src\cpp\dllMain.cpp" />
     <ClCompile Include="src\cpp\JavaOptionsSetter.cpp" />
     <ClCompile Include="src\cpp\NoMoreScilabMemoryException.cpp" />
index e6400a0..2e7d797 100644 (file)
@@ -42,9 +42,6 @@
     <ClCompile Include="src\jni\ScilabJavaObject.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\gw_external_objects_java.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_gateway\cpp\sci_jallowClassReloading.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/external_objects_java/sci_gateway/c/gw_external_objects_java.c b/scilab/modules/external_objects_java/sci_gateway/c/gw_external_objects_java.c
deleted file mode 100644 (file)
index ced00ed..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - Scilab Enterprises - Calixte DENIZET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include "gw_external_objects_java.h"
-
-/*--------------------------------------------------------------------------*/
-/*  interface function */
-/*--------------------------------------------------------------------------*/
-/*--------------------------------------------------------------------------*/
-int gw_external_objects_java(void)
-{
-    return 0;
-}
-
-/*--------------------------------------------------------------------------*/
index b003653..6ed428d 100644 (file)
@@ -45,7 +45,6 @@ FFTW_CPP_SOURCES = \
     src/cpp/fftw_common.cpp
 
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_fftw.c \
        sci_gateway/c/sci_fftwlibraryisloaded.c \
        sci_gateway/c/sci_disposefftwlibrary.c \
        sci_gateway/c/sci_fftw_flags.c \
index 64ccb9a..540f892 100644 (file)
@@ -191,7 +191,7 @@ am__DEPENDENCIES_1 =
 @FFTW_TRUE@libscifftw_la_DEPENDENCIES = libscifftw-algo.la \
 @FFTW_TRUE@    $(am__DEPENDENCIES_1)
 am__libscifftw_la_SOURCES_DIST = src/nofftw/nofftw.cpp \
-       src/cpp/fftw_common.cpp sci_gateway/c/gw_fftw.c \
+       src/cpp/fftw_common.cpp \
        sci_gateway/c/sci_fftwlibraryisloaded.c \
        sci_gateway/c/sci_disposefftwlibrary.c \
        sci_gateway/c/sci_fftw_flags.c \
@@ -203,8 +203,7 @@ am__libscifftw_la_SOURCES_DIST = src/nofftw/nofftw.cpp \
        sci_gateway/cpp/sci_dst.cpp sci_gateway/cpp/sci_dct.cpp
 @FFTW_FALSE@am__objects_3 = src/nofftw/libscifftw_la-nofftw.lo
 @FFTW_TRUE@am__objects_3 = src/cpp/libscifftw_la-fftw_common.lo
-@FFTW_TRUE@am__objects_4 = sci_gateway/c/libscifftw_la-gw_fftw.lo \
-@FFTW_TRUE@    sci_gateway/c/libscifftw_la-sci_fftwlibraryisloaded.lo \
+@FFTW_TRUE@am__objects_4 = sci_gateway/c/libscifftw_la-sci_fftwlibraryisloaded.lo \
 @FFTW_TRUE@    sci_gateway/c/libscifftw_la-sci_disposefftwlibrary.lo \
 @FFTW_TRUE@    sci_gateway/c/libscifftw_la-sci_fftw_flags.lo \
 @FFTW_TRUE@    sci_gateway/c/libscifftw_la-sci_loadfftwlibrary.lo \
@@ -617,7 +616,6 @@ libscifftw_la_etc_DATA = \
 @FFTW_TRUE@    src/cpp/fftw_common.cpp
 
 @FFTW_TRUE@GATEWAY_C_SOURCES = \
-@FFTW_TRUE@    sci_gateway/c/gw_fftw.c \
 @FFTW_TRUE@    sci_gateway/c/sci_fftwlibraryisloaded.c \
 @FFTW_TRUE@    sci_gateway/c/sci_disposefftwlibrary.c \
 @FFTW_TRUE@    sci_gateway/c/sci_fftw_flags.c \
@@ -886,8 +884,6 @@ sci_gateway/c/$(am__dirstamp):
 sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
        @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscifftw_la-gw_fftw.lo: sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscifftw_la-sci_fftwlibraryisloaded.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -947,7 +943,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscifftw_la-gw_fftw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscifftw_la-sci_disposefftwlibrary.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscifftw_la-sci_fftw_flags.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscifftw_la-sci_fftw_forget_wisdom.Plo@am__quote@
@@ -1020,13 +1015,6 @@ src/c/libscifftw_algo_la-with_fftw.lo: src/c/with_fftw.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifftw_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libscifftw_algo_la-with_fftw.lo `test -f 'src/c/with_fftw.c' || echo '$(srcdir)/'`src/c/with_fftw.c
 
-sci_gateway/c/libscifftw_la-gw_fftw.lo: sci_gateway/c/gw_fftw.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifftw_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscifftw_la-gw_fftw.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscifftw_la-gw_fftw.Tpo -c -o sci_gateway/c/libscifftw_la-gw_fftw.lo `test -f 'sci_gateway/c/gw_fftw.c' || echo '$(srcdir)/'`sci_gateway/c/gw_fftw.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscifftw_la-gw_fftw.Tpo sci_gateway/c/$(DEPDIR)/libscifftw_la-gw_fftw.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_fftw.c' object='sci_gateway/c/libscifftw_la-gw_fftw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifftw_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscifftw_la-gw_fftw.lo `test -f 'sci_gateway/c/gw_fftw.c' || echo '$(srcdir)/'`sci_gateway/c/gw_fftw.c
-
 sci_gateway/c/libscifftw_la-sci_fftwlibraryisloaded.lo: sci_gateway/c/sci_fftwlibraryisloaded.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifftw_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscifftw_la-sci_fftwlibraryisloaded.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscifftw_la-sci_fftwlibraryisloaded.Tpo -c -o sci_gateway/c/libscifftw_la-sci_fftwlibraryisloaded.lo `test -f 'sci_gateway/c/sci_fftwlibraryisloaded.c' || echo '$(srcdir)/'`sci_gateway/c/sci_fftwlibraryisloaded.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscifftw_la-sci_fftwlibraryisloaded.Tpo sci_gateway/c/$(DEPDIR)/libscifftw_la-sci_fftwlibraryisloaded.Plo
index 75062fa..445088e 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -205,7 +205,6 @@ lib /DEF:"$(ProjectDir)Elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\DllmainFttw.c" />
     <ClCompile Include="src\c\fftw_utilities.c" />
     <ClCompile Include="src\c\fftwlibname.c" />
-    <ClCompile Include="sci_gateway\c\gw_fftw.c" />
     <ClCompile Include="sci_gateway\c\sci_disposefftwlibrary.c" />
     <ClCompile Include="sci_gateway\c\sci_fftw_flags.c" />
     <ClCompile Include="sci_gateway\c\sci_fftw_forget_wisdom.c" />
@@ -257,4 +256,4 @@ lib /DEF:"$(ProjectDir)Elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index 0c20c90..411b7d5 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -36,9 +36,6 @@
     <ClCompile Include="src\c\fftwlibname.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\gw_fftw.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_gateway\c\sci_disposefftwlibrary.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <None Include="locales\fftw.pot" />
     <None Include="locales\fftw.pot" />
     <None Include="locales\fftw.pot" />
+    <None Include="locales\fftw.pot" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/fftw/sci_gateway/c/gw_fftw.c b/scilab/modules/fftw/sci_gateway/c/gw_fftw.c
deleted file mode 100644 (file)
index 6b72725..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-#include "callfftw.h"
-#include "Scierror.h"
-#include "sci_malloc.h"
-#include "fftwlibname.h"
-#include "gw_fftw.h"
-#include "callFunctionFromGateway.h"
-#include "localization.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-/*--------------------------------------------------------------------------*/
-int gw_fftw(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index 8860ffd..6f31c06 100644 (file)
@@ -40,7 +40,6 @@ FILEIO_C_SOURCES = \
        src/c/convert_tools.c
 
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_fileio.c \
     sci_gateway/c/sci_fprintfMat.c \
     sci_gateway/c/sci_fscanfMat.c \
     sci_gateway/c/sci_chdir.c \
index d4867ea..1701bdd 100644 (file)
@@ -232,8 +232,7 @@ libscifileio_algo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 @MAINTAINER_MODE_FALSE@am_libscifileio_algo_la_rpath =
 @MAINTAINER_MODE_TRUE@am_libscifileio_algo_la_rpath =
 libscifileio_la_DEPENDENCIES = libscifileio-algo.la
-am__objects_3 = sci_gateway/c/libscifileio_la-gw_fileio.lo \
-       sci_gateway/c/libscifileio_la-sci_fprintfMat.lo \
+am__objects_3 = sci_gateway/c/libscifileio_la-sci_fprintfMat.lo \
        sci_gateway/c/libscifileio_la-sci_fscanfMat.lo \
        sci_gateway/c/libscifileio_la-sci_chdir.lo \
        sci_gateway/c/libscifileio_la-sci_pwd.lo \
@@ -687,7 +686,6 @@ FILEIO_C_SOURCES = \
        src/c/convert_tools.c
 
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_fileio.c \
     sci_gateway/c/sci_fprintfMat.c \
     sci_gateway/c/sci_fscanfMat.c \
     sci_gateway/c/sci_chdir.c \
@@ -1100,9 +1098,6 @@ sci_gateway/c/$(am__dirstamp):
 sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
        @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscifileio_la-gw_fileio.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscifileio_la-sci_fprintfMat.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -1268,7 +1263,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscifileio_la-gw_fileio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscifileio_la-sci_chdir.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscifileio_la-sci_copyfile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscifileio_la-sci_fprintfMat.Plo@am__quote@
@@ -1624,13 +1618,6 @@ src/c/libscifileio_algo_la-convert_tools.lo: src/c/convert_tools.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libscifileio_algo_la-convert_tools.lo `test -f 'src/c/convert_tools.c' || echo '$(srcdir)/'`src/c/convert_tools.c
 
-sci_gateway/c/libscifileio_la-gw_fileio.lo: sci_gateway/c/gw_fileio.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscifileio_la-gw_fileio.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscifileio_la-gw_fileio.Tpo -c -o sci_gateway/c/libscifileio_la-gw_fileio.lo `test -f 'sci_gateway/c/gw_fileio.c' || echo '$(srcdir)/'`sci_gateway/c/gw_fileio.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscifileio_la-gw_fileio.Tpo sci_gateway/c/$(DEPDIR)/libscifileio_la-gw_fileio.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_fileio.c' object='sci_gateway/c/libscifileio_la-gw_fileio.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscifileio_la-gw_fileio.lo `test -f 'sci_gateway/c/gw_fileio.c' || echo '$(srcdir)/'`sci_gateway/c/gw_fileio.c
-
 sci_gateway/c/libscifileio_la-sci_fprintfMat.lo: sci_gateway/c/sci_fprintfMat.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscifileio_la-sci_fprintfMat.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscifileio_la-sci_fprintfMat.Tpo -c -o sci_gateway/c/libscifileio_la-sci_fprintfMat.lo `test -f 'sci_gateway/c/sci_fprintfMat.c' || echo '$(srcdir)/'`sci_gateway/c/sci_fprintfMat.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscifileio_la-sci_fprintfMat.Tpo sci_gateway/c/$(DEPDIR)/libscifileio_la-sci_fprintfMat.Plo
index 879cf35..4f5c373 100644 (file)
@@ -240,7 +240,6 @@ lib /DEF:"$(ProjectDir)preferences_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
     <ClCompile Include="src\c\getlongpathname.c" />
     <ClCompile Include="src\c\getrelativefilename.c" />
     <ClCompile Include="src\c\getshortpathname.c" />
-    <ClCompile Include="sci_gateway\c\gw_fileio.c" />
     <ClCompile Include="src\c\isdir.c" />
     <ClCompile Include="src\c\isDrive.c" />
     <ClCompile Include="src\cpp\mclose.cpp" />
index a01801c..73dd423 100644 (file)
@@ -87,9 +87,6 @@
     <ClCompile Include="src\c\getshortpathname.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\gw_fileio.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\isdir.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/fileio/sci_gateway/c/gw_fileio.c b/scilab/modules/fileio/sci_gateway/c/gw_fileio.c
deleted file mode 100644 (file)
index 6e0be73..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- * Copyright (C) 2010 - DIGITEO - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include "gw_fileio.h"
-#include "callFunctionFromGateway.h"
-#include "sci_malloc.h"
-#include "api_scilab.h"
-/*--------------------------------------------------------------------------*/
-int gw_fileio(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index efc083c..c127058 100644 (file)
@@ -3,9 +3,6 @@
 #
 # This file is distributed under the same license as the Scilab package.
 
-GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_functions.c
-
 GATEWAY_CPP_SOURCES =  \
     sci_gateway/cpp/sci_exec.cpp \
     sci_gateway/cpp/sci_functionlist.cpp \
@@ -44,7 +41,7 @@ libscifunctions_la_CPPFLAGS = \
 
 pkglib_LTLIBRARIES = libscifunctions.la
 
-libscifunctions_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscifunctions_la_SOURCES = $(GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
 CHECK_SRC= $(FUNCTIONS_SOURCES) $(GATEWAY_SOURCES)
index a6f6e22..1a92df1 100644 (file)
@@ -164,8 +164,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscifunctions_la_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
-am__objects_1 = sci_gateway/c/libscifunctions_la-gw_functions.lo
-am__objects_2 = sci_gateway/cpp/libscifunctions_la-sci_exec.lo \
+am__objects_1 = sci_gateway/cpp/libscifunctions_la-sci_exec.lo \
        sci_gateway/cpp/libscifunctions_la-sci_functionlist.lo \
        sci_gateway/cpp/libscifunctions_la-sci_whereis.lo \
        sci_gateway/cpp/libscifunctions_la-sci_execstr.lo \
@@ -176,7 +175,7 @@ am__objects_2 = sci_gateway/cpp/libscifunctions_la-sci_exec.lo \
        sci_gateway/cpp/libscifunctions_la-sci_librarieslist.lo \
        sci_gateway/cpp/libscifunctions_la-sci_testGVN.lo \
        sci_gateway/cpp/libscifunctions_la-sci_testAnalysis.lo
-am_libscifunctions_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+am_libscifunctions_la_OBJECTS = $(am__objects_1)
 libscifunctions_la_OBJECTS = $(am_libscifunctions_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -198,24 +197,6 @@ 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) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -547,9 +528,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 yacc_present = @yacc_present@
-GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_functions.c
-
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/sci_exec.cpp \
     sci_gateway/cpp/sci_functionlist.cpp \
@@ -587,7 +565,7 @@ libscifunctions_la_CPPFLAGS = \
     $(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libscifunctions.la
-libscifunctions_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscifunctions_la_SOURCES = $(GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
 CHECK_SRC = $(FUNCTIONS_SOURCES) $(GATEWAY_SOURCES)
@@ -686,7 +664,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
+.SUFFIXES: .sci .bin .cpp .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 \
@@ -753,15 +731,6 @@ clean-pkglibLTLIBRARIES:
          echo rm -f $${locs}; \
          rm -f $${locs}; \
        }
-sci_gateway/c/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c
-       @: > sci_gateway/c/$(am__dirstamp)
-sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
-       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscifunctions_la-gw_functions.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp
        @: > sci_gateway/cpp/$(am__dirstamp)
@@ -807,15 +776,12 @@ libscifunctions.la: $(libscifunctions_la_OBJECTS) $(libscifunctions_la_DEPENDENC
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f sci_gateway/c/*.$(OBJEXT)
-       -rm -f sci_gateway/c/*.lo
        -rm -f sci_gateway/cpp/*.$(OBJEXT)
        -rm -f sci_gateway/cpp/*.lo
 
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscifunctions_la-gw_functions.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_exec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_execstr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_functionlist.Plo@am__quote@
@@ -828,37 +794,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_testGVN.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscifunctions_la-sci_whereis.Plo@am__quote@
 
-.c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-sci_gateway/c/libscifunctions_la-gw_functions.lo: sci_gateway/c/gw_functions.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifunctions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscifunctions_la-gw_functions.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscifunctions_la-gw_functions.Tpo -c -o sci_gateway/c/libscifunctions_la-gw_functions.lo `test -f 'sci_gateway/c/gw_functions.c' || echo '$(srcdir)/'`sci_gateway/c/gw_functions.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscifunctions_la-gw_functions.Tpo sci_gateway/c/$(DEPDIR)/libscifunctions_la-gw_functions.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_functions.c' object='sci_gateway/c/libscifunctions_la-gw_functions.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifunctions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscifunctions_la-gw_functions.lo `test -f 'sci_gateway/c/gw_functions.c' || echo '$(srcdir)/'`sci_gateway/c/gw_functions.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -965,7 +900,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
        -rm -rf sci_gateway/cpp/.libs sci_gateway/cpp/_libs
 install-libscifunctions_la_etcDATA: $(libscifunctions_la_etc_DATA)
        @$(NORMAL_INSTALL)
@@ -1147,8 +1081,6 @@ 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)
-       -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sci_gateway/c/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(am__dirstamp)
 
@@ -1161,7 +1093,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -1209,7 +1141,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/scilab/modules/functions/sci_gateway/c/gw_functions.c b/scilab/modules/functions/sci_gateway/c/gw_functions.c
deleted file mode 100644 (file)
index 8b4038b..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2009 - DIGITEO - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-
-#include "gw_functions.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-int gw_functions(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index 02e915b..70e80dd 100644 (file)
@@ -191,7 +191,6 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="DllmainFunctions.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_functions.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\dynlib_functions.h" />
index b3ed10a..23f3775 100644 (file)
@@ -26,9 +26,6 @@
     <ClCompile Include="DllmainFunctions.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_functions.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\dynlib_functions.h">
index da472f4..e7f92c5 100644 (file)
@@ -33,7 +33,6 @@ GRAPHIC_EXPORT_CXX_SOURCES = \
 
 # List of the gateway c files
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_graphic_export.c \
     sci_gateway/c/xs2file.c \
     sci_gateway/c/sci_xs2bmp.c \
     sci_gateway/c/sci_xs2gif.c \
index 3ae9a6d..fa8bc04 100644 (file)
@@ -189,9 +189,7 @@ am_libscigraphic_export_disable_la_OBJECTS = src/nographic_export/libscigraphic_
 libscigraphic_export_disable_la_OBJECTS =  \
        $(am_libscigraphic_export_disable_la_OBJECTS)
 libscigraphic_export_la_DEPENDENCIES = libscigraphic_export-algo.la
-am__objects_2 =  \
-       sci_gateway/c/libscigraphic_export_la-gw_graphic_export.lo \
-       sci_gateway/c/libscigraphic_export_la-xs2file.lo \
+am__objects_2 = sci_gateway/c/libscigraphic_export_la-xs2file.lo \
        sci_gateway/c/libscigraphic_export_la-sci_xs2bmp.lo \
        sci_gateway/c/libscigraphic_export_la-sci_xs2gif.lo \
        sci_gateway/c/libscigraphic_export_la-sci_xs2ppm.lo \
@@ -603,7 +601,6 @@ GRAPHIC_EXPORT_CXX_SOURCES = \
 
 # List of the gateway c files
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_graphic_export.c \
     sci_gateway/c/xs2file.c \
     sci_gateway/c/sci_xs2bmp.c \
     sci_gateway/c/sci_xs2gif.c \
@@ -885,9 +882,6 @@ sci_gateway/c/$(am__dirstamp):
 sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
        @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscigraphic_export_la-gw_graphic_export.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscigraphic_export_la-xs2file.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -956,7 +950,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphic_export_la-gw_graphic_export.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphic_export_la-sci_xs2bmp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphic_export_la-sci_xs2emf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphic_export_la-sci_xs2eps.Plo@am__quote@
@@ -1007,13 +1000,6 @@ src/nographic_export/libscigraphic_export_disable_la-nographic_export.lo: src/no
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_export_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/nographic_export/libscigraphic_export_disable_la-nographic_export.lo `test -f 'src/nographic_export/nographic_export.c' || echo '$(srcdir)/'`src/nographic_export/nographic_export.c
 
-sci_gateway/c/libscigraphic_export_la-gw_graphic_export.lo: sci_gateway/c/gw_graphic_export.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_export_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigraphic_export_la-gw_graphic_export.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigraphic_export_la-gw_graphic_export.Tpo -c -o sci_gateway/c/libscigraphic_export_la-gw_graphic_export.lo `test -f 'sci_gateway/c/gw_graphic_export.c' || echo '$(srcdir)/'`sci_gateway/c/gw_graphic_export.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigraphic_export_la-gw_graphic_export.Tpo sci_gateway/c/$(DEPDIR)/libscigraphic_export_la-gw_graphic_export.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_graphic_export.c' object='sci_gateway/c/libscigraphic_export_la-gw_graphic_export.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_export_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigraphic_export_la-gw_graphic_export.lo `test -f 'sci_gateway/c/gw_graphic_export.c' || echo '$(srcdir)/'`sci_gateway/c/gw_graphic_export.c
-
 sci_gateway/c/libscigraphic_export_la-xs2file.lo: sci_gateway/c/xs2file.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_export_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigraphic_export_la-xs2file.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigraphic_export_la-xs2file.Tpo -c -o sci_gateway/c/libscigraphic_export_la-xs2file.lo `test -f 'sci_gateway/c/xs2file.c' || echo '$(srcdir)/'`sci_gateway/c/xs2file.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigraphic_export_la-xs2file.Tpo sci_gateway/c/$(DEPDIR)/libscigraphic_export_la-xs2file.Plo
index bfa1422..7e3a9a6 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -257,7 +257,6 @@ lib /DEF:"$(ProjectDir)graphics_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClCompile Include="src\jni\Driver.cpp" />
     <ClCompile Include="src\jni\FileExporter.cpp" />
     <ClCompile Include="src\c\DllmainGraphics_export.c" />
-    <ClCompile Include="sci_gateway\c\gw_graphic_export.c" />
     <ClCompile Include="sci_gateway\c\sci_xs2bmp.c" />
     <ClCompile Include="sci_gateway\c\sci_xs2eps.c" />
     <ClCompile Include="sci_gateway\c\sci_xs2gif.c" />
index dd2b95e..67f801b 100644 (file)
@@ -48,9 +48,6 @@
     <ClCompile Include="src\c\DllmainGraphics_export.c">
       <Filter>Source Files\c</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\gw_graphic_export.c">
-      <Filter>Source Files\c</Filter>
-    </ClCompile>
     <ClCompile Include="sci_gateway\c\sci_xs2bmp.c">
       <Filter>Source Files\c</Filter>
     </ClCompile>
diff --git a/scilab/modules/graphic_export/sci_gateway/c/gw_graphic_export.c b/scilab/modules/graphic_export/sci_gateway/c/gw_graphic_export.c
deleted file mode 100644 (file)
index 26cb407..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Allan CORNET
- * Copyright (C) 2008 - INRIA - Jean-Baptiste SILVY
- *
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-#include <string.h>
-#include "BOOL.h"
-#include "gw_graphic_export.h"
-#include "callFunctionFromGateway.h"
-
-/*--------------------------------------------------------------------------*/
-int gw_graphic_export(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index d2cb82a..ee44a93 100644 (file)
@@ -441,7 +441,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_drawlater.c \
     sci_gateway/c/sci_champ.c \
     sci_gateway/c/sci_unglue.c \
-    sci_gateway/c/gw_graphics.c \
     sci_gateway/c/sci_zoom_rect.c \
     sci_gateway/c/sci_delete.c \
     sci_gateway/c/sci_plot2d.c \
index 2e85c25..243f416 100644 (file)
@@ -597,7 +597,6 @@ am__objects_3 = sci_gateway/c/libscigraphics_la-sci_swap_handles.lo \
        sci_gateway/c/libscigraphics_la-sci_drawlater.lo \
        sci_gateway/c/libscigraphics_la-sci_champ.lo \
        sci_gateway/c/libscigraphics_la-sci_unglue.lo \
-       sci_gateway/c/libscigraphics_la-gw_graphics.lo \
        sci_gateway/c/libscigraphics_la-sci_zoom_rect.lo \
        sci_gateway/c/libscigraphics_la-sci_delete.lo \
        sci_gateway/c/libscigraphics_la-sci_plot2d.lo \
@@ -1432,7 +1431,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_drawlater.c \
     sci_gateway/c/sci_champ.c \
     sci_gateway/c/sci_unglue.c \
-    sci_gateway/c/gw_graphics.c \
     sci_gateway/c/sci_zoom_rect.c \
     sci_gateway/c/sci_delete.c \
     sci_gateway/c/sci_plot2d.c \
@@ -2967,9 +2965,6 @@ sci_gateway/c/libscigraphics_la-sci_champ.lo:  \
 sci_gateway/c/libscigraphics_la-sci_unglue.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscigraphics_la-gw_graphics.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscigraphics_la-sci_zoom_rect.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -3088,7 +3083,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-gw_graphics.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_Legend.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_StringBox.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_addcolor.Plo@am__quote@
@@ -6397,13 +6391,6 @@ sci_gateway/c/libscigraphics_la-sci_unglue.lo: sci_gateway/c/sci_unglue.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigraphics_la-sci_unglue.lo `test -f 'sci_gateway/c/sci_unglue.c' || echo '$(srcdir)/'`sci_gateway/c/sci_unglue.c
 
-sci_gateway/c/libscigraphics_la-gw_graphics.lo: sci_gateway/c/gw_graphics.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigraphics_la-gw_graphics.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigraphics_la-gw_graphics.Tpo -c -o sci_gateway/c/libscigraphics_la-gw_graphics.lo `test -f 'sci_gateway/c/gw_graphics.c' || echo '$(srcdir)/'`sci_gateway/c/gw_graphics.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigraphics_la-gw_graphics.Tpo sci_gateway/c/$(DEPDIR)/libscigraphics_la-gw_graphics.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_graphics.c' object='sci_gateway/c/libscigraphics_la-gw_graphics.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigraphics_la-gw_graphics.lo `test -f 'sci_gateway/c/gw_graphics.c' || echo '$(srcdir)/'`sci_gateway/c/gw_graphics.c
-
 sci_gateway/c/libscigraphics_la-sci_zoom_rect.lo: sci_gateway/c/sci_zoom_rect.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigraphics_la-sci_zoom_rect.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_zoom_rect.Tpo -c -o sci_gateway/c/libscigraphics_la-sci_zoom_rect.lo `test -f 'sci_gateway/c/sci_zoom_rect.c' || echo '$(srcdir)/'`sci_gateway/c/sci_zoom_rect.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_zoom_rect.Tpo sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_zoom_rect.Plo
index feceb70..a92e9d9 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -468,7 +468,6 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\getPropertyAssignedValue.c" />
     <ClCompile Include="src\c\graphicModuleLoad.c" />
     <ClCompile Include="src\c\Gray.c" />
-    <ClCompile Include="sci_gateway\c\gw_graphics.c" />
     <ClCompile Include="src\c\InitObjects.c" />
     <ClCompile Include="src\c\Interaction.c" />
     <ClCompile Include="src\c\loadTextRenderingAPI.c" />
@@ -786,4 +785,4 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index ca18afd..80a12ea 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
     <ClCompile Include="src\c\Gray.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\gw_graphics.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\InitObjects.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <None Include="graphics.iss" />
     <None Include="sci_gateway\graphics_gateway.xml" />
     <None Include="Makefile.am" />
-    <None Include="locales\graphics.pot">
-      <Filter>localization</Filter>
-    </None>
     <None Include="Elementary_functions_f_Import.def">
       <Filter>Libraries Dependencies\Imports</Filter>
     </None>
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/graphics/sci_gateway/c/gw_graphics.c b/scilab/modules/graphics/sci_gateway/c/gw_graphics.c
deleted file mode 100644 (file)
index aa79234..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2005 - INRIA - Allan Cornet
- * Copyright (C) 2006 - INRIA - Jean-Baptiste Silvy
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-#include "gw_graphics.h"
-/*--------------------------------------------------------------------------*/
-/* interface for the previous function Table */
-int gw_graphics(void)
-{
-    return 0;
-}
-
-/*--------------------------------------------------------------------------*/
old mode 100755 (executable)
new mode 100644 (file)
index 833c6ca..afff941
@@ -167,7 +167,6 @@ endif
 
 GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_x_choice.c \
-    sci_gateway/c/gw_gui.c \
     sci_gateway/c/sci_x_mdialog.c \
     sci_gateway/c/sci_x_dialog.c \
     sci_gateway/c/sci_x_choose.c \
index b5c7b8f..e39cc8e 100644 (file)
@@ -283,7 +283,6 @@ am_libscigui_disable_la_OBJECTS = $(am__objects_3) $(am__objects_4)
 libscigui_disable_la_OBJECTS = $(am_libscigui_disable_la_OBJECTS)
 libscigui_la_DEPENDENCIES = libscigui-algo.la
 am__objects_5 = sci_gateway/c/libscigui_la-sci_x_choice.lo \
-       sci_gateway/c/libscigui_la-gw_gui.lo \
        sci_gateway/c/libscigui_la-sci_x_mdialog.lo \
        sci_gateway/c/libscigui_la-sci_x_dialog.lo \
        sci_gateway/c/libscigui_la-sci_x_choose.lo \
@@ -852,7 +851,6 @@ SWIG_WRAPPERS = src/jni/ScilabTermination.i
 BUILT_SOURCES = $(am__append_1) $(am__append_2)
 GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_x_choice.c \
-    sci_gateway/c/gw_gui.c \
     sci_gateway/c/sci_x_mdialog.c \
     sci_gateway/c/sci_x_dialog.c \
     sci_gateway/c/sci_x_choose.c \
@@ -1489,8 +1487,6 @@ sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
 sci_gateway/c/libscigui_la-sci_x_choice.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscigui_la-gw_gui.lo: sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscigui_la-sci_x_mdialog.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -1675,7 +1671,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-gw_gui.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_ClipBoard.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_delmenu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_exportUI.Plo@am__quote@
@@ -1931,13 +1926,6 @@ sci_gateway/c/libscigui_la-sci_x_choice.lo: sci_gateway/c/sci_x_choice.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigui_la-sci_x_choice.lo `test -f 'sci_gateway/c/sci_x_choice.c' || echo '$(srcdir)/'`sci_gateway/c/sci_x_choice.c
 
-sci_gateway/c/libscigui_la-gw_gui.lo: sci_gateway/c/gw_gui.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigui_la-gw_gui.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigui_la-gw_gui.Tpo -c -o sci_gateway/c/libscigui_la-gw_gui.lo `test -f 'sci_gateway/c/gw_gui.c' || echo '$(srcdir)/'`sci_gateway/c/gw_gui.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigui_la-gw_gui.Tpo sci_gateway/c/$(DEPDIR)/libscigui_la-gw_gui.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_gui.c' object='sci_gateway/c/libscigui_la-gw_gui.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigui_la-gw_gui.lo `test -f 'sci_gateway/c/gw_gui.c' || echo '$(srcdir)/'`sci_gateway/c/gw_gui.c
-
 sci_gateway/c/libscigui_la-sci_x_mdialog.lo: sci_gateway/c/sci_x_mdialog.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigui_la-sci_x_mdialog.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_mdialog.Tpo -c -o sci_gateway/c/libscigui_la-sci_x_mdialog.lo `test -f 'sci_gateway/c/sci_x_mdialog.c' || echo '$(srcdir)/'`sci_gateway/c/sci_x_mdialog.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_mdialog.Tpo sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_mdialog.Plo
diff --git a/scilab/modules/gui/sci_gateway/c/gw_gui.c b/scilab/modules/gui/sci_gateway/c/gw_gui.c
deleted file mode 100755 (executable)
index 4c941e1..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- * Copyright (C) 2008 - INRIA - Vincent COUVERT
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-#include "BOOL.h"
-#include "gw_gui.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-int gw_gui(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index d23dd3d..ab62686 100755 (executable)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
     <ClCompile Include="..\cpp\GetUimenuLabel.cpp" />
     <ClCompile Include="..\cpp\GetUiobjectEnable.cpp" />
     <ClCompile Include="..\cpp\GetUiobjectForegroundColor.cpp" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_gui.c" />
     <ClCompile Include="iconifyMainWindow.c" />
     <ClCompile Include="InitializeGUI.c" />
     <ClCompile Include="..\cpp\InitUIMenu.cpp" />
index 1d7aa67..15cc783 100755 (executable)
     <ClCompile Include="..\cpp\GetUiobjectForegroundColor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_gui.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="iconifyMainWindow.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index 655ffcf..3753ab3 100644 (file)
@@ -12,8 +12,6 @@ HELPTOOLS_SOURCES = \
     src/jni/BuildDocObject.cpp \
        src/jni/SciDocMain.cpp
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_helptools.c
-
 GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_buildDoc.cpp
 
 GIWS_WRAPPERS = \
@@ -23,7 +21,7 @@ GIWS_WRAPPERS = \
 libscihelptools_la_LIBADD = \
     libscihelptools-algo.la \
     $(top_builddir)/modules/commons/libscicommons.la
-    
+
 libscihelptools_algo_la_SOURCES =  $(HELPTOOLS_SOURCES)
 libscihelptools_algo_la_CPPFLAGS = $(libscihelptools_la_CPPFLAGS)
 noinst_LTLIBRARIES = libscihelptools-algo.la
@@ -65,14 +63,13 @@ libscihelptools_la_CPPFLAGS= \
        -I$(top_srcdir)/modules/string/includes \
        $(AM_CPPFLAGS)
 
-libscihelptools_la_SOURCES =  $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
+libscihelptools_la_SOURCES =  $(GATEWAY_CXX_SOURCES)
 
 libscihelptools_disable_la_CPPFLAGS = $(libscihelptools_la_CPPFLAGS)
 
 libscihelptools_disable_la_SOURCES =  $(HELPTOOLS_DISABLE_CPP_SOURCES)
 
 # For the code check (splint)
-CHECK_SRC= $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscihelptools_la_CFLAGS)
 
 
@@ -81,7 +78,7 @@ modulename=helptools
 
 #### helptools : Conf files ####
 libscihelptools_la_rootdir = $(mydatadir)
-libscihelptools_la_root_DATA =  license.txt 
+libscihelptools_la_root_DATA =  license.txt
 
 #### helptools : init scripts ####
 libscihelptools_la_etcdir = $(mydatadir)/etc
index b7b31c7..0384293 100644 (file)
@@ -193,14 +193,13 @@ libscihelptools_disable_la_OBJECTS =  \
 @BUILD_HELP_TRUE@@GUI_TRUE@libscihelptools_la_DEPENDENCIES =  \
 @BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools-algo.la \
 @BUILD_HELP_TRUE@@GUI_TRUE@    $(top_builddir)/modules/commons/libscicommons.la
-am__libscihelptools_la_SOURCES_DIST = sci_gateway/c/gw_helptools.c \
-       sci_gateway/nogui/nogui.cpp sci_gateway/cpp/sci_buildDoc.cpp
-@BUILD_HELP_TRUE@@GUI_TRUE@am__objects_3 = sci_gateway/c/libscihelptools_la-gw_helptools.lo
-@BUILD_HELP_FALSE@@GUI_TRUE@am__objects_4 = sci_gateway/nogui/libscihelptools_la-nogui.lo
-@BUILD_HELP_TRUE@@GUI_TRUE@am__objects_4 = sci_gateway/cpp/libscihelptools_la-sci_buildDoc.lo
-@GUI_FALSE@am__objects_4 =  \
+am__libscihelptools_la_SOURCES_DIST = sci_gateway/nogui/nogui.cpp \
+       sci_gateway/cpp/sci_buildDoc.cpp
+@BUILD_HELP_FALSE@@GUI_TRUE@am__objects_3 = sci_gateway/nogui/libscihelptools_la-nogui.lo
+@BUILD_HELP_TRUE@@GUI_TRUE@am__objects_3 = sci_gateway/cpp/libscihelptools_la-sci_buildDoc.lo
+@GUI_FALSE@am__objects_3 =  \
 @GUI_FALSE@    sci_gateway/nogui/libscihelptools_la-nogui.lo
-am_libscihelptools_la_OBJECTS = $(am__objects_3) $(am__objects_4)
+am_libscihelptools_la_OBJECTS = $(am__objects_3)
 libscihelptools_la_OBJECTS = $(am_libscihelptools_la_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -218,24 +217,6 @@ 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) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -582,7 +563,6 @@ yacc_present = @yacc_present@
 @BUILD_HELP_TRUE@@GUI_TRUE@    src/jni/BuildDocObject.cpp \
 @BUILD_HELP_TRUE@@GUI_TRUE@    src/jni/SciDocMain.cpp
 
-@BUILD_HELP_TRUE@@GUI_TRUE@GATEWAY_C_SOURCES = sci_gateway/c/gw_helptools.c
 @BUILD_HELP_FALSE@@GUI_TRUE@GATEWAY_CXX_SOURCES = sci_gateway/nogui/nogui.cpp
 @BUILD_HELP_TRUE@@GUI_TRUE@GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_buildDoc.cpp
 @GUI_FALSE@GATEWAY_CXX_SOURCES = sci_gateway/nogui/nogui.cpp
@@ -621,12 +601,11 @@ libscihelptools_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/string/includes \
        $(AM_CPPFLAGS)
 
-libscihelptools_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
+libscihelptools_la_SOURCES = $(GATEWAY_CXX_SOURCES)
 libscihelptools_disable_la_CPPFLAGS = $(libscihelptools_la_CPPFLAGS)
 libscihelptools_disable_la_SOURCES = $(HELPTOOLS_DISABLE_CPP_SOURCES)
 
 # For the code check (splint)
-CHECK_SRC = $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscihelptools_la_CFLAGS)
 
 #### Target ######
@@ -634,7 +613,7 @@ modulename = helptools
 
 #### helptools : Conf files ####
 libscihelptools_la_rootdir = $(mydatadir)
-libscihelptools_la_root_DATA = license.txt 
+libscihelptools_la_root_DATA = license.txt
 
 #### helptools : init scripts ####
 libscihelptools_la_etcdir = $(mydatadir)/etc
@@ -765,7 +744,7 @@ all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
+.SUFFIXES: .sci .bin .cpp .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 \
@@ -868,15 +847,6 @@ sci_gateway/nogui/libscihelptools_disable_la-nogui.lo:  \
 
 libscihelptools-disable.la: $(libscihelptools_disable_la_OBJECTS) $(libscihelptools_disable_la_DEPENDENCIES) $(EXTRA_libscihelptools_disable_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libscihelptools_disable_la_OBJECTS) $(libscihelptools_disable_la_LIBADD) $(LIBS)
-sci_gateway/c/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c
-       @: > sci_gateway/c/$(am__dirstamp)
-sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
-       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscihelptools_la-gw_helptools.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/nogui/libscihelptools_la-nogui.lo:  \
        sci_gateway/nogui/$(am__dirstamp) \
        sci_gateway/nogui/$(DEPDIR)/$(am__dirstamp)
@@ -895,8 +865,6 @@ libscihelptools.la: $(libscihelptools_la_OBJECTS) $(libscihelptools_la_DEPENDENC
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f sci_gateway/c/*.$(OBJEXT)
-       -rm -f sci_gateway/c/*.lo
        -rm -f sci_gateway/cpp/*.$(OBJEXT)
        -rm -f sci_gateway/cpp/*.lo
        -rm -f sci_gateway/nogui/*.$(OBJEXT)
@@ -907,44 +875,12 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscihelptools_la-gw_helptools.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihelptools_la-sci_buildDoc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/nogui/$(DEPDIR)/libscihelptools_disable_la-nogui.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/nogui/$(DEPDIR)/libscihelptools_la-nogui.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/jni/$(DEPDIR)/libscihelptools_algo_la-BuildDocObject.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/jni/$(DEPDIR)/libscihelptools_algo_la-SciDocMain.Plo@am__quote@
 
-.c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-sci_gateway/c/libscihelptools_la-gw_helptools.lo: sci_gateway/c/gw_helptools.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscihelptools_la-gw_helptools.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscihelptools_la-gw_helptools.Tpo -c -o sci_gateway/c/libscihelptools_la-gw_helptools.lo `test -f 'sci_gateway/c/gw_helptools.c' || echo '$(srcdir)/'`sci_gateway/c/gw_helptools.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscihelptools_la-gw_helptools.Tpo sci_gateway/c/$(DEPDIR)/libscihelptools_la-gw_helptools.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_helptools.c' object='sci_gateway/c/libscihelptools_la-gw_helptools.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihelptools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscihelptools_la-gw_helptools.lo `test -f 'sci_gateway/c/gw_helptools.c' || echo '$(srcdir)/'`sci_gateway/c/gw_helptools.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1009,7 +945,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
        -rm -rf sci_gateway/cpp/.libs sci_gateway/cpp/_libs
        -rm -rf sci_gateway/nogui/.libs sci_gateway/nogui/_libs
        -rm -rf src/jni/.libs src/jni/_libs
@@ -1321,8 +1256,6 @@ 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)
-       -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sci_gateway/c/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(am__dirstamp)
        -rm -f sci_gateway/nogui/$(DEPDIR)/$(am__dirstamp)
@@ -1340,7 +1273,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) sci_gateway/nogui/$(DEPDIR) src/jni/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) sci_gateway/nogui/$(DEPDIR) src/jni/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -1395,7 +1328,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) sci_gateway/nogui/$(DEPDIR) src/jni/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) sci_gateway/nogui/$(DEPDIR) src/jni/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/scilab/modules/helptools/sci_gateway/c/gw_helptools.c b/scilab/modules/helptools/sci_gateway/c/gw_helptools.c
deleted file mode 100644 (file)
index bb1c9a6..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008 - INRIA - Sylvestre LEDRU
- *
- *  This file must be used under the terms of the CeCILL.
- *  This source file is licensed as described in the file COPYING, which
- *  you should have received as part of this distribution.  The terms
- *  are also available at
- *  http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "BOOL.h"
-#include "gw_helptools.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-int gw_helptools(void)
-{
-    return 0;
-}
-
-/*--------------------------------------------------------------------------*/
index f8a4179..9436da5 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
   <ItemGroup>
     <ClCompile Include="..\jni\BuildDocObject.cpp" />
     <ClCompile Include="DllmainHelptools.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_helptools.c" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_buildDoc.cpp" />
     <ClCompile Include="..\jni\SciDocMain.cpp" />
   </ItemGroup>
index 48f7c19..f7a62d1 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -29,9 +29,6 @@
     <ClCompile Include="DllmainHelptools.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_helptools.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_buildDoc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/history_browser/sci_gateway/c/gw_history_browser.c b/scilab/modules/history_browser/sci_gateway/c/gw_history_browser.c
deleted file mode 100644 (file)
index c9a4366..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - DIGITEO - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-/**
- * gateway source file which defines links between the
- * native function (C, fortran, whatever) and the function offered into Scilab
- */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_history_browser.h"
-#include "api_scilab.h"
-#include "MALLOC.h"
-#include "callFunctionFromGateway.h"
-#include "configvariable_interface.h"
-#include "localization.h"
-#include "Scierror.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[] =
-{
-    {sci_browsehistory, "browsehistory"}
-};
-/*--------------------------------------------------------------------------*/
-int gw_history_browser(void)
-{
-    if ( getScilabMode() == SCILAB_NWNI)
-    {
-        Scierror(999, _("Scilab '%s' module disabled in -nogui or -nwni mode.\n"), "history_browser");
-        return 0;
-    }
-
-    Rhs = Max(0, Rhs);
-
-    if (pvApiCtx == NULL)
-    {
-        pvApiCtx = (StrCtx*)MALLOC(sizeof(StrCtx));
-    }
-
-    pvApiCtx->pstName = (char*)Tab[Fin - 1].name;
-    callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index f2da04b..251c5f9 100644 (file)
@@ -8,13 +8,10 @@ HISTORY_MANAGER_CPP_SOURCES = \
     src/cpp/HistoryFile.cpp \
     src/cpp/HistoryManager.cpp \
     src/cpp/HistorySearch.cpp
-    
+
 # List of the c files
 HISTORY_MANAGER_C_SOURCES = src/c/getCommentDateSession.c
 
-# List of the gateway c files
-GATEWAY_C_SOURCES = sci_gateway/c/gw_history_manager.c
-
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/history_manager_gw.cpp \
     sci_gateway/cpp/sci_addhistory.cpp \
@@ -30,7 +27,7 @@ GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/sci_savehistory.cpp \
     sci_gateway/cpp/sci_sethistoryfile.cpp \
     sci_gateway/cpp/sci_historymanager.cpp
-    
+
 if GUI
 
 # List of the c files
@@ -81,11 +78,11 @@ noinst_LTLIBRARIES = libscihistory_manager-algo.la
 
 # All the sources needed by libscihistory_manager.la
 libscihistory_manager_algo_la_SOURCES = $(HISTORY_MANAGER_C_SOURCES) $(HISTORY_MANAGER_CPP_SOURCES)
-libscihistory_manager_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscihistory_manager_la_SOURCES = $(GATEWAY_CPP_SOURCES)
 libscihistory_manager_algo_la_CPPFLAGS = $(libscihistory_manager_la_CPPFLAGS)
 
 # For the code check (splint)
-CHECK_SRC= $(HISTORY_MANAGER_C_SOURCES) $(GATEWAY_C_SOURCES)
+CHECK_SRC= $(HISTORY_MANAGER_C_SOURCES)
 INCLUDE_FLAGS = $(libscihistory_manager_la_CPPFLAGS)
 
 ## Libraries necessary
index 9741fd1..b8a56d6 100644 (file)
@@ -190,9 +190,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 libscihistory_manager_la_DEPENDENCIES = libscihistory_manager-algo.la
-am__objects_4 =  \
-       sci_gateway/c/libscihistory_manager_la-gw_history_manager.lo
-am__objects_5 = sci_gateway/cpp/libscihistory_manager_la-history_manager_gw.lo \
+am__objects_4 = sci_gateway/cpp/libscihistory_manager_la-history_manager_gw.lo \
        sci_gateway/cpp/libscihistory_manager_la-sci_addhistory.lo \
        sci_gateway/cpp/libscihistory_manager_la-sci_displayhistory.lo \
        sci_gateway/cpp/libscihistory_manager_la-sci_gethistory.lo \
@@ -206,8 +204,7 @@ am__objects_5 = sci_gateway/cpp/libscihistory_manager_la-history_manager_gw.lo \
        sci_gateway/cpp/libscihistory_manager_la-sci_savehistory.lo \
        sci_gateway/cpp/libscihistory_manager_la-sci_sethistoryfile.lo \
        sci_gateway/cpp/libscihistory_manager_la-sci_historymanager.lo
-am_libscihistory_manager_la_OBJECTS = $(am__objects_4) \
-       $(am__objects_5)
+am_libscihistory_manager_la_OBJECTS = $(am__objects_4)
 libscihistory_manager_la_OBJECTS =  \
        $(am_libscihistory_manager_la_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -590,9 +587,6 @@ HISTORY_MANAGER_CPP_SOURCES = \
 # List of the c files
 HISTORY_MANAGER_C_SOURCES = src/c/getCommentDateSession.c \
        $(am__append_1)
-
-# List of the gateway c files
-GATEWAY_C_SOURCES = sci_gateway/c/gw_history_manager.c
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/history_manager_gw.cpp \
     sci_gateway/cpp/sci_addhistory.cpp \
@@ -647,11 +641,11 @@ noinst_LTLIBRARIES = libscihistory_manager-algo.la
 
 # All the sources needed by libscihistory_manager.la
 libscihistory_manager_algo_la_SOURCES = $(HISTORY_MANAGER_C_SOURCES) $(HISTORY_MANAGER_CPP_SOURCES)
-libscihistory_manager_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscihistory_manager_la_SOURCES = $(GATEWAY_CPP_SOURCES)
 libscihistory_manager_algo_la_CPPFLAGS = $(libscihistory_manager_la_CPPFLAGS)
 
 # For the code check (splint)
-CHECK_SRC = $(HISTORY_MANAGER_C_SOURCES) $(GATEWAY_C_SOURCES)
+CHECK_SRC = $(HISTORY_MANAGER_C_SOURCES)
 INCLUDE_FLAGS = $(libscihistory_manager_la_CPPFLAGS)
 libscihistory_manager_la_LIBADD = libscihistory_manager-algo.la
 modulename = history_manager
@@ -871,15 +865,6 @@ src/cpp/libscihistory_manager_algo_la-HistorySearch.lo:  \
 
 libscihistory_manager-algo.la: $(libscihistory_manager_algo_la_OBJECTS) $(libscihistory_manager_algo_la_DEPENDENCIES) $(EXTRA_libscihistory_manager_algo_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK)  $(libscihistory_manager_algo_la_OBJECTS) $(libscihistory_manager_algo_la_LIBADD) $(LIBS)
-sci_gateway/c/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c
-       @: > sci_gateway/c/$(am__dirstamp)
-sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
-       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscihistory_manager_la-gw_history_manager.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp
        @: > sci_gateway/cpp/$(am__dirstamp)
@@ -934,8 +919,6 @@ libscihistory_manager.la: $(libscihistory_manager_la_OBJECTS) $(libscihistory_ma
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f sci_gateway/c/*.$(OBJEXT)
-       -rm -f sci_gateway/c/*.lo
        -rm -f sci_gateway/cpp/*.$(OBJEXT)
        -rm -f sci_gateway/cpp/*.lo
        -rm -f src/c/*.$(OBJEXT)
@@ -948,7 +931,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscihistory_manager_la-gw_history_manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihistory_manager_la-history_manager_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihistory_manager_la-sci_addhistory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscihistory_manager_la-sci_displayhistory.Plo@am__quote@
@@ -1007,13 +989,6 @@ src/jni/libscihistory_manager_algo_la-HistoryManagement_wrap.lo: src/jni/History
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihistory_manager_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/jni/libscihistory_manager_algo_la-HistoryManagement_wrap.lo `test -f 'src/jni/HistoryManagement_wrap.c' || echo '$(srcdir)/'`src/jni/HistoryManagement_wrap.c
 
-sci_gateway/c/libscihistory_manager_la-gw_history_manager.lo: sci_gateway/c/gw_history_manager.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihistory_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscihistory_manager_la-gw_history_manager.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscihistory_manager_la-gw_history_manager.Tpo -c -o sci_gateway/c/libscihistory_manager_la-gw_history_manager.lo `test -f 'sci_gateway/c/gw_history_manager.c' || echo '$(srcdir)/'`sci_gateway/c/gw_history_manager.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscihistory_manager_la-gw_history_manager.Tpo sci_gateway/c/$(DEPDIR)/libscihistory_manager_la-gw_history_manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_history_manager.c' object='sci_gateway/c/libscihistory_manager_la-gw_history_manager.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihistory_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscihistory_manager_la-gw_history_manager.lo `test -f 'sci_gateway/c/gw_history_manager.c' || echo '$(srcdir)/'`sci_gateway/c/gw_history_manager.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1162,7 +1137,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
        -rm -rf sci_gateway/cpp/.libs sci_gateway/cpp/_libs
        -rm -rf src/c/.libs src/c/_libs
        -rm -rf src/cpp/.libs src/cpp/_libs
@@ -1370,8 +1344,6 @@ 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)
-       -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sci_gateway/c/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(am__dirstamp)
        -rm -f src/c/$(DEPDIR)/$(am__dirstamp)
@@ -1391,7 +1363,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -1441,7 +1413,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/scilab/modules/history_manager/sci_gateway/c/gw_history_manager.c b/scilab/modules/history_manager/sci_gateway/c/gw_history_manager.c
deleted file mode 100644 (file)
index a33b2ab..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007-2008 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-/**
- * gateway source file which defines links between the
- * native function (C, fortran, whatever) and the function offered into Scilab
- */
-/*--------------------------------------------------------------------------*/
-#include "gw_history_manager.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-int gw_history_manager(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index 2a8fa71..0307a4a 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -212,7 +212,6 @@ lib /DEF:"$(ProjectDir)history_browser_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$
   <ItemGroup>
     <ClCompile Include="DllmainHistory_Manager.c" />
     <ClCompile Include="getCommentDateSession.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_history_manager.c" />
     <ClCompile Include="..\cpp\HistoryFile.cpp" />
     <ClCompile Include="..\jni\HistoryManagement_wrap.c" />
     <ClCompile Include="..\cpp\HistoryManager.cpp" />
index 1a74806..b88252b 100644 (file)
@@ -32,9 +32,6 @@
     <ClCompile Include="getCommentDateSession.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_history_manager.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\cpp\HistoryFile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
index 5438caa..91bc7c6 100644 (file)
@@ -37,8 +37,6 @@ INTEGER_C_SOURCES = \
     src/c/genbitops.c \
     src/c/genimpl.c
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_integer.c
-
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/integer_gw.cpp \
     sci_gateway/cpp/sci_inttype.cpp \
index 124d2e0..ec9f4ca 100644 (file)
@@ -205,13 +205,12 @@ am__v_lt_1 =
 @MAINTAINER_MODE_FALSE@am_libsciinteger_algo_la_rpath =
 @MAINTAINER_MODE_TRUE@am_libsciinteger_algo_la_rpath =
 libsciinteger_la_DEPENDENCIES = libsciinteger-algo.la
-am__objects_2 = sci_gateway/c/libsciinteger_la-gw_integer.lo
-am__objects_3 = sci_gateway/cpp/libsciinteger_la-integer_gw.lo \
+am__objects_2 = sci_gateway/cpp/libsciinteger_la-integer_gw.lo \
        sci_gateway/cpp/libsciinteger_la-sci_inttype.lo \
        sci_gateway/cpp/libsciinteger_la-sci_double.lo \
        sci_gateway/cpp/libsciinteger_la-sci_int.lo \
        sci_gateway/cpp/libsciinteger_la-sci_iconvert.lo
-am_libsciinteger_la_OBJECTS = $(am__objects_2) $(am__objects_3)
+am_libsciinteger_la_OBJECTS = $(am__objects_2)
 libsciinteger_la_OBJECTS = $(am_libsciinteger_la_OBJECTS)
 @MAINTAINER_MODE_FALSE@am_libsciinteger_la_rpath =
 @MAINTAINER_MODE_TRUE@am_libsciinteger_la_rpath = -rpath $(pkglibdir)
@@ -615,7 +614,6 @@ INTEGER_C_SOURCES = \
     src/c/genbitops.c \
     src/c/genimpl.c
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_integer.c
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/integer_gw.cpp \
     sci_gateway/cpp/sci_inttype.cpp \
@@ -900,15 +898,6 @@ src/c/libsciinteger_algo_la-genimpl.lo: src/c/$(am__dirstamp) \
 
 libsciinteger-algo.la: $(libsciinteger_algo_la_OBJECTS) $(libsciinteger_algo_la_DEPENDENCIES) $(EXTRA_libsciinteger_algo_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(LINK) $(am_libsciinteger_algo_la_rpath) $(libsciinteger_algo_la_OBJECTS) $(libsciinteger_algo_la_LIBADD) $(LIBS)
-sci_gateway/c/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c
-       @: > sci_gateway/c/$(am__dirstamp)
-sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
-       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciinteger_la-gw_integer.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp
        @: > sci_gateway/cpp/$(am__dirstamp)
@@ -936,8 +925,6 @@ libsciinteger.la: $(libsciinteger_la_OBJECTS) $(libsciinteger_la_DEPENDENCIES) $
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f sci_gateway/c/*.$(OBJEXT)
-       -rm -f sci_gateway/c/*.lo
        -rm -f sci_gateway/cpp/*.$(OBJEXT)
        -rm -f sci_gateway/cpp/*.lo
        -rm -f src/c/*.$(OBJEXT)
@@ -946,7 +933,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciinteger_la-gw_integer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciinteger_la-integer_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciinteger_la-sci_double.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciinteger_la-sci_iconvert.Plo@am__quote@
@@ -1233,13 +1219,6 @@ src/c/libsciinteger_algo_la-genimpl.lo: src/c/genimpl.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciinteger_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libsciinteger_algo_la-genimpl.lo `test -f 'src/c/genimpl.c' || echo '$(srcdir)/'`src/c/genimpl.c
 
-sci_gateway/c/libsciinteger_la-gw_integer.lo: sci_gateway/c/gw_integer.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciinteger_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciinteger_la-gw_integer.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciinteger_la-gw_integer.Tpo -c -o sci_gateway/c/libsciinteger_la-gw_integer.lo `test -f 'sci_gateway/c/gw_integer.c' || echo '$(srcdir)/'`sci_gateway/c/gw_integer.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciinteger_la-gw_integer.Tpo sci_gateway/c/$(DEPDIR)/libsciinteger_la-gw_integer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_integer.c' object='sci_gateway/c/libsciinteger_la-gw_integer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciinteger_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciinteger_la-gw_integer.lo `test -f 'sci_gateway/c/gw_integer.c' || echo '$(srcdir)/'`sci_gateway/c/gw_integer.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1304,7 +1283,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
        -rm -rf sci_gateway/cpp/.libs sci_gateway/cpp/_libs
        -rm -rf src/c/.libs src/c/_libs
 install-libsciinteger_la_etcDATA: $(libsciinteger_la_etc_DATA)
@@ -1487,8 +1465,6 @@ 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)
-       -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sci_gateway/c/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(am__dirstamp)
        -rm -f src/c/$(DEPDIR)/$(am__dirstamp)
@@ -1503,7 +1479,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -1551,7 +1527,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/scilab/modules/integer/sci_gateway/c/gw_integer.c b/scilab/modules/integer/sci_gateway/c/gw_integer.c
deleted file mode 100644 (file)
index e6d1d0d..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) INRIA - Allan CORNET
-*
-* This file must be used under the terms of the CeCILL.
-* This source file is licensed as described in the file COPYING, which
-* you should have received as part of this distribution.  The terms
-* are also available at
-* http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-*
-*/
-
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_integer.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-#ifdef _MSC_VER
-#include "BOOL.h"
-extern BOOL BuildWithVS8ExpressF2C(void);
-#endif
-/*--------------------------------------------------------------------------*/
-static int C2F(scivoid)(char *fname, unsigned long fname_len)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
-int gw_integer(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index d7ae85a..b7e33ea 100644 (file)
@@ -242,7 +242,6 @@ lib /DEF:"$(ProjectDir)Polynomials_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(P
     <ClCompile Include="gentril.c" />
     <ClCompile Include="gentriu.c" />
     <ClCompile Include="genvmul.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_integer.c" />
     <ClCompile Include="tpconv.c" />
   </ItemGroup>
   <ItemGroup>
index 0dcade3..ce5137f 100644 (file)
     <ClCompile Include="genvmul.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_integer.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="tpconv.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/interpolation/sci_gateway/c/gw_interpolation.c b/scilab/modules/interpolation/sci_gateway/c/gw_interpolation.c
deleted file mode 100644 (file)
index 576db8c..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_interpolation.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[] =
-{
-    {intsplin,           "splin"},
-    {intlsq_splin,       "lsq_splin"},
-    {intinterp1,          "interp"},
-    {intlinear_interpn,  "linear_interpn"},
-    {intsplin2d,         "splin2d"},
-    {intinterp2d,        "interp2d"},
-    {intcshep2d,         "cshep2d"},
-    {inteval_cshep2d,    "eval_cshep2d" },
-    {intsplin3d,         "splin3d"},
-    {intinterp3d,        "interp3d"},
-    {intbsplin3val,      "bsplin3val"}
-};
-/*--------------------------------------------------------------------------*/
-int gw_interpolation(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index 04a672e..bba3eb4 100644 (file)
@@ -23,7 +23,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_getenv.c \
     sci_gateway/c/sci_writeb.c \
     sci_gateway/c/sci_setenv.c \
-    sci_gateway/c/gw_io.c \
     sci_gateway/c/sci_getpid.c \
     sci_gateway/c/sci_write4b.c \
     sci_gateway/c/sci_save.c
index e27b583..bad6833 100644 (file)
@@ -187,7 +187,6 @@ am__objects_3 = sci_gateway/c/libsciio_la-sci_read4b.lo \
        sci_gateway/c/libsciio_la-sci_getenv.lo \
        sci_gateway/c/libsciio_la-sci_writeb.lo \
        sci_gateway/c/libsciio_la-sci_setenv.lo \
-       sci_gateway/c/libsciio_la-gw_io.lo \
        sci_gateway/c/libsciio_la-sci_getpid.lo \
        sci_gateway/c/libsciio_la-sci_write4b.lo \
        sci_gateway/c/libsciio_la-sci_save.lo
@@ -587,7 +586,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_getenv.c \
     sci_gateway/c/sci_writeb.c \
     sci_gateway/c/sci_setenv.c \
-    sci_gateway/c/gw_io.c \
     sci_gateway/c/sci_getpid.c \
     sci_gateway/c/sci_write4b.c \
     sci_gateway/c/sci_save.c
@@ -865,8 +863,6 @@ sci_gateway/c/libsciio_la-sci_writeb.lo:  \
 sci_gateway/c/libsciio_la-sci_setenv.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciio_la-gw_io.lo: sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libsciio_la-sci_getpid.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -923,7 +919,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-gw_io.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getenv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getpid.Plo@am__quote@
@@ -1051,13 +1046,6 @@ sci_gateway/c/libsciio_la-sci_setenv.lo: sci_gateway/c/sci_setenv.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciio_la-sci_setenv.lo `test -f 'sci_gateway/c/sci_setenv.c' || echo '$(srcdir)/'`sci_gateway/c/sci_setenv.c
 
-sci_gateway/c/libsciio_la-gw_io.lo: sci_gateway/c/gw_io.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciio_la-gw_io.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciio_la-gw_io.Tpo -c -o sci_gateway/c/libsciio_la-gw_io.lo `test -f 'sci_gateway/c/gw_io.c' || echo '$(srcdir)/'`sci_gateway/c/gw_io.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciio_la-gw_io.Tpo sci_gateway/c/$(DEPDIR)/libsciio_la-gw_io.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_io.c' object='sci_gateway/c/libsciio_la-gw_io.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciio_la-gw_io.lo `test -f 'sci_gateway/c/gw_io.c' || echo '$(srcdir)/'`sci_gateway/c/gw_io.c
-
 sci_gateway/c/libsciio_la-sci_getpid.lo: sci_gateway/c/sci_getpid.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciio_la-sci_getpid.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getpid.Tpo -c -o sci_gateway/c/libsciio_la-sci_getpid.lo `test -f 'sci_gateway/c/sci_getpid.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getpid.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getpid.Tpo sci_gateway/c/$(DEPDIR)/libsciio_la-sci_getpid.Plo
diff --git a/scilab/modules/io/sci_gateway/c/gw_io.c b/scilab/modules/io/sci_gateway/c/gw_io.c
deleted file mode 100644 (file)
index ed4f282..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include "gw_io.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-int gw_io(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index fc8824a..81a2937 100644 (file)
@@ -201,7 +201,6 @@ lib /DEF:"$(ProjectDir)scilab_windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(
     <ClCompile Include="DllmainIo.c" />
     <ClCompile Include="getenvc.c" />
     <ClCompile Include="getpidc.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_io.c" />
     <ClCompile Include="setenvc.c" />
     <ClCompile Include="systemc.c" />
     <ClCompile Include="v2cuniterror.c" />
index 46f0703..9e0f54b 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -32,9 +32,6 @@
     <ClCompile Include="getpidc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_io.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="setenvc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index 3772022..f7f2404 100644 (file)
@@ -999,9 +999,9 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 @JAVASCI_FALSE@distclean-local:
-@JAVASCI_FALSE@install-data-local:
 @JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@clean-local:
+@JAVASCI_FALSE@install-data-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
index 461aa0e..d2cd538 100644 (file)
@@ -89,7 +89,6 @@ libscijvm_la_include_HEADERS = \
 
 GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_javaclasspath.c \
-    sci_gateway/c/gw_jvm.c \
     sci_gateway/c/sci_javalibrarypath.c
 
 GATEWAY_CPP_SOURCES = \
index 3cfdc2a..4b0c1da 100644 (file)
@@ -212,7 +212,6 @@ am__DEPENDENCIES_1 =
 libscijvm_la_DEPENDENCIES = libscijvm-algo.la $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
 am__objects_4 = sci_gateway/c/libscijvm_la-sci_javaclasspath.lo \
-       sci_gateway/c/libscijvm_la-gw_jvm.lo \
        sci_gateway/c/libscijvm_la-sci_javalibrarypath.lo
 am__objects_5 =  \
        sci_gateway/cpp/libscijvm_la-sci_system_getproperty.lo \
@@ -658,7 +657,6 @@ libscijvm_la_include_HEADERS = \
 
 GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_javaclasspath.c \
-    sci_gateway/c/gw_jvm.c \
     sci_gateway/c/sci_javalibrarypath.c
 
 GATEWAY_CPP_SOURCES = \
@@ -932,8 +930,6 @@ sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
 sci_gateway/c/libscijvm_la-sci_javaclasspath.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscijvm_la-gw_jvm.lo: sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscijvm_la-sci_javalibrarypath.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -970,7 +966,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscijvm_la-gw_jvm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_javaclasspath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_javalibrarypath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscijvm_la-jvm_gw.Plo@am__quote@
@@ -1161,13 +1156,6 @@ sci_gateway/c/libscijvm_la-sci_javaclasspath.lo: sci_gateway/c/sci_javaclasspath
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscijvm_la-sci_javaclasspath.lo `test -f 'sci_gateway/c/sci_javaclasspath.c' || echo '$(srcdir)/'`sci_gateway/c/sci_javaclasspath.c
 
-sci_gateway/c/libscijvm_la-gw_jvm.lo: sci_gateway/c/gw_jvm.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscijvm_la-gw_jvm.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscijvm_la-gw_jvm.Tpo -c -o sci_gateway/c/libscijvm_la-gw_jvm.lo `test -f 'sci_gateway/c/gw_jvm.c' || echo '$(srcdir)/'`sci_gateway/c/gw_jvm.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscijvm_la-gw_jvm.Tpo sci_gateway/c/$(DEPDIR)/libscijvm_la-gw_jvm.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_jvm.c' object='sci_gateway/c/libscijvm_la-gw_jvm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscijvm_la-gw_jvm.lo `test -f 'sci_gateway/c/gw_jvm.c' || echo '$(srcdir)/'`sci_gateway/c/gw_jvm.c
-
 sci_gateway/c/libscijvm_la-sci_javalibrarypath.lo: sci_gateway/c/sci_javalibrarypath.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscijvm_la-sci_javalibrarypath.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_javalibrarypath.Tpo -c -o sci_gateway/c/libscijvm_la-sci_javalibrarypath.lo `test -f 'sci_gateway/c/sci_javalibrarypath.c' || echo '$(srcdir)/'`sci_gateway/c/sci_javalibrarypath.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_javalibrarypath.Tpo sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_javalibrarypath.Plo
index 0452bb3..ccd9f53 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -228,7 +228,6 @@ lib /DEF:"$(ProjectDir)preferences_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
     <ClCompile Include="src\c\getClasspath.c" />
     <ClCompile Include="src\c\getJvmOptions.c" />
     <ClCompile Include="src\c\getLibrarypath.c" />
-    <ClCompile Include="sci_gateway\c\gw_jvm.c" />
     <ClCompile Include="src\c\InitializeJVM.c" />
     <ClCompile Include="src\c\JVM.c" />
     <ClCompile Include="src\c\JVM_commons.c" />
index a055cb9..5a76d78 100644 (file)
@@ -51,9 +51,6 @@
     <ClCompile Include="src\c\getLibrarypath.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\gw_jvm.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\InitializeJVM.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index b684881..870e772 100644 (file)
@@ -5,7 +5,6 @@ EXPORTS
 ; --------------------------------------- 
 ; jvm module explicit export (SEP 35)
 ; --------------------------------------- 
-gw_jvm
 getScilabJavaVM
 InitializeJVM
 TerminateJVM
diff --git a/scilab/modules/jvm/sci_gateway/c/gw_jvm.c b/scilab/modules/jvm/sci_gateway/c/gw_jvm.c
deleted file mode 100644 (file)
index d6a0baf..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_jvm.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-int gw_jvm(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index c9e8ff1..2e15bca 100644 (file)
@@ -28,8 +28,6 @@ LINEAR_ALGEBRA_FORTRAN_SOURCES = \
     src/fortran/find.f
 
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_linear_algebra2.c \
-    sci_gateway/c/gw_linear_algebra.c \
     sci_gateway/c/assembleEigenvectors.c \
     sci_gateway/c/sci_norm.c
 
index 62ce4d9..f7469cf 100644 (file)
@@ -193,8 +193,6 @@ am__v_lt_1 =
 @MAINTAINER_MODE_TRUE@am_libscilinear_algebra_algo_la_rpath =
 libscilinear_algebra_la_DEPENDENCIES = libscilinear_algebra-algo.la
 am__objects_4 =  \
-       sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra2.lo \
-       sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra.lo \
        sci_gateway/c/libscilinear_algebra_la-assembleEigenvectors.lo \
        sci_gateway/c/libscilinear_algebra_la-sci_norm.lo
 am__objects_5 =  \
@@ -626,8 +624,6 @@ LINEAR_ALGEBRA_FORTRAN_SOURCES = \
     src/fortran/find.f
 
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_linear_algebra2.c \
-    sci_gateway/c/gw_linear_algebra.c \
     sci_gateway/c/assembleEigenvectors.c \
     sci_gateway/c/sci_norm.c
 
@@ -912,12 +908,6 @@ sci_gateway/c/$(am__dirstamp):
 sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
        @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra2.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscilinear_algebra_la-assembleEigenvectors.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -993,8 +983,6 @@ distclean-compile:
        -rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-assembleEigenvectors.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-gw_linear_algebra.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-gw_linear_algebra2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-sci_norm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscilinear_algebra_la-linear_algebra_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscilinear_algebra_la-sci_balanc.Plo@am__quote@
@@ -1141,20 +1129,6 @@ src/c/libscilinear_algebra_algo_la-norm.lo: src/c/norm.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscilinear_algebra_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libscilinear_algebra_algo_la-norm.lo `test -f 'src/c/norm.c' || echo '$(srcdir)/'`src/c/norm.c
 
-sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra2.lo: sci_gateway/c/gw_linear_algebra2.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscilinear_algebra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra2.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-gw_linear_algebra2.Tpo -c -o sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra2.lo `test -f 'sci_gateway/c/gw_linear_algebra2.c' || echo '$(srcdir)/'`sci_gateway/c/gw_linear_algebra2.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-gw_linear_algebra2.Tpo sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-gw_linear_algebra2.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_linear_algebra2.c' object='sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra2.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscilinear_algebra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra2.lo `test -f 'sci_gateway/c/gw_linear_algebra2.c' || echo '$(srcdir)/'`sci_gateway/c/gw_linear_algebra2.c
-
-sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra.lo: sci_gateway/c/gw_linear_algebra.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscilinear_algebra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-gw_linear_algebra.Tpo -c -o sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra.lo `test -f 'sci_gateway/c/gw_linear_algebra.c' || echo '$(srcdir)/'`sci_gateway/c/gw_linear_algebra.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-gw_linear_algebra.Tpo sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-gw_linear_algebra.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_linear_algebra.c' object='sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscilinear_algebra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscilinear_algebra_la-gw_linear_algebra.lo `test -f 'sci_gateway/c/gw_linear_algebra.c' || echo '$(srcdir)/'`sci_gateway/c/gw_linear_algebra.c
-
 sci_gateway/c/libscilinear_algebra_la-assembleEigenvectors.lo: sci_gateway/c/assembleEigenvectors.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscilinear_algebra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscilinear_algebra_la-assembleEigenvectors.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-assembleEigenvectors.Tpo -c -o sci_gateway/c/libscilinear_algebra_la-assembleEigenvectors.lo `test -f 'sci_gateway/c/assembleEigenvectors.c' || echo '$(srcdir)/'`sci_gateway/c/assembleEigenvectors.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-assembleEigenvectors.Tpo sci_gateway/c/$(DEPDIR)/libscilinear_algebra_la-assembleEigenvectors.Plo
diff --git a/scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra.c b/scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra.c
deleted file mode 100644 (file)
index 5e12f3d..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006-2008 - INRIA - Allan CORNET <allan.cornet@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.1-en.txt
- *
- */
-
-#include <string.h>
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "gw_linear_algebra.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-int gw_linear_algebra(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra2.c b/scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra2.c
deleted file mode 100644 (file)
index d2a2834..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006-2008 - INRIA - Allan CORNET <allan.cornet@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.1-en.txt
- *
- */
-
-#include <string.h>
-#include "gw_linear_algebra.h"
-#include "gw_linear_algebra2.h"
-#include "callFunctionFromGateway.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-/*--------------------------------------------------------------------------*/
-int gw_linear_algebra2(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index 55ce566..c9886ea 100644 (file)
@@ -212,8 +212,6 @@ lib /DEF:"$(ProjectDir)linear_algebra_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:
     <ClCompile Include="det.c" />
     <ClCompile Include="DllmainLinear_algebra.c" />
     <ClCompile Include="eigen.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_linear_algebra.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_linear_algebra2.c" />
     <ClCompile Include="hess.c" />
     <ClCompile Include="issymmetric.c" />
     <ClCompile Include="lsq.c" />
index 82d1b04..7b39743 100644 (file)
     <ClCompile Include="eigen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_linear_algebra.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_linear_algebra2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="hess.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index 4d02734..4a85989 100644 (file)
@@ -31,7 +31,6 @@ LOCALIZATION_CPP_SOURCES = \
     src/cpp/localization.cpp
 
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_localization.c \
     sci_gateway/c/sci_addlocalizationdomain.c \
     sci_gateway/c/sci_gettext.c
 
index 854805d..893668f 100644 (file)
@@ -213,9 +213,7 @@ am__v_lt_1 =
 am__DEPENDENCIES_1 =
 libscilocalization_la_DEPENDENCIES = libscilocalization-algo.la \
        $(am__DEPENDENCIES_1)
-am__objects_5 =  \
-       sci_gateway/c/libscilocalization_la-gw_localization.lo \
-       sci_gateway/c/libscilocalization_la-sci_addlocalizationdomain.lo \
+am__objects_5 = sci_gateway/c/libscilocalization_la-sci_addlocalizationdomain.lo \
        sci_gateway/c/libscilocalization_la-sci_gettext.lo
 am__objects_6 =  \
        sci_gateway/cpp/libscilocalization_la-localization_gw.lo \
@@ -606,7 +604,6 @@ LOCALIZATION_CPP_SOURCES = \
     src/cpp/localization.cpp
 
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_localization.c \
     sci_gateway/c/sci_addlocalizationdomain.c \
     sci_gateway/c/sci_gettext.c
 
@@ -885,9 +882,6 @@ sci_gateway/c/$(am__dirstamp):
 sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
        @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscilocalization_la-gw_localization.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscilocalization_la-sci_addlocalizationdomain.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -935,7 +929,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscilocalization_la-gw_localization.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscilocalization_la-sci_addlocalizationdomain.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscilocalization_la-sci_gettext.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscilocalization_la-localization_gw.Plo@am__quote@
@@ -1041,13 +1034,6 @@ src/c/libscilocalization_algo_la-getLocaleInfo_Apple.lo: src/c/getLocaleInfo_App
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscilocalization_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libscilocalization_algo_la-getLocaleInfo_Apple.lo `test -f 'src/c/getLocaleInfo_Apple.c' || echo '$(srcdir)/'`src/c/getLocaleInfo_Apple.c
 
-sci_gateway/c/libscilocalization_la-gw_localization.lo: sci_gateway/c/gw_localization.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscilocalization_la_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscilocalization_la-gw_localization.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscilocalization_la-gw_localization.Tpo -c -o sci_gateway/c/libscilocalization_la-gw_localization.lo `test -f 'sci_gateway/c/gw_localization.c' || echo '$(srcdir)/'`sci_gateway/c/gw_localization.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscilocalization_la-gw_localization.Tpo sci_gateway/c/$(DEPDIR)/libscilocalization_la-gw_localization.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_localization.c' object='sci_gateway/c/libscilocalization_la-gw_localization.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscilocalization_la_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscilocalization_la-gw_localization.lo `test -f 'sci_gateway/c/gw_localization.c' || echo '$(srcdir)/'`sci_gateway/c/gw_localization.c
-
 sci_gateway/c/libscilocalization_la-sci_addlocalizationdomain.lo: sci_gateway/c/sci_addlocalizationdomain.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscilocalization_la_CPPFLAGS) $(CPPFLAGS) $(libscilocalization_la_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscilocalization_la-sci_addlocalizationdomain.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscilocalization_la-sci_addlocalizationdomain.Tpo -c -o sci_gateway/c/libscilocalization_la-sci_addlocalizationdomain.lo `test -f 'sci_gateway/c/sci_addlocalizationdomain.c' || echo '$(srcdir)/'`sci_gateway/c/sci_addlocalizationdomain.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscilocalization_la-sci_addlocalizationdomain.Tpo sci_gateway/c/$(DEPDIR)/libscilocalization_la-sci_addlocalizationdomain.Plo
diff --git a/scilab/modules/localization/sci_gateway/c/gw_localization.c b/scilab/modules/localization/sci_gateway/c/gw_localization.c
deleted file mode 100644 (file)
index 7ea4cd9..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2005 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-#include <string.h>
-#include "gw_localization.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-int gw_localization(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index d3310b1..cc71a87 100644 (file)
@@ -10,7 +10,6 @@ if MATIO
 
 #### List of the gateway files ####
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_matio.c \
     sci_gateway/c/sci_matfile_open.c \
     sci_gateway/c/sci_matfile_close.c \
     sci_gateway/c/sci_matfile_listvar.c \
@@ -26,7 +25,7 @@ MATIO_C_SOURCES = \
     src/c/CreateDoubleVariable.c \
     src/c/CreateIntegerVariable.c \
     src/c/CreateSparseVariable.c \
-    src/c/GetMatlabVariable.c 
+    src/c/GetMatlabVariable.c
 
 #### List of the C++ files ####
 MATIO_CPP_SOURCES = \
@@ -41,7 +40,7 @@ MATIO_CPP_SOURCES = \
     src/cpp/GetCharVariable.cpp \
        src/cpp/GetDoubleVariable.cpp \
     src/cpp/GetSparseVariable.cpp \
-    src/cpp/GetMlistVariable.cpp 
+    src/cpp/GetMlistVariable.cpp
 
 libscimatio_la_LDFLAGS = $(AM_LDFLAGS)
 
index d1ab621..50d97a0 100644 (file)
@@ -209,13 +209,12 @@ am__v_lt_1 =
 am__DEPENDENCIES_1 =
 libscimatio_la_DEPENDENCIES = libscimatio-algo.la \
        $(am__DEPENDENCIES_1)
-am__libscimatio_la_SOURCES_DIST = sci_gateway/c/gw_matio.c \
-       sci_gateway/c/sci_matfile_open.c \
+am__libscimatio_la_SOURCES_DIST = sci_gateway/c/sci_matfile_open.c \
        sci_gateway/c/sci_matfile_close.c \
        sci_gateway/c/sci_matfile_listvar.c \
        sci_gateway/c/sci_matfile_varreadnext.c \
        sci_gateway/c/sci_matfile_varwrite.c
-@MATIO_TRUE@am__objects_3 = sci_gateway/c/libscimatio_la-gw_matio.lo \
+@MATIO_TRUE@am__objects_3 =  \
 @MATIO_TRUE@   sci_gateway/c/libscimatio_la-sci_matfile_open.lo \
 @MATIO_TRUE@   sci_gateway/c/libscimatio_la-sci_matfile_close.lo \
 @MATIO_TRUE@   sci_gateway/c/libscimatio_la-sci_matfile_listvar.lo \
@@ -670,7 +669,6 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 
 #### List of the gateway files ####
 @MATIO_TRUE@GATEWAY_C_SOURCES = \
-@MATIO_TRUE@    sci_gateway/c/gw_matio.c \
 @MATIO_TRUE@    sci_gateway/c/sci_matfile_open.c \
 @MATIO_TRUE@    sci_gateway/c/sci_matfile_close.c \
 @MATIO_TRUE@    sci_gateway/c/sci_matfile_listvar.c \
@@ -688,7 +686,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @MATIO_TRUE@    src/c/CreateDoubleVariable.c \
 @MATIO_TRUE@    src/c/CreateIntegerVariable.c \
 @MATIO_TRUE@    src/c/CreateSparseVariable.c \
-@MATIO_TRUE@    src/c/GetMatlabVariable.c 
+@MATIO_TRUE@    src/c/GetMatlabVariable.c
 
 
 #### List of the C++ files ####
@@ -704,7 +702,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @MATIO_TRUE@    src/cpp/GetCharVariable.cpp \
 @MATIO_TRUE@   src/cpp/GetDoubleVariable.cpp \
 @MATIO_TRUE@    src/cpp/GetSparseVariable.cpp \
-@MATIO_TRUE@    src/cpp/GetMlistVariable.cpp 
+@MATIO_TRUE@    src/cpp/GetMlistVariable.cpp
 
 @MATIO_TRUE@libscimatio_la_LDFLAGS = $(AM_LDFLAGS)
 @MATIO_FALSE@GATEWAY_CPP_SOURCES = 
@@ -896,9 +894,6 @@ sci_gateway/c/$(am__dirstamp):
 sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
        @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscimatio_la-gw_matio.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscimatio_la-sci_matfile_open.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -930,7 +925,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscimatio_la-gw_matio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscimatio_la-sci_matfile_close.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscimatio_la-sci_matfile_listvar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscimatio_la-sci_matfile_open.Plo@am__quote@
@@ -1037,13 +1031,6 @@ src/c/libscimatio_algo_la-GetMatlabVariable.lo: src/c/GetMatlabVariable.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscimatio_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libscimatio_algo_la-GetMatlabVariable.lo `test -f 'src/c/GetMatlabVariable.c' || echo '$(srcdir)/'`src/c/GetMatlabVariable.c
 
-sci_gateway/c/libscimatio_la-gw_matio.lo: sci_gateway/c/gw_matio.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscimatio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscimatio_la-gw_matio.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscimatio_la-gw_matio.Tpo -c -o sci_gateway/c/libscimatio_la-gw_matio.lo `test -f 'sci_gateway/c/gw_matio.c' || echo '$(srcdir)/'`sci_gateway/c/gw_matio.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscimatio_la-gw_matio.Tpo sci_gateway/c/$(DEPDIR)/libscimatio_la-gw_matio.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_matio.c' object='sci_gateway/c/libscimatio_la-gw_matio.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscimatio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscimatio_la-gw_matio.lo `test -f 'sci_gateway/c/gw_matio.c' || echo '$(srcdir)/'`sci_gateway/c/gw_matio.c
-
 sci_gateway/c/libscimatio_la-sci_matfile_open.lo: sci_gateway/c/sci_matfile_open.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscimatio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscimatio_la-sci_matfile_open.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscimatio_la-sci_matfile_open.Tpo -c -o sci_gateway/c/libscimatio_la-sci_matfile_open.lo `test -f 'sci_gateway/c/sci_matfile_open.c' || echo '$(srcdir)/'`sci_gateway/c/sci_matfile_open.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscimatio_la-sci_matfile_open.Tpo sci_gateway/c/$(DEPDIR)/libscimatio_la-sci_matfile_open.Plo
index 96cf346..2f59bd9 100644 (file)
@@ -216,7 +216,6 @@ lib /DEF:"$(ProjectDir)Sparse_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClCompile Include="src\c\CreateSparseVariable.c" />
     <ClCompile Include="src\c\DllmainMatio.c" />
     <ClCompile Include="src\c\GetMatlabVariable.c" />
-    <ClCompile Include="sci_gateway\c\gw_matio.c" />
     <ClCompile Include="src\c\matfile_manager.c" />
   </ItemGroup>
   <ItemGroup>
index 2cfd2c6..2dfce26 100644 (file)
@@ -48,9 +48,6 @@
     <ClCompile Include="src\c\GetMatlabVariable.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\gw_matio.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\matfile_manager.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/matio/sci_gateway/c/gw_matio.c b/scilab/modules/matio/sci_gateway/c/gw_matio.c
deleted file mode 100644 (file)
index 8469b8d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Vincent COUVERT
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-/*-----------------------------------------------------------------------------------*/
-#include <math.h>
-#include <string.h>
-/*-----------------------------------------------------------------------------------*/
-#include "gw_matio.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-/*-----------------------------------------------------------------------------------*/
-int gw_matio(void)
-{
-    return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-
index d88f278..9e32f8b 100644 (file)
@@ -16,7 +16,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_mpi_finalize.c \
     sci_gateway/c/sci_mpi_comm_size.c \
     sci_gateway/c/sci_mpi_comm_rank.c \
-    sci_gateway/c/gw_mpi.c \
     sci_gateway/c/sci_mpi_recv.c \
     sci_gateway/c/sci_mpi_send.c \
     sci_gateway/c/sci_mpi_irecv.c \
index 172cea1..911b0d6 100644 (file)
@@ -176,7 +176,6 @@ am__objects_1 = sci_gateway/c/libscimpi_la-sci_mpi_init.lo \
        sci_gateway/c/libscimpi_la-sci_mpi_finalize.lo \
        sci_gateway/c/libscimpi_la-sci_mpi_comm_size.lo \
        sci_gateway/c/libscimpi_la-sci_mpi_comm_rank.lo \
-       sci_gateway/c/libscimpi_la-gw_mpi.lo \
        sci_gateway/c/libscimpi_la-sci_mpi_recv.lo \
        sci_gateway/c/libscimpi_la-sci_mpi_send.lo \
        sci_gateway/c/libscimpi_la-sci_mpi_irecv.lo \
@@ -556,7 +555,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_mpi_finalize.c \
     sci_gateway/c/sci_mpi_comm_size.c \
     sci_gateway/c/sci_mpi_comm_rank.c \
-    sci_gateway/c/gw_mpi.c \
     sci_gateway/c/sci_mpi_recv.c \
     sci_gateway/c/sci_mpi_send.c \
     sci_gateway/c/sci_mpi_irecv.c \
@@ -767,8 +765,6 @@ sci_gateway/c/libscimpi_la-sci_mpi_comm_size.lo:  \
 sci_gateway/c/libscimpi_la-sci_mpi_comm_rank.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscimpi_la-gw_mpi.lo: sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscimpi_la-sci_mpi_recv.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -814,7 +810,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscimpi_la-gw_mpi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscimpi_la-sci_mpi_bcast.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscimpi_la-sci_mpi_comm_rank.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscimpi_la-sci_mpi_comm_size.Plo@am__quote@
@@ -881,13 +876,6 @@ sci_gateway/c/libscimpi_la-sci_mpi_comm_rank.lo: sci_gateway/c/sci_mpi_comm_rank
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscimpi_la-sci_mpi_comm_rank.lo `test -f 'sci_gateway/c/sci_mpi_comm_rank.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_comm_rank.c
 
-sci_gateway/c/libscimpi_la-gw_mpi.lo: sci_gateway/c/gw_mpi.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscimpi_la-gw_mpi.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscimpi_la-gw_mpi.Tpo -c -o sci_gateway/c/libscimpi_la-gw_mpi.lo `test -f 'sci_gateway/c/gw_mpi.c' || echo '$(srcdir)/'`sci_gateway/c/gw_mpi.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscimpi_la-gw_mpi.Tpo sci_gateway/c/$(DEPDIR)/libscimpi_la-gw_mpi.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_mpi.c' object='sci_gateway/c/libscimpi_la-gw_mpi.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscimpi_la-gw_mpi.lo `test -f 'sci_gateway/c/gw_mpi.c' || echo '$(srcdir)/'`sci_gateway/c/gw_mpi.c
-
 sci_gateway/c/libscimpi_la-sci_mpi_recv.lo: sci_gateway/c/sci_mpi_recv.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscimpi_la-sci_mpi_recv.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscimpi_la-sci_mpi_recv.Tpo -c -o sci_gateway/c/libscimpi_la-sci_mpi_recv.lo `test -f 'sci_gateway/c/sci_mpi_recv.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_recv.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscimpi_la-sci_mpi_recv.Tpo sci_gateway/c/$(DEPDIR)/libscimpi_la-sci_mpi_recv.Plo
index 2f4985c..b3c7ff0 100644 (file)
     <ClInclude Include="src\c\serialization.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="sci_gateway\c\gw_mpi.c" />
     <ClCompile Include="sci_gateway\c\sci_mpi_bcast.c" />
     <ClCompile Include="sci_gateway\c\sci_mpi_comm_rank.c" />
     <ClCompile Include="sci_gateway\c\sci_mpi_comm_size.c" />
index a89f66d..94cea8e 100644 (file)
@@ -40,9 +40,6 @@
     <ClCompile Include="src\c\serialization.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\gw_mpi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_gateway\c\sci_mpi_bcast.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/mpi/sci_gateway/c/gw_mpi.c b/scilab/modules/mpi/sci_gateway/c/gw_mpi.c
deleted file mode 100644 (file)
index fab2e2e..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007-2009 - DIGITEO - Sylvestre LEDRU
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-#include "gw_mpi.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-/*-----------------------------------------------------------------------------------*/
-//static gw_generic_table Tab[] =
-//{
-//    {sci_mpi_init, "MPI_Init"},
-//    {sci_mpi_finalize, "MPI_Finalize"},
-//    {sci_mpi_comm_size, "MPI_Comm_size"},
-//    {sci_mpi_comm_rank, "MPI_Comm_rank"},
-//    {sci_mpi_recv, "MPI_Recv"},
-//    {sci_mpi_send, "MPI_Send"},
-//    {sci_mpi_get_processor_name, "MPI_Get_processor_name"},
-//    {sci_mpi_bcast, "MPI_Bcast"},
-//    {sci_mpi_irecv, "MPI_Irecv"},
-//    {sci_mpi_isend, "MPI_Isend"},
-//    {sci_mpi_wait, "MPI_Wait"}
-//};
-/*-----------------------------------------------------------------------------------*/
-int gw_mpi(void)
-{
-    return 0;
-}
-
-/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/modules/optimization/sci_gateway/c/gw_optimization.c b/scilab/modules/optimization/sci_gateway/c/gw_optimization.c
deleted file mode 100644 (file)
index 0067e85..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_optimization.h"
-#include "api_scilab.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-/*
-static gw_generic_table Tab[] =
-{
-{sci_optim, "optim"},
-{sci_semidef, "semidef"},
-{sci_fsolve, "fsolve"},
-{sci_sqrsolve, "sqrsolve"},
-{sci_qld, "qld"},
-{sci_qp_solve, "qp_solve"},
-{sci_readmps, "readmps"}
-};
-*/
-/*--------------------------------------------------------------------------*/
-int gw_optimization(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index b4bb4eb..85e7205 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -207,7 +207,6 @@ lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile Include="..\cpp\optimizationfunctions.cpp" />
     <ClCompile Include="..\cpp\scioptimfunctions.cpp" />
     <ClCompile Include="DllmainOptimization.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_optimization.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_qld.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_qp_solve.c" />
     <ClCompile Include="sp.c" />
index 3ce8107..2a555d7 100644 (file)
@@ -26,9 +26,6 @@
     <ClCompile Include="DllmainOptimization.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_optimization.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_qld.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index 1b8e62d..6a4746e 100644 (file)
@@ -58,7 +58,6 @@ OUTPUT_STREAM_FORTRAN_SOURCES = \
 
 
 GATEWAY_C_SOURCES = \
-       sci_gateway/c/gw_output_stream.c \
        sci_gateway/c/sci_print.c
 
 
index 5119277..dcf2f2d 100644 (file)
@@ -210,9 +210,7 @@ am__v_lt_1 =
 @MAINTAINER_MODE_FALSE@am_libscioutput_stream_algo_la_rpath =
 @MAINTAINER_MODE_TRUE@am_libscioutput_stream_algo_la_rpath =
 libscioutput_stream_la_DEPENDENCIES = libscioutput_stream-algo.la
-am__objects_4 =  \
-       sci_gateway/c/libscioutput_stream_la-gw_output_stream.lo \
-       sci_gateway/c/libscioutput_stream_la-sci_print.lo
+am__objects_4 = sci_gateway/c/libscioutput_stream_la-sci_print.lo
 am__objects_5 = sci_gateway/cpp/libscioutput_stream_la-sci_diary.lo \
        sci_gateway/cpp/libscioutput_stream_la-sci_disp.lo \
        sci_gateway/cpp/libscioutput_stream_la-output_stream_gw.lo \
@@ -656,7 +654,6 @@ OUTPUT_STREAM_FORTRAN_SOURCES = \
        src/fortran/formatnumber.f
 
 GATEWAY_C_SOURCES = \
-       sci_gateway/c/gw_output_stream.c \
        sci_gateway/c/sci_print.c
 
 GATEWAY_FORTRAN_SOURCES = 
@@ -968,9 +965,6 @@ sci_gateway/c/$(am__dirstamp):
 sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
        @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscioutput_stream_la-gw_output_stream.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscioutput_stream_la-sci_print.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -1015,7 +1009,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscioutput_stream_la-gw_output_stream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscioutput_stream_la-sci_print.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscioutput_stream_la-output_stream_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscioutput_stream_la-sci_diary.Plo@am__quote@
@@ -1143,13 +1136,6 @@ src/c/libscioutput_stream_algo_la-error.lo: src/c/error.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscioutput_stream_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libscioutput_stream_algo_la-error.lo `test -f 'src/c/error.c' || echo '$(srcdir)/'`src/c/error.c
 
-sci_gateway/c/libscioutput_stream_la-gw_output_stream.lo: sci_gateway/c/gw_output_stream.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscioutput_stream_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscioutput_stream_la-gw_output_stream.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscioutput_stream_la-gw_output_stream.Tpo -c -o sci_gateway/c/libscioutput_stream_la-gw_output_stream.lo `test -f 'sci_gateway/c/gw_output_stream.c' || echo '$(srcdir)/'`sci_gateway/c/gw_output_stream.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscioutput_stream_la-gw_output_stream.Tpo sci_gateway/c/$(DEPDIR)/libscioutput_stream_la-gw_output_stream.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_output_stream.c' object='sci_gateway/c/libscioutput_stream_la-gw_output_stream.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscioutput_stream_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscioutput_stream_la-gw_output_stream.lo `test -f 'sci_gateway/c/gw_output_stream.c' || echo '$(srcdir)/'`sci_gateway/c/gw_output_stream.c
-
 sci_gateway/c/libscioutput_stream_la-sci_print.lo: sci_gateway/c/sci_print.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscioutput_stream_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscioutput_stream_la-sci_print.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscioutput_stream_la-sci_print.Tpo -c -o sci_gateway/c/libscioutput_stream_la-sci_print.lo `test -f 'sci_gateway/c/sci_print.c' || echo '$(srcdir)/'`sci_gateway/c/sci_print.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscioutput_stream_la-sci_print.Tpo sci_gateway/c/$(DEPDIR)/libscioutput_stream_la-sci_print.Plo
diff --git a/scilab/modules/output_stream/sci_gateway/c/gw_output_stream.c b/scilab/modules/output_stream/sci_gateway/c/gw_output_stream.c
deleted file mode 100644 (file)
index a3d3d57..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2009 - DIGITEO - Allan CORNET
-*
-* This file must be used under the terms of the CeCILL.
-* This source file is licensed as described in the file COPYING, which
-* you should have received as part of this distribution.  The terms
-* are also available at
-* http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-*
-*/
-
-/*--------------------------------------------------------------------------*/
-#include "gw_output_stream.h"
-#include "sci_malloc.h"
-#include "api_scilab.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-int gw_output_stream(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index ddb5e3d..70336a7 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -237,7 +237,6 @@ lib /DEF:"$(ProjectDir)ast_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformSho
     <ClCompile Include="error.c" />
     <ClCompile Include="..\cpp\getDiaryDate.cpp" />
     <ClCompile Include="..\cpp\getFullFilename.cpp" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_output_stream.c" />
     <ClCompile Include="msgout.c" />
     <ClCompile Include="msgs.c" />
     <ClCompile Include="msgstore.c" />
index 4249c70..d30873d 100644 (file)
@@ -56,9 +56,6 @@
     <ClCompile Include="..\cpp\getFullFilename.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_output_stream.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="msgout.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index 3b44d0e..431bf9f 100644 (file)
@@ -14,9 +14,6 @@
 
 #PARALLEL_C_SOURCES =
 
-GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_parallel.c
-
 libsciparallel_la_CPPFLAGS= \
     $(OPENMP_CXXFLAGS) \
     -I$(srcdir)/includes/ \
@@ -43,7 +40,7 @@ libsciparallel_la_LDFLAGS = $(OPENMP_LIBS) -version-number $(SCILAB_LIBRARY_VERS
 
 if OPENMP
 
-libsciparallel_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libsciparallel_la_SOURCES = $(GATEWAY_CPP_SOURCES)
 
 else
 libsciparallel_la_SOURCES = src/noparallel/noparallel.h \
@@ -51,7 +48,7 @@ src/noparallel/noparallel.c
 endif
 
 # For the code check (splint)
-CHECK_SRC= $(PARALLEL_C_SOURCES) $(GATEWAY_C_SOURCES)
+CHECK_SRC= $(PARALLEL_C_SOURCES)
 INCLUDE_FLAGS = $(libsciparallel_la_CFLAGS)
 
 #### Target ######
index dec8ee4..da1c4d9 100644 (file)
@@ -178,12 +178,10 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libsciparallel_la_LIBADD =
 am__libsciparallel_la_SOURCES_DIST = src/noparallel/noparallel.h \
-       src/noparallel/noparallel.c sci_gateway/c/gw_parallel.c
+       src/noparallel/noparallel.c
 am__dirstamp = $(am__leading_dot)dirstamp
-am__objects_1 = sci_gateway/c/libsciparallel_la-gw_parallel.lo
 @OPENMP_FALSE@am_libsciparallel_la_OBJECTS =  \
 @OPENMP_FALSE@ src/noparallel/libsciparallel_la-noparallel.lo
-@OPENMP_TRUE@am_libsciparallel_la_OBJECTS = $(am__objects_1)
 libsciparallel_la_OBJECTS = $(am_libsciparallel_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -541,9 +539,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 yacc_present = @yacc_present@
-GATEWAY_C_SOURCES = \
-    sci_gateway/c/gw_parallel.c
-
 libsciparallel_la_CPPFLAGS = \
     $(OPENMP_CXXFLAGS) \
     -I$(srcdir)/includes/ \
@@ -568,10 +563,10 @@ libsciparallel_la_LDFLAGS = $(OPENMP_LIBS) -version-number $(SCILAB_LIBRARY_VERS
 @OPENMP_FALSE@libsciparallel_la_SOURCES = src/noparallel/noparallel.h \
 @OPENMP_FALSE@src/noparallel/noparallel.c
 
-@OPENMP_TRUE@libsciparallel_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+@OPENMP_TRUE@libsciparallel_la_SOURCES = $(GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
-CHECK_SRC = $(PARALLEL_C_SOURCES) $(GATEWAY_C_SOURCES)
+CHECK_SRC = $(PARALLEL_C_SOURCES)
 INCLUDE_FLAGS = $(libsciparallel_la_CFLAGS)
 
 #### Target ######
@@ -747,30 +742,18 @@ src/noparallel/$(DEPDIR)/$(am__dirstamp):
 src/noparallel/libsciparallel_la-noparallel.lo:  \
        src/noparallel/$(am__dirstamp) \
        src/noparallel/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c
-       @: > sci_gateway/c/$(am__dirstamp)
-sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
-       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciparallel_la-gw_parallel.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 
 libsciparallel.la: $(libsciparallel_la_OBJECTS) $(libsciparallel_la_DEPENDENCIES) $(EXTRA_libsciparallel_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(libsciparallel_la_LINK) -rpath $(pkglibdir) $(libsciparallel_la_OBJECTS) $(libsciparallel_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f sci_gateway/c/*.$(OBJEXT)
-       -rm -f sci_gateway/c/*.lo
        -rm -f src/noparallel/*.$(OBJEXT)
        -rm -f src/noparallel/*.lo
 
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciparallel_la-gw_parallel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/noparallel/$(DEPDIR)/libsciparallel_la-noparallel.Plo@am__quote@
 
 .c.o:
@@ -804,19 +787,11 @@ src/noparallel/libsciparallel_la-noparallel.lo: src/noparallel/noparallel.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciparallel_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/noparallel/libsciparallel_la-noparallel.lo `test -f 'src/noparallel/noparallel.c' || echo '$(srcdir)/'`src/noparallel/noparallel.c
 
-sci_gateway/c/libsciparallel_la-gw_parallel.lo: sci_gateway/c/gw_parallel.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciparallel_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciparallel_la-gw_parallel.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciparallel_la-gw_parallel.Tpo -c -o sci_gateway/c/libsciparallel_la-gw_parallel.lo `test -f 'sci_gateway/c/gw_parallel.c' || echo '$(srcdir)/'`sci_gateway/c/gw_parallel.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciparallel_la-gw_parallel.Tpo sci_gateway/c/$(DEPDIR)/libsciparallel_la-gw_parallel.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_parallel.c' object='sci_gateway/c/libsciparallel_la-gw_parallel.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciparallel_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciparallel_la-gw_parallel.lo `test -f 'sci_gateway/c/gw_parallel.c' || echo '$(srcdir)/'`sci_gateway/c/gw_parallel.c
-
 mostlyclean-libtool:
        -rm -f *.lo
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
        -rm -rf src/noparallel/.libs src/noparallel/_libs
 install-libsciparallel_la_etcDATA: $(libsciparallel_la_etc_DATA)
        @$(NORMAL_INSTALL)
@@ -1019,8 +994,6 @@ 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)
-       -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sci_gateway/c/$(am__dirstamp)
        -rm -f src/noparallel/$(DEPDIR)/$(am__dirstamp)
        -rm -f src/noparallel/$(am__dirstamp)
 
@@ -1033,7 +1006,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) src/noparallel/$(DEPDIR)
+       -rm -rf src/noparallel/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -1082,7 +1055,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) src/noparallel/$(DEPDIR)
+       -rm -rf src/noparallel/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/scilab/modules/parallel/sci_gateway/c/gw_parallel.c b/scilab/modules/parallel/sci_gateway/c/gw_parallel.c
deleted file mode 100644 (file)
index dec6457..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2010 - DIGITEO - Allan CORNET
-*
-* This file must be used under the terms of the CeCILL.
-* This source file is licensed as described in the file COPYING, which
-* you should have received as part of this distribution.  The terms
-* are also available at
-* http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-*
-*/
-#include <string.h>
-#include "api_scilab.h"
-#include "gw_parallel.h"
-#include "sci_malloc.h"
-#include "callFunctionFromGateway.h"
-
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[] =
-{
-    {NULL, ""},                 // "parallel_run"
-    {NULL, ""}                  // "parallel_concurrency"
-};
-
-/*--------------------------------------------------------------------------*/
-int gw_parallel(void)
-{
-    return 0;
-}
-
-/*--------------------------------------------------------------------------*/
index 9b3c815..9beaa2b 100644 (file)
   <ItemGroup>
     <ClCompile Include="DllmainParallel.c" />
     <ClCompile Include="forkWindows.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_parallel.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_parallel_concurrency.c" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_parallel_run.cpp">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_SCL_SECURE_NO_WARNINGS  ;%(PreprocessorDefinitions)</PreprocessorDefinitions>
index bbac2dc..92271b7 100644 (file)
@@ -29,9 +29,6 @@
     <ClCompile Include="forkWindows.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_parallel.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_parallel_concurrency.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/polynomials/sci_gateway/c/gw_polynomials.c b/scilab/modules/polynomials/sci_gateway/c/gw_polynomials.c
deleted file mode 100644 (file)
index 6b74c44..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006-2008 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_polynomials.h"
-#include "callFunctionFromGateway.h"
-#include "api_scilab.h"
-#include "MALLOC.h"
-/*--------------------------------------------------------------------------*/
-static int sci_notused(char *fname, unsigned long fname_len)
-{
-    /* not used */
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
-int gw_polynomials(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index 83b0203..11b2d07 100644 (file)
@@ -50,8 +50,6 @@ PREFERENCES_JNI_SOURCES = src/jni/ScilabPreferences.cpp
 
 PREFERENCES_C_SOURCES = src/c/getScilabPreference.c
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_preferences.c
-
 GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_addModulePreferences.cpp \
     sci_gateway/cpp/sci_removeModulePreferences.cpp \
index 91d32c9..6f95d81 100644 (file)
@@ -199,13 +199,11 @@ am__DEPENDENCIES_1 =
 libscipreferences_la_DEPENDENCIES = libscipreferences-algo.la \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
-am__objects_3 = sci_gateway/c/libscipreferences_la-gw_preferences.lo
-am__objects_4 = sci_gateway/cpp/libscipreferences_la-sci_addModulePreferences.lo \
+am__objects_3 = sci_gateway/cpp/libscipreferences_la-sci_addModulePreferences.lo \
        sci_gateway/cpp/libscipreferences_la-sci_removeModulePreferences.lo \
        sci_gateway/cpp/libscipreferences_la-sci_preferences.lo
-am__objects_5 = src/jni/libscipreferences_la-ScilabPreferences.lo
-am_libscipreferences_la_OBJECTS = $(am__objects_3) $(am__objects_4) \
-       $(am__objects_5)
+am__objects_4 = src/jni/libscipreferences_la-ScilabPreferences.lo
+am_libscipreferences_la_OBJECTS = $(am__objects_3) $(am__objects_4)
 libscipreferences_la_OBJECTS = $(am_libscipreferences_la_OBJECTS)
 libscipreferences_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -624,7 +622,6 @@ libscipreferences_la_src_xslt_xwizard_DATA = \
 
 PREFERENCES_JNI_SOURCES = src/jni/ScilabPreferences.cpp
 PREFERENCES_C_SOURCES = src/c/getScilabPreference.c
-GATEWAY_C_SOURCES = sci_gateway/c/gw_preferences.c
 GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_addModulePreferences.cpp \
     sci_gateway/cpp/sci_removeModulePreferences.cpp \
@@ -871,15 +868,6 @@ src/nopreferences/libscipreferences_cli_la-nopreferences.lo:  \
 
 libscipreferences-cli.la: $(libscipreferences_cli_la_OBJECTS) $(libscipreferences_cli_la_DEPENDENCIES) $(EXTRA_libscipreferences_cli_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(LINK) -rpath $(pkglibdir) $(libscipreferences_cli_la_OBJECTS) $(libscipreferences_cli_la_LIBADD) $(LIBS)
-sci_gateway/c/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c
-       @: > sci_gateway/c/$(am__dirstamp)
-sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
-       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscipreferences_la-gw_preferences.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp
        @: > sci_gateway/cpp/$(am__dirstamp)
@@ -909,8 +897,6 @@ libscipreferences.la: $(libscipreferences_la_OBJECTS) $(libscipreferences_la_DEP
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f sci_gateway/c/*.$(OBJEXT)
-       -rm -f sci_gateway/c/*.lo
        -rm -f sci_gateway/cpp/*.$(OBJEXT)
        -rm -f sci_gateway/cpp/*.lo
        -rm -f src/c/*.$(OBJEXT)
@@ -923,7 +909,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscipreferences_la-gw_preferences.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscipreferences_la-sci_addModulePreferences.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscipreferences_la-sci_preferences.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscipreferences_la-sci_removeModulePreferences.Plo@am__quote@
@@ -969,13 +954,6 @@ src/nopreferences/libscipreferences_cli_la-nopreferences.lo: src/nopreferences/n
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscipreferences_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/nopreferences/libscipreferences_cli_la-nopreferences.lo `test -f 'src/nopreferences/nopreferences.c' || echo '$(srcdir)/'`src/nopreferences/nopreferences.c
 
-sci_gateway/c/libscipreferences_la-gw_preferences.lo: sci_gateway/c/gw_preferences.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscipreferences_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscipreferences_la-gw_preferences.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscipreferences_la-gw_preferences.Tpo -c -o sci_gateway/c/libscipreferences_la-gw_preferences.lo `test -f 'sci_gateway/c/gw_preferences.c' || echo '$(srcdir)/'`sci_gateway/c/gw_preferences.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscipreferences_la-gw_preferences.Tpo sci_gateway/c/$(DEPDIR)/libscipreferences_la-gw_preferences.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_preferences.c' object='sci_gateway/c/libscipreferences_la-gw_preferences.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscipreferences_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscipreferences_la-gw_preferences.lo `test -f 'sci_gateway/c/gw_preferences.c' || echo '$(srcdir)/'`sci_gateway/c/gw_preferences.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1033,7 +1011,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-       -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
        -rm -rf sci_gateway/cpp/.libs sci_gateway/cpp/_libs
        -rm -rf src/c/.libs src/c/_libs
        -rm -rf src/jni/.libs src/jni/_libs
@@ -1262,8 +1239,6 @@ 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)
-       -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sci_gateway/c/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
        -rm -f sci_gateway/cpp/$(am__dirstamp)
        -rm -f src/c/$(DEPDIR)/$(am__dirstamp)
@@ -1283,7 +1258,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/jni/$(DEPDIR) src/nopreferences/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/jni/$(DEPDIR) src/nopreferences/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -1334,7 +1309,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/jni/$(DEPDIR) src/nopreferences/$(DEPDIR)
+       -rm -rf sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/jni/$(DEPDIR) src/nopreferences/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/scilab/modules/preferences/sci_gateway/c/gw_preferences.c b/scilab/modules/preferences/sci_gateway/c/gw_preferences.c
deleted file mode 100644 (file)
index 11fe26c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2011 - DIGITEO - Calixte DENIZET
- *
- *  This file must be used under the terms of the CeCILL.
- *  This source file is licensed as described in the file COPYING, which
- *  you should have received as part of this distribution.  The terms
- *  are also available at
- *  http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include "gw_preferences.h"
-#include "callFunctionFromGateway.h"
-#include "BOOL.h"
-/*--------------------------------------------------------------------------*/
-int gw_preferences(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index dded0c5..fcc3486 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
     <ClCompile Include="..\..\sci_gateway\cpp\sci_addModulePreferences.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_preferences.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_removeModulePreferences.cpp" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_preferences.c" />
     <ClCompile Include="..\jni\ScilabPreferences.cpp" />
     <ClCompile Include="DllmainPreferences.c" />
     <ClCompile Include="getScilabPreference.c" />
index 6968f75..39f8745 100644 (file)
@@ -42,9 +42,6 @@
     <ClCompile Include="..\jni\ScilabPreferences.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_preferences.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_addModulePreferences.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/randlib/sci_gateway/c/gw_randlib.c b/scilab/modules/randlib/sci_gateway/c/gw_randlib.c
deleted file mode 100644 (file)
index 345f52d..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-/* INRIA 2006 */
-/* Allan CORNET */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_randlib.h"
-#include "api_scilab.h"
-#include "MALLOC.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[] =
-{
-    {sci_Rand, "grand"}
-};
-/*--------------------------------------------------------------------------*/
-int gw_randlib(void)
-{
-    Rhs = Max(0, Rhs);
-
-    if (pvApiCtx == NULL)
-    {
-        pvApiCtx = (StrCtx*)MALLOC(sizeof(StrCtx));
-    }
-
-    pvApiCtx->pstName = (char*)Tab[Fin - 1].name;
-    callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index ca6c66f..bd01b91 100644 (file)
@@ -100,7 +100,6 @@ sci_gateway/cpp/sci_callblk.cpp \
 sci_gateway/cpp/sci_model2blk.cpp
 
 GATEWAY_C_SOURCES = \
-sci_gateway/c/gw_scicos.c \
 sci_gateway/c/sci_ftree2.c \
 sci_gateway/c/sci_ftree3.c \
 sci_gateway/c/sci_ftree4.c \
index 6b96e59..987b68c 100644 (file)
@@ -315,10 +315,10 @@ am__libsciscicos_cli_la_SOURCES_DIST =  \
        sci_gateway/cpp/sci_var2vec.cpp \
        sci_gateway/cpp/sci_vec2var.cpp \
        sci_gateway/cpp/sci_callblk.cpp \
-       sci_gateway/cpp/sci_model2blk.cpp sci_gateway/c/gw_scicos.c \
-       sci_gateway/c/sci_ftree2.c sci_gateway/c/sci_ftree3.c \
-       sci_gateway/c/sci_ftree4.c sci_gateway/c/sci_loadScicos.c \
-       sci_gateway/c/sci_sctree.c sci_gateway/fortran/sci_f_tree2.f \
+       sci_gateway/cpp/sci_model2blk.cpp sci_gateway/c/sci_ftree2.c \
+       sci_gateway/c/sci_ftree3.c sci_gateway/c/sci_ftree4.c \
+       sci_gateway/c/sci_loadScicos.c sci_gateway/c/sci_sctree.c \
+       sci_gateway/fortran/sci_f_tree2.f \
        sci_gateway/fortran/sci_f_tree3.f \
        sci_gateway/fortran/sci_f_tree4.f
 am__objects_5 =  \
@@ -352,8 +352,7 @@ am__objects_5 =  \
        sci_gateway/cpp/libsciscicos_cli_la-sci_vec2var.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_callblk.lo \
        sci_gateway/cpp/libsciscicos_cli_la-sci_model2blk.lo
-am__objects_6 = sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo \
-       sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo \
+am__objects_6 = sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_ftree3.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_ftree4.lo \
        sci_gateway/c/libsciscicos_cli_la-sci_loadScicos.lo \
@@ -400,10 +399,10 @@ am__libsciscicos_la_SOURCES_DIST =  \
        sci_gateway/cpp/sci_var2vec.cpp \
        sci_gateway/cpp/sci_vec2var.cpp \
        sci_gateway/cpp/sci_callblk.cpp \
-       sci_gateway/cpp/sci_model2blk.cpp sci_gateway/c/gw_scicos.c \
-       sci_gateway/c/sci_ftree2.c sci_gateway/c/sci_ftree3.c \
-       sci_gateway/c/sci_ftree4.c sci_gateway/c/sci_loadScicos.c \
-       sci_gateway/c/sci_sctree.c sci_gateway/fortran/sci_f_tree2.f \
+       sci_gateway/cpp/sci_model2blk.cpp sci_gateway/c/sci_ftree2.c \
+       sci_gateway/c/sci_ftree3.c sci_gateway/c/sci_ftree4.c \
+       sci_gateway/c/sci_loadScicos.c sci_gateway/c/sci_sctree.c \
+       sci_gateway/fortran/sci_f_tree2.f \
        sci_gateway/fortran/sci_f_tree3.f \
        sci_gateway/fortran/sci_f_tree4.f
 am__objects_8 = sci_gateway/cpp/libsciscicos_la-sci_scicos_debug.lo \
@@ -436,8 +435,7 @@ am__objects_8 = sci_gateway/cpp/libsciscicos_la-sci_scicos_debug.lo \
        sci_gateway/cpp/libsciscicos_la-sci_vec2var.lo \
        sci_gateway/cpp/libsciscicos_la-sci_callblk.lo \
        sci_gateway/cpp/libsciscicos_la-sci_model2blk.lo
-am__objects_9 = sci_gateway/c/libsciscicos_la-gw_scicos.lo \
-       sci_gateway/c/libsciscicos_la-sci_ftree2.lo \
+am__objects_9 = sci_gateway/c/libsciscicos_la-sci_ftree2.lo \
        sci_gateway/c/libsciscicos_la-sci_ftree3.lo \
        sci_gateway/c/libsciscicos_la-sci_ftree4.lo \
        sci_gateway/c/libsciscicos_la-sci_loadScicos.lo \
@@ -1014,7 +1012,6 @@ sci_gateway/cpp/sci_callblk.cpp \
 sci_gateway/cpp/sci_model2blk.cpp
 
 GATEWAY_C_SOURCES = \
-sci_gateway/c/gw_scicos.c \
 sci_gateway/c/sci_ftree2.c \
 sci_gateway/c/sci_ftree3.c \
 sci_gateway/c/sci_ftree4.c \
@@ -1672,9 +1669,6 @@ sci_gateway/c/$(am__dirstamp):
 sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
        @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -1798,9 +1792,6 @@ sci_gateway/cpp/libsciscicos_la-sci_callblk.lo:  \
 sci_gateway/cpp/libsciscicos_la-sci_model2blk.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciscicos_la-gw_scicos.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libsciscicos_la-sci_ftree2.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -2015,13 +2006,11 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-gw_scicos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree3.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree4.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_loadScicos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_sctree.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-gw_scicos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree3.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree4.Plo@am__quote@
@@ -2260,13 +2249,6 @@ src/c/libsciscicos_algo_la-ddaskr.lo: src/c/ddaskr.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libsciscicos_algo_la-ddaskr.lo `test -f 'src/c/ddaskr.c' || echo '$(srcdir)/'`src/c/ddaskr.c
 
-sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo: sci_gateway/c/gw_scicos.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-gw_scicos.Tpo -c -o sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo `test -f 'sci_gateway/c/gw_scicos.c' || echo '$(srcdir)/'`sci_gateway/c/gw_scicos.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-gw_scicos.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-gw_scicos.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_scicos.c' object='sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_cli_la-gw_scicos.lo `test -f 'sci_gateway/c/gw_scicos.c' || echo '$(srcdir)/'`sci_gateway/c/gw_scicos.c
-
 sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo: sci_gateway/c/sci_ftree2.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree2.Tpo -c -o sci_gateway/c/libsciscicos_cli_la-sci_ftree2.lo `test -f 'sci_gateway/c/sci_ftree2.c' || echo '$(srcdir)/'`sci_gateway/c/sci_ftree2.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree2.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_cli_la-sci_ftree2.Plo
@@ -2302,13 +2284,6 @@ sci_gateway/c/libsciscicos_cli_la-sci_sctree.lo: sci_gateway/c/sci_sctree.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_cli_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_cli_la-sci_sctree.lo `test -f 'sci_gateway/c/sci_sctree.c' || echo '$(srcdir)/'`sci_gateway/c/sci_sctree.c
 
-sci_gateway/c/libsciscicos_la-gw_scicos.lo: sci_gateway/c/gw_scicos.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_la-gw_scicos.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_la-gw_scicos.Tpo -c -o sci_gateway/c/libsciscicos_la-gw_scicos.lo `test -f 'sci_gateway/c/gw_scicos.c' || echo '$(srcdir)/'`sci_gateway/c/gw_scicos.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_la-gw_scicos.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_la-gw_scicos.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_scicos.c' object='sci_gateway/c/libsciscicos_la-gw_scicos.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciscicos_la-gw_scicos.lo `test -f 'sci_gateway/c/gw_scicos.c' || echo '$(srcdir)/'`sci_gateway/c/gw_scicos.c
-
 sci_gateway/c/libsciscicos_la-sci_ftree2.lo: sci_gateway/c/sci_ftree2.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciscicos_la-sci_ftree2.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree2.Tpo -c -o sci_gateway/c/libsciscicos_la-sci_ftree2.lo `test -f 'sci_gateway/c/sci_ftree2.c' || echo '$(srcdir)/'`sci_gateway/c/sci_ftree2.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree2.Tpo sci_gateway/c/$(DEPDIR)/libsciscicos_la-sci_ftree2.Plo
diff --git a/scilab/modules/scicos/sci_gateway/c/gw_scicos.c b/scilab/modules/scicos/sci_gateway/c/gw_scicos.c
deleted file mode 100644 (file)
index 40c9133..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Scicos
-*
-*  Copyright (C) INRIA - Allan CORNET
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-* See the file ./license.txt
-*/
-/*--------------------------------------------------------------------------*/
-/* INRIA 2008 */
-/* Allan CORNET */
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_scicos.h"
-/*--------------------------------------------------------------------------*/
-int gw_scicos(void)
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
-
index 7ddfae2..d3b1fb2 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -291,7 +291,6 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
     <ClCompile Include="..\ddaskr.c" />
     <ClCompile Include="..\DllmainScicos.c" />
     <ClCompile Include="..\ezxml.c" />
-    <ClCompile Include="..\..\..\sci_gateway\c\gw_scicos.c" />
     <ClCompile Include="..\import.c" />
     <ClCompile Include="..\MlistGetFieldNumber.c" />
     <ClCompile Include="..\lsodar.c" />
@@ -386,4 +385,4 @@ lib /DEF:"$(ProjectDir)../differential_equations_f_Import.def" /SUBSYSTEM:WINDOW
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index d775ae9..19e3f15 100644 (file)
@@ -32,9 +32,6 @@
     <ClCompile Include="..\ezxml.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\sci_gateway\c\gw_scicos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\import.c">
       <Filter>Source Files</Filter>
     </ClCompile>
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index 528a497..a1fb965 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -306,7 +306,6 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClCompile Include="..\cpp\view_scilab\TextAdapter.cpp" />
     <ClCompile Include="DllmainScicos.c" />
     <ClCompile Include="ezxml.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_scicos.c" />
     <ClCompile Include="import.c" />
     <ClCompile Include="MlistGetFieldNumber.c" />
     <ClCompile Include="lsodar.c" />
@@ -441,4 +440,4 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index 939a690..1ca57e6 100644 (file)
@@ -47,9 +47,6 @@
     <ClCompile Include="ezxml.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_scicos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="import.c">
       <Filter>Source Files</Filter>
     </ClCompile>
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index 264ff84..1833c2f 100644 (file)
@@ -37,8 +37,6 @@ SCINOTES_CXX_SOURCES = \
     src/jni/SciNotes.cpp \
     src/cpp/callscinotes.cpp
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_scinotes.c
-
 GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_scinotes.cpp \
     sci_gateway/cpp/sci_closeSciNotesFromScilab.cpp
@@ -96,11 +94,11 @@ endif
 libsciscinotes_la_LDFLAGS = $(AM_LDFLAGS)
 
 libsciscinotes_algo_la_SOURCES = $(SCINOTES_C_SOURCES) $(SCINOTES_JNI_SOURCES) $(SCINOTES_CXX_SOURCES)
-libsciscinotes_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
+libsciscinotes_la_SOURCES = $(GATEWAY_CXX_SOURCES)
 libsciscinotes_algo_la_CPPFLAGS = $(libsciscinotes_la_CPPFLAGS)
 
 # For the code check (splint)
-CHECK_SRC= $(SCINOTES_C_SOURCES) $(GATEWAY_C_SOURCES)
+CHECK_SRC= $(SCINOTES_C_SOURCES)
 INCLUDE_FLAGS = $(libsciscinotes_la_CPPFLAGS)
 
 GIWS_WRAPPERS = src/jni/SciNotes.giws.xml
index fa77485..71c580e 100644 (file)
@@ -197,10 +197,9 @@ libsciscinotes_disable_la_OBJECTS =  \
 am__DEPENDENCIES_1 =
 libsciscinotes_la_DEPENDENCIES = libsciscinotes-algo.la \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am__objects_6 = sci_gateway/c/libsciscinotes_la-gw_scinotes.lo
-am__objects_7 = sci_gateway/cpp/libsciscinotes_la-sci_scinotes.lo \
+am__objects_6 = sci_gateway/cpp/libsciscinotes_la-sci_scinotes.lo \
        sci_gateway/cpp/libsciscinotes_la-sci_closeSciNotesFromScilab.lo
-am_libsciscinotes_la_OBJECTS = $(am__objects_6) $(am__objects_7)
+am_libsciscinotes_la_OBJECTS = $(am__objects_6)
 libsciscinotes_la_OBJECTS = $(am_libsciscinotes_la_OBJECTS)
 libsciscinotes_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -601,7 +600,6 @@ SCINOTES_CXX_SOURCES = \
     src/jni/SciNotes.cpp \
     src/cpp/callscinotes.cpp
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_scinotes.c
 GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_scinotes.cpp \
     sci_gateway/cpp/sci_closeSciNotesFromScilab.cpp
@@ -653,11 +651,11 @@ pkglib_LTLIBRARIES = libsciscinotes-disable.la $(am__append_1)
 @GUI_TRUE@noinst_LTLIBRARIES = libsciscinotes-algo.la
 libsciscinotes_la_LDFLAGS = $(AM_LDFLAGS)
 libsciscinotes_algo_la_SOURCES = $(SCINOTES_C_SOURCES) $(SCINOTES_JNI_SOURCES) $(SCINOTES_CXX_SOURCES)
-libsciscinotes_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
+libsciscinotes_la_SOURCES = $(GATEWAY_CXX_SOURCES)
 libsciscinotes_algo_la_CPPFLAGS = $(libsciscinotes_la_CPPFLAGS)
 
 # For the code check (splint)
-CHECK_SRC = $(SCINOTES_C_SOURCES) $(GATEWAY_C_SOURCES)
+CHECK_SRC = $(SCINOTES_C_SOURCES)
 INCLUDE_FLAGS = $(libsciscinotes_la_CPPFLAGS)
 GIWS_WRAPPERS = src/jni/SciNotes.giws.xml
 SWIG_WRAPPERS = src/jni/ScilabKeywords.i
@@ -867,15 +865,6 @@ src/noscinotes/libsciscinotes_disable_la-noscinotes_gw.lo:  \
 
 libsciscinotes-disable.la: $(libsciscinotes_disable_la_OBJECTS) $(libsciscinotes_disable_la_DEPENDENCIES) $(EXTRA_libsciscinotes_disable_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libsciscinotes_disable_la_OBJECTS) $(libsciscinotes_disable_la_LIBADD) $(LIBS)
-sci_gateway/c/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c
-       @: > sci_gateway/c/$(am__dirstamp)
-sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
-       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciscinotes_la-gw_scinotes.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp
        @: > sci_gateway/cpp/$(am__dirstamp)
@@ -894,8 +883,6 @@ libsciscinotes.la: $(libsciscinotes_la_OBJECTS) $(libsciscinotes_la_DEPENDENCIES
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
-       -rm -f sci_gateway/c/*.$(OBJEXT)
-       -rm -f sci_gateway/c/*.lo
        -rm -f sci_gateway/cpp/*.$(OBJEXT)
        -rm -f sci_gateway/cpp/*.lo
        -rm -f src/c/*.$(OBJEXT)