rename excel to spreadsheet module
Allan Cornet [Thu, 25 Oct 2007 14:50:59 +0000 (14:50 +0000)]
41 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/callinterf.h
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/changelog.txt
scilab/modules/spreadsheet/etc/spreadsheet.quit [moved from scilab/modules/spreadsheet/etc/excel.quit with 77% similarity]
scilab/modules/spreadsheet/etc/spreadsheet.start [moved from scilab/modules/spreadsheet/etc/excel.start with 72% similarity]
scilab/modules/spreadsheet/excel.iss [deleted file]
scilab/modules/spreadsheet/excel_header.def [deleted file]
scilab/modules/spreadsheet/help/en_US/addchapter.sce
scilab/modules/spreadsheet/help/en_US/excel2sci.xml
scilab/modules/spreadsheet/help/en_US/xls_open.xml
scilab/modules/spreadsheet/help/en_US/xls_read.xml
scilab/modules/spreadsheet/includes/gw_spreadsheet.h [moved from scilab/modules/spreadsheet/includes/gw_excel.h with 85% similarity]
scilab/modules/spreadsheet/macros/buildmacros.sce
scilab/modules/spreadsheet/macros/excel2sci.sci
scilab/modules/spreadsheet/macros/sci2excel.sci
scilab/modules/spreadsheet/readme.txt
scilab/modules/spreadsheet/sci_gateway/c/gw_spreadsheet.c [moved from scilab/modules/spreadsheet/sci_gateway/c/gw_excel.c with 90% similarity]
scilab/modules/spreadsheet/sci_gateway/c/intreadxls.c
scilab/modules/spreadsheet/sci_gateway/c/sci_xls_open.c
scilab/modules/spreadsheet/sci_gateway/c/sci_xls_read.c
scilab/modules/spreadsheet/sci_gateway/spreadsheet_gateway.xml [moved from scilab/modules/spreadsheet/sci_gateway/excel_gateway.xml with 93% similarity]
scilab/modules/spreadsheet/spreadsheet.iss [new file with mode: 0644]
scilab/modules/spreadsheet/spreadsheet.vcproj [moved from scilab/modules/spreadsheet/excel.vcproj with 84% similarity]
scilab/modules/spreadsheet/spreadsheet_header.def [new file with mode: 0644]
scilab/modules/spreadsheet/src/c/resource.h
scilab/modules/spreadsheet/src/c/ripole.c
scilab/modules/spreadsheet/src/c/spreadsheet.rc [moved from scilab/modules/spreadsheet/src/c/excel.rc with 86% similarity]
scilab/modules/spreadsheet/src/noexcel/noexcel.c
scilab/modules/spreadsheet/src/noexcel/noexcel.rc
scilab/modules/spreadsheet/src/noexcel/noexcel.vcproj
scilab/modules/spreadsheet/src/noexcel/noexcel_header.def
scilab/modules/spreadsheet/src/noexcel/resource.h
scilab/modules/spreadsheet/version.xml

index 9357300..4654dfe 100644 (file)
@@ -781,13 +781,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generatePoFile", "tools\loc
                {66F2FB48-5D68-4445-A856-119F685A371B} = {66F2FB48-5D68-4445-A856-119F685A371B}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excel", "modules\excel\excel.vcproj", "{CE521770-0466-4743-B9F6-38F8AEB93888}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spreadsheet", "modules\spreadsheet\spreadsheet.vcproj", "{CE521770-0466-4743-B9F6-38F8AEB93888}"
        ProjectSection(ProjectDependencies) = postProject
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noexcel", "modules\excel\src\noexcel\noexcel.vcproj", "{AC43B2A6-601A-4E15-97DF-2B296FFAD4F9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nospreadsheet", "modules\spreadsheet\src\nospreadsheet\nospreadsheet.vcproj", "{AC43B2A6-601A-4E15-97DF-2B296FFAD4F9}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
index d551287..83ac559 100644 (file)
@@ -838,13 +838,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generatePoFile", "tools\loc
                {66F2FB48-5D68-4445-A856-119F685A371B} = {66F2FB48-5D68-4445-A856-119F685A371B}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "excel", "modules\excel\excel.vcproj", "{CE521770-0466-4743-B9F6-38F8AEB93888}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spreadsheet", "modules\spreadsheet\spreadsheet.vcproj", "{CE521770-0466-4743-B9F6-38F8AEB93888}"
        ProjectSection(ProjectDependencies) = postProject
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noexcel", "modules\excel\src\noexcel\noexcel.vcproj", "{AC43B2A6-601A-4E15-97DF-2B296FFAD4F9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nospreadsheet", "modules\spreadsheet\src\nospreadsheet\nospreadsheet.vcproj", "{AC43B2A6-601A-4E15-97DF-2B296FFAD4F9}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
index 5c89494..1472ee7 100644 (file)
@@ -1180,6 +1180,7 @@ modules/boolean/Makefile
 modules/integer/Makefile
 modules/double/Makefile
 modules/fileio/Makefile
+modules/spreadsheet/Makefile
 modules/string/Makefile
 modules/time/Makefile
 modules/graphics/Makefile
@@ -1206,7 +1207,6 @@ modules/scipad/Makefile
 modules/scilab2fortran/Makefile
 modules/development_tools/Makefile
 modules/console/Makefile
-modules/excel/Makefile
 modules/Makefile
 libs/Makefile 
 Makefile
index c305456..a63977c 100644 (file)
@@ -63,7 +63,7 @@
 <module name="others" activate="1"/>
 <module name="scilab2fortran" activate="1"/>
 <module name="development_tools" activate="1"/>
-<module name="excel" activate="1"/>
+<module name="spreadsheet" activate="1"/>
 <module name="scicos" activate="0"/>
 <!-- comments -->
 <module name="pvm" activate="0"/>
index 1aace0a..59d016e 100644 (file)
@@ -64,7 +64,7 @@
 <module name="others" activate="1"/>
 <module name="scilab2fortran" activate="1"/>
 <module name="development_tools" activate="1"/>
-<module name="excel" activate="1"/>
+<module name="spreadsheet" activate="1"/>
 <!-- comments -->
 <module name="pvm" activate="0"/>
 <module name="sci2c" activate="0"/>
index 93ce968..7a75329 100644 (file)
@@ -57,7 +57,7 @@ helptools \
 scicos \
 fftw \
 pvm \
-excel \
+spreadsheet \
 jvm 
 
 #if MPI
index 38ee578..ff75721 100644 (file)
@@ -87,7 +87,7 @@ static OpTab Interfaces[] = {
        /* 53  */ {C2F(gw_shell)},
        /* 54  */ {C2F(gw_completion)},
        /* 55  */ {C2F(gw_history_manager)},
-       /* 56  */ {C2F(gw_excel)}
+       /* 56  */ {C2F(gw_spreadsheet)}
 };
 
 
index d191030..8f1c80b 100644 (file)
@@ -77,7 +77,7 @@
 /* 54 */                                               #include "../../../completion/includes/gw_completion.h"
 /* 55 */                                               #include "../../../history_manager/includes/gw_history_manager.h"
 
-/* 56 */                                               #include "../../../excel/includes/gw_excel.h"
+/* 56 */                                               #include "../../../spreadsheet/includes/gw_spreadsheet.h"
 
 /* 55 *///                        #include "../../../mpi/includes/gw_mpi.h"
 
index 116cca8..2a2aced 100644 (file)
@@ -3,7 +3,7 @@
 ### INRIA - Scilab 2006 \r
 ##########\r
 \r
-EXCEL_C_SOURCES = src/c/xls.c \\r
+SPREADSHEET_C_SOURCES = src/c/xls.c \\r
 src/c/olestream-unwrap.c \\r
 src/c/pldstr.c \\r
 src/c/ole.c \\r
@@ -13,20 +13,21 @@ src/c/ripole.c \
 src/c/bt-int.c \r
 \r
 \r
-GATEWAY_C_SOURCES = sci_gateway/c/sci_xls_read.c \\r
+GATEWAY_C_SOURCES = sci_gateway/c/gw_spreadsheet.c \\r
+sci_gateway/c/sci_xls_read.c \\r
 sci_gateway/c/sci_xls_open.c \\r
 sci_gateway/c/intreadxls.c \r
 \r
 \r
 MODULE_CHECKS = \r
 \r
-libsciexcel_la_CFLAGS=  -Iincludes/ -Isrc/c/ -I$(top_srcdir)/libs/MALLOC/includes/\r
+libscispreadsheet_la_CFLAGS=  -Iincludes/ -Isrc/c/ -I$(top_srcdir)/libs/MALLOC/includes/\r
 \r
-pkglib_LTLIBRARIES = libsciexcel.la\r
+pkglib_LTLIBRARIES = libscispreadsheet.la\r
 \r
-libsciexcel_la_SOURCES = $(EXCEL_C_SOURCES) $(GATEWAY_C_SOURCES)\r
+libscispreadsheet_la_SOURCES = $(SPREADSHEET_C_SOURCES) $(GATEWAY_C_SOURCES)\r
 \r
-libsciexcel_la_LIBADD = \\r
+libscispreadsheet_la_LIBADD = \\r
        $(top_builddir)/libs/MALLOC/libscimalloc.la \\r
     $(top_builddir)/libs/libst/libscilibst.la \r
 \r
@@ -35,35 +36,35 @@ libsciexcel_la_LIBADD = \
 \r
 \r
 #### Target ######\r
-modulename=excel\r
+modulename=spreadsheet\r
 \r
 \r
-#### excel : Conf files ####\r
-libsciexcel_la_rootdir = $(mydatadir)\r
-libsciexcel_la_root_DATA = changelog.txt licence.txt readme.txt version.xml\r
+#### spreadsheet : Conf files ####\r
+libscispreadsheet_la_rootdir = $(mydatadir)\r
+libscispreadsheet_la_root_DATA = changelog.txt licence.txt readme.txt version.xml\r
 \r
 \r
-#### excel : init scripts #### \r
-libsciexcel_la_etcdir = $(mydatadir)/etc\r
-libsciexcel_la_etc_DATA = etc/excel.quit etc/excel.start\r
+#### spreadsheet : init scripts #### \r
+libscispreadsheet_la_etcdir = $(mydatadir)/etc\r
+libscispreadsheet_la_etc_DATA = etc/spreadsheet.quit etc/spreadsheet.start\r
 \r
-#### excel : gateway declaration #### \r
-libsciexcel_la_sci_gatewaydir = $(mydatadir)/sci_gateway\r
-libsciexcel_la_sci_gateway_DATA = sci_gateway/excel_gateway.xml\r
+#### spreadsheet : gateway declaration #### \r
+libscispreadsheet_la_sci_gatewaydir = $(mydatadir)/sci_gateway\r
+libscispreadsheet_la_sci_gateway_DATA = sci_gateway/spreadsheet_gateway.xml\r
 \r
-#### excel : include files ####\r
-libsciexcel_la_includedir=$(pkgincludedir)/excel\r
-libsciexcel_la_include_HEADERS = includes/gw_excel.h\r
+#### spreadsheet : include files ####\r
+libscispreadsheet_la_includedir=$(pkgincludedir)/spreadsheet\r
+libscispreadsheet_la_include_HEADERS = includes/gw_spreadsheet.h\r
 \r
 \r
-#### excel : demos files ####\r
-libsciexcel_la_demosdir=$(mydatadir)/demos/\r
-libsciexcel_la_demos_DATA = demos/excel/Testo1.xls \\r
-demos/excel/o1.xls \\r
-demos/excel/Test1.xls \\r
-demos/excel/Testobig.xls \\r
-demos/excel/Testbig.xls \\r
-demos/excel/t1.xls \\r
-demos/excel/README\r
+#### spreadsheet : demos files ####\r
+libscispreadsheet_la_demosdir=$(mydatadir)/demos/\r
+libscispreadsheet_la_demos_DATA = demos/spreadsheet/Testo1.xls \\r
+demos/spreadsheet/o1.xls \\r
+demos/spreadsheet/Test1.xls \\r
+demos/spreadsheet/Testobig.xls \\r
+demos/spreadsheet/Testbig.xls \\r
+demos/spreadsheet/t1.xls \\r
+demos/spreadsheet/README\r
 \r
 include $(top_srcdir)/Makefile.incl.am\r
index 9442a9b..6a8c99d 100644 (file)
@@ -47,12 +47,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(libsciexcel_la_include_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(libscispreadsheet_la_include_HEADERS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
 @GUI_TRUE@am__append_1 = build-java
 @SWIG_TRUE@am__append_2 = build-swig
 @GIWS_TRUE@am__append_3 = build-giws
-subdir = modules/excel
+subdir = modules/spreadsheet
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fftw.m4 \
        $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
@@ -77,27 +77,27 @@ am__vpath_adj = case $$p in \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
-       "$(DESTDIR)$(libsciexcel_la_demosdir)" \
-       "$(DESTDIR)$(libsciexcel_la_etcdir)" \
-       "$(DESTDIR)$(libsciexcel_la_rootdir)" \
-       "$(DESTDIR)$(libsciexcel_la_sci_gatewaydir)" \
-       "$(DESTDIR)$(libsciexcel_la_includedir)"
+       "$(DESTDIR)$(libscispreadsheet_la_demosdir)" \
+       "$(DESTDIR)$(libscispreadsheet_la_etcdir)" \
+       "$(DESTDIR)$(libscispreadsheet_la_rootdir)" \
+       "$(DESTDIR)$(libscispreadsheet_la_sci_gatewaydir)" \
+       "$(DESTDIR)$(libscispreadsheet_la_includedir)"
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libsciexcel_la_DEPENDENCIES =  \
+libscispreadsheet_la_DEPENDENCIES =  \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/libs/libst/libscilibst.la
-am__objects_1 = libsciexcel_la-xls.lo \
-       libsciexcel_la-olestream-unwrap.lo libsciexcel_la-pldstr.lo \
-       libsciexcel_la-ole.lo libsciexcel_la-bytedecoders.lo \
-       libsciexcel_la-logger.lo libsciexcel_la-ripole.lo \
-       libsciexcel_la-bt-int.lo
-am__objects_2 = libsciexcel_la-sci_xls_read.lo \
-       libsciexcel_la-sci_xls_open.lo libsciexcel_la-intreadxls.lo
-am_libsciexcel_la_OBJECTS = $(am__objects_1) $(am__objects_2)
-libsciexcel_la_OBJECTS = $(am_libsciexcel_la_OBJECTS)
-libsciexcel_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsciexcel_la_CFLAGS) \
+am__objects_1 = libscispreadsheet_la-xls.lo \
+       libscispreadsheet_la-olestream-unwrap.lo libscispreadsheet_la-pldstr.lo \
+       libscispreadsheet_la-ole.lo libscispreadsheet_la-bytedecoders.lo \
+       libscispreadsheet_la-logger.lo libscispreadsheet_la-ripole.lo \
+       libscispreadsheet_la-bt-int.lo
+am__objects_2 = libscispreadsheet_la-sci_xls_read.lo \
+       libscispreadsheet_la-sci_xls_open.lo libscispreadsheet_la-intreadxls.lo
+am_libscispreadsheet_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+libscispreadsheet_la_OBJECTS = $(am_libscispreadsheet_la_OBJECTS)
+libscispreadsheet_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscispreadsheet_la_CFLAGS) \
        $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/modules/core/includes@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -111,16 +111,16 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-SOURCES = $(libsciexcel_la_SOURCES)
-DIST_SOURCES = $(libsciexcel_la_SOURCES)
-libsciexcel_la_demosDATA_INSTALL = $(INSTALL_DATA)
-libsciexcel_la_etcDATA_INSTALL = $(INSTALL_DATA)
-libsciexcel_la_rootDATA_INSTALL = $(INSTALL_DATA)
-libsciexcel_la_sci_gatewayDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(libsciexcel_la_demos_DATA) $(libsciexcel_la_etc_DATA) \
-       $(libsciexcel_la_root_DATA) $(libsciexcel_la_sci_gateway_DATA)
-libsciexcel_la_includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(libsciexcel_la_include_HEADERS)
+SOURCES = $(libscispreadsheet_la_SOURCES)
+DIST_SOURCES = $(libscispreadsheet_la_SOURCES)
+libscispreadsheet_la_demosDATA_INSTALL = $(INSTALL_DATA)
+libscispreadsheet_la_etcDATA_INSTALL = $(INSTALL_DATA)
+libscispreadsheet_la_rootDATA_INSTALL = $(INSTALL_DATA)
+libscispreadsheet_la_sci_gatewayDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(libscispreadsheet_la_demos_DATA) $(libscispreadsheet_la_etc_DATA) \
+       $(libscispreadsheet_la_root_DATA) $(libscispreadsheet_la_sci_gateway_DATA)
+libscispreadsheet_la_includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libscispreadsheet_la_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -286,7 +286,7 @@ target_alias = @target_alias@
 tcldir = @tcldir@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXCEL_C_SOURCES = src/c/xls.c \
+SPREADSHEET_C_SOURCES = src/c/xls.c \
 src/c/olestream-unwrap.c \
 src/c/pldstr.c \
 src/c/ole.c \
@@ -300,42 +300,42 @@ sci_gateway/c/sci_xls_open.c \
 sci_gateway/c/intreadxls.c 
 
 MODULE_CHECKS = 
-libsciexcel_la_CFLAGS = -Iincludes/ -Isrc/c/ -I$(top_srcdir)/libs/MALLOC/includes/
-pkglib_LTLIBRARIES = libsciexcel.la
-libsciexcel_la_SOURCES = $(EXCEL_C_SOURCES) $(GATEWAY_C_SOURCES)
-libsciexcel_la_LIBADD = \
+libscispreadsheet_la_CFLAGS = -Iincludes/ -Isrc/c/ -I$(top_srcdir)/libs/MALLOC/includes/
+pkglib_LTLIBRARIES = libscispreadsheet.la
+libscispreadsheet_la_SOURCES = $(SPREADSHEET_C_SOURCES) $(GATEWAY_C_SOURCES)
+libscispreadsheet_la_LIBADD = \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
     $(top_builddir)/libs/libst/libscilibst.la 
 
 
 #### Target ######
-modulename = excel
+modulename = spreadsheet
 
-#### excel : Conf files ####
-libsciexcel_la_rootdir = $(mydatadir)
-libsciexcel_la_root_DATA = changelog.txt licence.txt readme.txt version.xml
+#### spreadsheet : Conf files ####
+libscispreadsheet_la_rootdir = $(mydatadir)
+libscispreadsheet_la_root_DATA = changelog.txt licence.txt readme.txt version.xml
 
-#### excel : init scripts #### 
-libsciexcel_la_etcdir = $(mydatadir)/etc
-libsciexcel_la_etc_DATA = etc/excel.quit etc/excel.start
+#### spreadsheet : init scripts #### 
+libscispreadsheet_la_etcdir = $(mydatadir)/etc
+libscispreadsheet_la_etc_DATA = etc/spreadsheet.quit etc/spreadsheet.start
 
-#### excel : gateway declaration #### 
-libsciexcel_la_sci_gatewaydir = $(mydatadir)/sci_gateway
-libsciexcel_la_sci_gateway_DATA = sci_gateway/excel_gateway.xml
+#### spreadsheet : gateway declaration #### 
+libscispreadsheet_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+libscispreadsheet_la_sci_gateway_DATA = sci_gateway/spreadsheet_gateway.xml
 
-#### excel : include files ####
-libsciexcel_la_includedir = $(pkgincludedir)/excel
-libsciexcel_la_include_HEADERS = includes/gw_excel.h
+#### spreadsheet : include files ####
+libscispreadsheet_la_includedir = $(pkgincludedir)/spreadsheet
+libscispreadsheet_la_include_HEADERS = includes/gw_spreadsheet.h
 
-#### excel : demos files ####
-libsciexcel_la_demosdir = $(mydatadir)/demos/
-libsciexcel_la_demos_DATA = demos/excel/Testo1.xls \
-demos/excel/o1.xls \
-demos/excel/Test1.xls \
-demos/excel/Testobig.xls \
-demos/excel/Testbig.xls \
-demos/excel/t1.xls \
-demos/excel/README
+#### spreadsheet : demos files ####
+libscispreadsheet_la_demosdir = $(mydatadir)/demos/
+libscispreadsheet_la_demos_DATA = demos/spreadsheet/Testo1.xls \
+demos/spreadsheet/o1.xls \
+demos/spreadsheet/Test1.xls \
+demos/spreadsheet/Testobig.xls \
+demos/spreadsheet/Testbig.xls \
+demos/spreadsheet/t1.xls \
+demos/spreadsheet/README
 
 
 # Where all the Scilab stuff is installed (macros, help, ...)
@@ -397,9 +397,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  modules/excel/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  modules/spreadsheet/Makefile'; \
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --foreign  modules/excel/Makefile
+         $(AUTOMAKE) --foreign  modules/spreadsheet/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -444,8 +444,8 @@ clean-pkglibLTLIBRARIES:
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
-libsciexcel.la: $(libsciexcel_la_OBJECTS) $(libsciexcel_la_DEPENDENCIES) 
-       $(libsciexcel_la_LINK) -rpath $(pkglibdir) $(libsciexcel_la_OBJECTS) $(libsciexcel_la_LIBADD) $(LIBS)
+libscispreadsheet.la: $(libscispreadsheet_la_OBJECTS) $(libscispreadsheet_la_DEPENDENCIES) 
+       $(libscispreadsheet_la_LINK) -rpath $(pkglibdir) $(libscispreadsheet_la_OBJECTS) $(libscispreadsheet_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -453,17 +453,17 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciexcel_la-bt-int.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciexcel_la-bytedecoders.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciexcel_la-intreadxls.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciexcel_la-logger.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciexcel_la-ole.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciexcel_la-olestream-unwrap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciexcel_la-pldstr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciexcel_la-ripole.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciexcel_la-sci_xls_open.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciexcel_la-sci_xls_read.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciexcel_la-xls.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscispreadsheet_la-bt-int.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscispreadsheet_la-bytedecoders.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscispreadsheet_la-intreadxls.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscispreadsheet_la-logger.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscispreadsheet_la-ole.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscispreadsheet_la-olestream-unwrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscispreadsheet_la-pldstr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscispreadsheet_la-ripole.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscispreadsheet_la-sci_xls_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscispreadsheet_la-sci_xls_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscispreadsheet_la-xls.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -486,172 +486,172 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
-libsciexcel_la-xls.lo: src/c/xls.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -MT libsciexcel_la-xls.lo -MD -MP -MF $(DEPDIR)/libsciexcel_la-xls.Tpo -c -o libsciexcel_la-xls.lo `test -f 'src/c/xls.c' || echo '$(srcdir)/'`src/c/xls.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libsciexcel_la-xls.Tpo $(DEPDIR)/libsciexcel_la-xls.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/xls.c' object='libsciexcel_la-xls.lo' libtool=yes @AMDEPBACKSLASH@
+libscispreadsheet_la-xls.lo: src/c/xls.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-xls.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-xls.Tpo -c -o libscispreadsheet_la-xls.lo `test -f 'src/c/xls.c' || echo '$(srcdir)/'`src/c/xls.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscispreadsheet_la-xls.Tpo $(DEPDIR)/libscispreadsheet_la-xls.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/xls.c' object='libscispreadsheet_la-xls.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -c -o libsciexcel_la-xls.lo `test -f 'src/c/xls.c' || echo '$(srcdir)/'`src/c/xls.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-xls.lo `test -f 'src/c/xls.c' || echo '$(srcdir)/'`src/c/xls.c
 
-libsciexcel_la-olestream-unwrap.lo: src/c/olestream-unwrap.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -MT libsciexcel_la-olestream-unwrap.lo -MD -MP -MF $(DEPDIR)/libsciexcel_la-olestream-unwrap.Tpo -c -o libsciexcel_la-olestream-unwrap.lo `test -f 'src/c/olestream-unwrap.c' || echo '$(srcdir)/'`src/c/olestream-unwrap.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libsciexcel_la-olestream-unwrap.Tpo $(DEPDIR)/libsciexcel_la-olestream-unwrap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/olestream-unwrap.c' object='libsciexcel_la-olestream-unwrap.lo' libtool=yes @AMDEPBACKSLASH@
+libscispreadsheet_la-olestream-unwrap.lo: src/c/olestream-unwrap.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-olestream-unwrap.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-olestream-unwrap.Tpo -c -o libscispreadsheet_la-olestream-unwrap.lo `test -f 'src/c/olestream-unwrap.c' || echo '$(srcdir)/'`src/c/olestream-unwrap.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscispreadsheet_la-olestream-unwrap.Tpo $(DEPDIR)/libscispreadsheet_la-olestream-unwrap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/olestream-unwrap.c' object='libscispreadsheet_la-olestream-unwrap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -c -o libsciexcel_la-olestream-unwrap.lo `test -f 'src/c/olestream-unwrap.c' || echo '$(srcdir)/'`src/c/olestream-unwrap.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-olestream-unwrap.lo `test -f 'src/c/olestream-unwrap.c' || echo '$(srcdir)/'`src/c/olestream-unwrap.c
 
-libsciexcel_la-pldstr.lo: src/c/pldstr.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -MT libsciexcel_la-pldstr.lo -MD -MP -MF $(DEPDIR)/libsciexcel_la-pldstr.Tpo -c -o libsciexcel_la-pldstr.lo `test -f 'src/c/pldstr.c' || echo '$(srcdir)/'`src/c/pldstr.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libsciexcel_la-pldstr.Tpo $(DEPDIR)/libsciexcel_la-pldstr.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/pldstr.c' object='libsciexcel_la-pldstr.lo' libtool=yes @AMDEPBACKSLASH@
+libscispreadsheet_la-pldstr.lo: src/c/pldstr.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-pldstr.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-pldstr.Tpo -c -o libscispreadsheet_la-pldstr.lo `test -f 'src/c/pldstr.c' || echo '$(srcdir)/'`src/c/pldstr.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscispreadsheet_la-pldstr.Tpo $(DEPDIR)/libscispreadsheet_la-pldstr.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/pldstr.c' object='libscispreadsheet_la-pldstr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -c -o libsciexcel_la-pldstr.lo `test -f 'src/c/pldstr.c' || echo '$(srcdir)/'`src/c/pldstr.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-pldstr.lo `test -f 'src/c/pldstr.c' || echo '$(srcdir)/'`src/c/pldstr.c
 
-libsciexcel_la-ole.lo: src/c/ole.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -MT libsciexcel_la-ole.lo -MD -MP -MF $(DEPDIR)/libsciexcel_la-ole.Tpo -c -o libsciexcel_la-ole.lo `test -f 'src/c/ole.c' || echo '$(srcdir)/'`src/c/ole.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libsciexcel_la-ole.Tpo $(DEPDIR)/libsciexcel_la-ole.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/ole.c' object='libsciexcel_la-ole.lo' libtool=yes @AMDEPBACKSLASH@
+libscispreadsheet_la-ole.lo: src/c/ole.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-ole.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-ole.Tpo -c -o libscispreadsheet_la-ole.lo `test -f 'src/c/ole.c' || echo '$(srcdir)/'`src/c/ole.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscispreadsheet_la-ole.Tpo $(DEPDIR)/libscispreadsheet_la-ole.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/ole.c' object='libscispreadsheet_la-ole.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -c -o libsciexcel_la-ole.lo `test -f 'src/c/ole.c' || echo '$(srcdir)/'`src/c/ole.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-ole.lo `test -f 'src/c/ole.c' || echo '$(srcdir)/'`src/c/ole.c
 
-libsciexcel_la-bytedecoders.lo: src/c/bytedecoders.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -MT libsciexcel_la-bytedecoders.lo -MD -MP -MF $(DEPDIR)/libsciexcel_la-bytedecoders.Tpo -c -o libsciexcel_la-bytedecoders.lo `test -f 'src/c/bytedecoders.c' || echo '$(srcdir)/'`src/c/bytedecoders.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libsciexcel_la-bytedecoders.Tpo $(DEPDIR)/libsciexcel_la-bytedecoders.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/bytedecoders.c' object='libsciexcel_la-bytedecoders.lo' libtool=yes @AMDEPBACKSLASH@
+libscispreadsheet_la-bytedecoders.lo: src/c/bytedecoders.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-bytedecoders.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-bytedecoders.Tpo -c -o libscispreadsheet_la-bytedecoders.lo `test -f 'src/c/bytedecoders.c' || echo '$(srcdir)/'`src/c/bytedecoders.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscispreadsheet_la-bytedecoders.Tpo $(DEPDIR)/libscispreadsheet_la-bytedecoders.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/bytedecoders.c' object='libscispreadsheet_la-bytedecoders.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -c -o libsciexcel_la-bytedecoders.lo `test -f 'src/c/bytedecoders.c' || echo '$(srcdir)/'`src/c/bytedecoders.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-bytedecoders.lo `test -f 'src/c/bytedecoders.c' || echo '$(srcdir)/'`src/c/bytedecoders.c
 
-libsciexcel_la-logger.lo: src/c/logger.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -MT libsciexcel_la-logger.lo -MD -MP -MF $(DEPDIR)/libsciexcel_la-logger.Tpo -c -o libsciexcel_la-logger.lo `test -f 'src/c/logger.c' || echo '$(srcdir)/'`src/c/logger.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libsciexcel_la-logger.Tpo $(DEPDIR)/libsciexcel_la-logger.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/logger.c' object='libsciexcel_la-logger.lo' libtool=yes @AMDEPBACKSLASH@
+libscispreadsheet_la-logger.lo: src/c/logger.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-logger.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-logger.Tpo -c -o libscispreadsheet_la-logger.lo `test -f 'src/c/logger.c' || echo '$(srcdir)/'`src/c/logger.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscispreadsheet_la-logger.Tpo $(DEPDIR)/libscispreadsheet_la-logger.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/logger.c' object='libscispreadsheet_la-logger.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -c -o libsciexcel_la-logger.lo `test -f 'src/c/logger.c' || echo '$(srcdir)/'`src/c/logger.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-logger.lo `test -f 'src/c/logger.c' || echo '$(srcdir)/'`src/c/logger.c
 
-libsciexcel_la-ripole.lo: src/c/ripole.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -MT libsciexcel_la-ripole.lo -MD -MP -MF $(DEPDIR)/libsciexcel_la-ripole.Tpo -c -o libsciexcel_la-ripole.lo `test -f 'src/c/ripole.c' || echo '$(srcdir)/'`src/c/ripole.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libsciexcel_la-ripole.Tpo $(DEPDIR)/libsciexcel_la-ripole.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/ripole.c' object='libsciexcel_la-ripole.lo' libtool=yes @AMDEPBACKSLASH@
+libscispreadsheet_la-ripole.lo: src/c/ripole.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-ripole.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-ripole.Tpo -c -o libscispreadsheet_la-ripole.lo `test -f 'src/c/ripole.c' || echo '$(srcdir)/'`src/c/ripole.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscispreadsheet_la-ripole.Tpo $(DEPDIR)/libscispreadsheet_la-ripole.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/ripole.c' object='libscispreadsheet_la-ripole.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -c -o libsciexcel_la-ripole.lo `test -f 'src/c/ripole.c' || echo '$(srcdir)/'`src/c/ripole.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-ripole.lo `test -f 'src/c/ripole.c' || echo '$(srcdir)/'`src/c/ripole.c
 
-libsciexcel_la-bt-int.lo: src/c/bt-int.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -MT libsciexcel_la-bt-int.lo -MD -MP -MF $(DEPDIR)/libsciexcel_la-bt-int.Tpo -c -o libsciexcel_la-bt-int.lo `test -f 'src/c/bt-int.c' || echo '$(srcdir)/'`src/c/bt-int.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libsciexcel_la-bt-int.Tpo $(DEPDIR)/libsciexcel_la-bt-int.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/bt-int.c' object='libsciexcel_la-bt-int.lo' libtool=yes @AMDEPBACKSLASH@
+libscispreadsheet_la-bt-int.lo: src/c/bt-int.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-bt-int.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-bt-int.Tpo -c -o libscispreadsheet_la-bt-int.lo `test -f 'src/c/bt-int.c' || echo '$(srcdir)/'`src/c/bt-int.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscispreadsheet_la-bt-int.Tpo $(DEPDIR)/libscispreadsheet_la-bt-int.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/bt-int.c' object='libscispreadsheet_la-bt-int.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -c -o libsciexcel_la-bt-int.lo `test -f 'src/c/bt-int.c' || echo '$(srcdir)/'`src/c/bt-int.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-bt-int.lo `test -f 'src/c/bt-int.c' || echo '$(srcdir)/'`src/c/bt-int.c
 
-libsciexcel_la-sci_xls_read.lo: sci_gateway/c/sci_xls_read.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -MT libsciexcel_la-sci_xls_read.lo -MD -MP -MF $(DEPDIR)/libsciexcel_la-sci_xls_read.Tpo -c -o libsciexcel_la-sci_xls_read.lo `test -f 'sci_gateway/c/sci_xls_read.c' || echo '$(srcdir)/'`sci_gateway/c/sci_xls_read.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libsciexcel_la-sci_xls_read.Tpo $(DEPDIR)/libsciexcel_la-sci_xls_read.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_xls_read.c' object='libsciexcel_la-sci_xls_read.lo' libtool=yes @AMDEPBACKSLASH@
+libscispreadsheet_la-sci_xls_read.lo: sci_gateway/c/sci_xls_read.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-sci_xls_read.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_xls_read.Tpo -c -o libscispreadsheet_la-sci_xls_read.lo `test -f 'sci_gateway/c/sci_xls_read.c' || echo '$(srcdir)/'`sci_gateway/c/sci_xls_read.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscispreadsheet_la-sci_xls_read.Tpo $(DEPDIR)/libscispreadsheet_la-sci_xls_read.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_xls_read.c' object='libscispreadsheet_la-sci_xls_read.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -c -o libsciexcel_la-sci_xls_read.lo `test -f 'sci_gateway/c/sci_xls_read.c' || echo '$(srcdir)/'`sci_gateway/c/sci_xls_read.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-sci_xls_read.lo `test -f 'sci_gateway/c/sci_xls_read.c' || echo '$(srcdir)/'`sci_gateway/c/sci_xls_read.c
 
-libsciexcel_la-sci_xls_open.lo: sci_gateway/c/sci_xls_open.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -MT libsciexcel_la-sci_xls_open.lo -MD -MP -MF $(DEPDIR)/libsciexcel_la-sci_xls_open.Tpo -c -o libsciexcel_la-sci_xls_open.lo `test -f 'sci_gateway/c/sci_xls_open.c' || echo '$(srcdir)/'`sci_gateway/c/sci_xls_open.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libsciexcel_la-sci_xls_open.Tpo $(DEPDIR)/libsciexcel_la-sci_xls_open.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_xls_open.c' object='libsciexcel_la-sci_xls_open.lo' libtool=yes @AMDEPBACKSLASH@
+libscispreadsheet_la-sci_xls_open.lo: sci_gateway/c/sci_xls_open.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-sci_xls_open.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-sci_xls_open.Tpo -c -o libscispreadsheet_la-sci_xls_open.lo `test -f 'sci_gateway/c/sci_xls_open.c' || echo '$(srcdir)/'`sci_gateway/c/sci_xls_open.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscispreadsheet_la-sci_xls_open.Tpo $(DEPDIR)/libscispreadsheet_la-sci_xls_open.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_xls_open.c' object='libscispreadsheet_la-sci_xls_open.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -c -o libsciexcel_la-sci_xls_open.lo `test -f 'sci_gateway/c/sci_xls_open.c' || echo '$(srcdir)/'`sci_gateway/c/sci_xls_open.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-sci_xls_open.lo `test -f 'sci_gateway/c/sci_xls_open.c' || echo '$(srcdir)/'`sci_gateway/c/sci_xls_open.c
 
-libsciexcel_la-intreadxls.lo: sci_gateway/c/intreadxls.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -MT libsciexcel_la-intreadxls.lo -MD -MP -MF $(DEPDIR)/libsciexcel_la-intreadxls.Tpo -c -o libsciexcel_la-intreadxls.lo `test -f 'sci_gateway/c/intreadxls.c' || echo '$(srcdir)/'`sci_gateway/c/intreadxls.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libsciexcel_la-intreadxls.Tpo $(DEPDIR)/libsciexcel_la-intreadxls.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/intreadxls.c' object='libsciexcel_la-intreadxls.lo' libtool=yes @AMDEPBACKSLASH@
+libscispreadsheet_la-intreadxls.lo: sci_gateway/c/intreadxls.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -MT libscispreadsheet_la-intreadxls.lo -MD -MP -MF $(DEPDIR)/libscispreadsheet_la-intreadxls.Tpo -c -o libscispreadsheet_la-intreadxls.lo `test -f 'sci_gateway/c/intreadxls.c' || echo '$(srcdir)/'`sci_gateway/c/intreadxls.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscispreadsheet_la-intreadxls.Tpo $(DEPDIR)/libscispreadsheet_la-intreadxls.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/intreadxls.c' object='libscispreadsheet_la-intreadxls.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciexcel_la_CFLAGS) $(CFLAGS) -c -o libsciexcel_la-intreadxls.lo `test -f 'sci_gateway/c/intreadxls.c' || echo '$(srcdir)/'`sci_gateway/c/intreadxls.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscispreadsheet_la_CFLAGS) $(CFLAGS) -c -o libscispreadsheet_la-intreadxls.lo `test -f 'sci_gateway/c/intreadxls.c' || echo '$(srcdir)/'`sci_gateway/c/intreadxls.c
 
 mostlyclean-libtool:
        -rm -f *.lo
 
 clean-libtool:
        -rm -rf .libs _libs
-install-libsciexcel_la_demosDATA: $(libsciexcel_la_demos_DATA)
+install-libscispreadsheet_la_demosDATA: $(libscispreadsheet_la_demos_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(libsciexcel_la_demosdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciexcel_la_demosdir)"
-       @list='$(libsciexcel_la_demos_DATA)'; for p in $$list; do \
+       test -z "$(libscispreadsheet_la_demosdir)" || $(MKDIR_P) "$(DESTDIR)$(libscispreadsheet_la_demosdir)"
+       @list='$(libscispreadsheet_la_demos_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f=$(am__strip_dir) \
-         echo " $(libsciexcel_la_demosDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciexcel_la_demosdir)/$$f'"; \
-         $(libsciexcel_la_demosDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciexcel_la_demosdir)/$$f"; \
+         echo " $(libscispreadsheet_la_demosDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libscispreadsheet_la_demosdir)/$$f'"; \
+         $(libscispreadsheet_la_demosDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libscispreadsheet_la_demosdir)/$$f"; \
        done
 
-uninstall-libsciexcel_la_demosDATA:
+uninstall-libscispreadsheet_la_demosDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(libsciexcel_la_demos_DATA)'; for p in $$list; do \
+       @list='$(libscispreadsheet_la_demos_DATA)'; for p in $$list; do \
          f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(libsciexcel_la_demosdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(libsciexcel_la_demosdir)/$$f"; \
+         echo " rm -f '$(DESTDIR)$(libscispreadsheet_la_demosdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(libscispreadsheet_la_demosdir)/$$f"; \
        done
-install-libsciexcel_la_etcDATA: $(libsciexcel_la_etc_DATA)
+install-libscispreadsheet_la_etcDATA: $(libscispreadsheet_la_etc_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(libsciexcel_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciexcel_la_etcdir)"
-       @list='$(libsciexcel_la_etc_DATA)'; for p in $$list; do \
+       test -z "$(libscispreadsheet_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libscispreadsheet_la_etcdir)"
+       @list='$(libscispreadsheet_la_etc_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f=$(am__strip_dir) \
-         echo " $(libsciexcel_la_etcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciexcel_la_etcdir)/$$f'"; \
-         $(libsciexcel_la_etcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciexcel_la_etcdir)/$$f"; \
+         echo " $(libscispreadsheet_la_etcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libscispreadsheet_la_etcdir)/$$f'"; \
+         $(libscispreadsheet_la_etcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libscispreadsheet_la_etcdir)/$$f"; \
        done
 
-uninstall-libsciexcel_la_etcDATA:
+uninstall-libscispreadsheet_la_etcDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(libsciexcel_la_etc_DATA)'; for p in $$list; do \
+       @list='$(libscispreadsheet_la_etc_DATA)'; for p in $$list; do \
          f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(libsciexcel_la_etcdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(libsciexcel_la_etcdir)/$$f"; \
+         echo " rm -f '$(DESTDIR)$(libscispreadsheet_la_etcdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(libscispreadsheet_la_etcdir)/$$f"; \
        done
-install-libsciexcel_la_rootDATA: $(libsciexcel_la_root_DATA)
+install-libscispreadsheet_la_rootDATA: $(libscispreadsheet_la_root_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(libsciexcel_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciexcel_la_rootdir)"
-       @list='$(libsciexcel_la_root_DATA)'; for p in $$list; do \
+       test -z "$(libscispreadsheet_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libscispreadsheet_la_rootdir)"
+       @list='$(libscispreadsheet_la_root_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f=$(am__strip_dir) \
-         echo " $(libsciexcel_la_rootDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciexcel_la_rootdir)/$$f'"; \
-         $(libsciexcel_la_rootDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciexcel_la_rootdir)/$$f"; \
+         echo " $(libscispreadsheet_la_rootDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libscispreadsheet_la_rootdir)/$$f'"; \
+         $(libscispreadsheet_la_rootDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libscispreadsheet_la_rootdir)/$$f"; \
        done
 
-uninstall-libsciexcel_la_rootDATA:
+uninstall-libscispreadsheet_la_rootDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(libsciexcel_la_root_DATA)'; for p in $$list; do \
+       @list='$(libscispreadsheet_la_root_DATA)'; for p in $$list; do \
          f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(libsciexcel_la_rootdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(libsciexcel_la_rootdir)/$$f"; \
+         echo " rm -f '$(DESTDIR)$(libscispreadsheet_la_rootdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(libscispreadsheet_la_rootdir)/$$f"; \
        done
-install-libsciexcel_la_sci_gatewayDATA: $(libsciexcel_la_sci_gateway_DATA)
+install-libscispreadsheet_la_sci_gatewayDATA: $(libscispreadsheet_la_sci_gateway_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(libsciexcel_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libsciexcel_la_sci_gatewaydir)"
-       @list='$(libsciexcel_la_sci_gateway_DATA)'; for p in $$list; do \
+       test -z "$(libscispreadsheet_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libscispreadsheet_la_sci_gatewaydir)"
+       @list='$(libscispreadsheet_la_sci_gateway_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f=$(am__strip_dir) \
-         echo " $(libsciexcel_la_sci_gatewayDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciexcel_la_sci_gatewaydir)/$$f'"; \
-         $(libsciexcel_la_sci_gatewayDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciexcel_la_sci_gatewaydir)/$$f"; \
+         echo " $(libscispreadsheet_la_sci_gatewayDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libscispreadsheet_la_sci_gatewaydir)/$$f'"; \
+         $(libscispreadsheet_la_sci_gatewayDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libscispreadsheet_la_sci_gatewaydir)/$$f"; \
        done
 
-uninstall-libsciexcel_la_sci_gatewayDATA:
+uninstall-libscispreadsheet_la_sci_gatewayDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(libsciexcel_la_sci_gateway_DATA)'; for p in $$list; do \
+       @list='$(libscispreadsheet_la_sci_gateway_DATA)'; for p in $$list; do \
          f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(libsciexcel_la_sci_gatewaydir)/$$f'"; \
-         rm -f "$(DESTDIR)$(libsciexcel_la_sci_gatewaydir)/$$f"; \
+         echo " rm -f '$(DESTDIR)$(libscispreadsheet_la_sci_gatewaydir)/$$f'"; \
+         rm -f "$(DESTDIR)$(libscispreadsheet_la_sci_gatewaydir)/$$f"; \
        done
-install-libsciexcel_la_includeHEADERS: $(libsciexcel_la_include_HEADERS)
+install-libscispreadsheet_la_includeHEADERS: $(libscispreadsheet_la_include_HEADERS)
        @$(NORMAL_INSTALL)
-       test -z "$(libsciexcel_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libsciexcel_la_includedir)"
-       @list='$(libsciexcel_la_include_HEADERS)'; for p in $$list; do \
+       test -z "$(libscispreadsheet_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libscispreadsheet_la_includedir)"
+       @list='$(libscispreadsheet_la_include_HEADERS)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f=$(am__strip_dir) \
-         echo " $(libsciexcel_la_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciexcel_la_includedir)/$$f'"; \
-         $(libsciexcel_la_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciexcel_la_includedir)/$$f"; \
+         echo " $(libscispreadsheet_la_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libscispreadsheet_la_includedir)/$$f'"; \
+         $(libscispreadsheet_la_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libscispreadsheet_la_includedir)/$$f"; \
        done
 
-uninstall-libsciexcel_la_includeHEADERS:
+uninstall-libscispreadsheet_la_includeHEADERS:
        @$(NORMAL_UNINSTALL)
-       @list='$(libsciexcel_la_include_HEADERS)'; for p in $$list; do \
+       @list='$(libscispreadsheet_la_include_HEADERS)'; for p in $$list; do \
          f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(libsciexcel_la_includedir)/$$f'"; \
-         rm -f "$(DESTDIR)$(libsciexcel_la_includedir)/$$f"; \
+         echo " rm -f '$(DESTDIR)$(libscispreadsheet_la_includedir)/$$f'"; \
+         rm -f "$(DESTDIR)$(libscispreadsheet_la_includedir)/$$f"; \
        done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -733,7 +733,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciexcel_la_demosdir)" "$(DESTDIR)$(libsciexcel_la_etcdir)" "$(DESTDIR)$(libsciexcel_la_rootdir)" "$(DESTDIR)$(libsciexcel_la_sci_gatewaydir)" "$(DESTDIR)$(libsciexcel_la_includedir)"; do \
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscispreadsheet_la_demosdir)" "$(DESTDIR)$(libscispreadsheet_la_etcdir)" "$(DESTDIR)$(libscispreadsheet_la_rootdir)" "$(DESTDIR)$(libscispreadsheet_la_sci_gatewaydir)" "$(DESTDIR)$(libscispreadsheet_la_includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -781,11 +781,11 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-libsciexcel_la_demosDATA \
-       install-libsciexcel_la_etcDATA \
-       install-libsciexcel_la_includeHEADERS \
-       install-libsciexcel_la_rootDATA \
-       install-libsciexcel_la_sci_gatewayDATA
+install-data-am: install-data-local install-libscispreadsheet_la_demosDATA \
+       install-libscispreadsheet_la_etcDATA \
+       install-libscispreadsheet_la_includeHEADERS \
+       install-libscispreadsheet_la_rootDATA \
+       install-libscispreadsheet_la_sci_gatewayDATA
 
 install-dvi: install-dvi-am
 
@@ -823,11 +823,11 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-libsciexcel_la_demosDATA \
-       uninstall-libsciexcel_la_etcDATA \
-       uninstall-libsciexcel_la_includeHEADERS \
-       uninstall-libsciexcel_la_rootDATA \
-       uninstall-libsciexcel_la_sci_gatewayDATA \
+uninstall-am: uninstall-libscispreadsheet_la_demosDATA \
+       uninstall-libscispreadsheet_la_etcDATA \
+       uninstall-libscispreadsheet_la_includeHEADERS \
+       uninstall-libscispreadsheet_la_rootDATA \
+       uninstall-libscispreadsheet_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
@@ -840,21 +840,21 @@ uninstall-am: uninstall-libsciexcel_la_demosDATA \
        install-data install-data-am install-data-local install-dvi \
        install-dvi-am install-exec install-exec-am install-html \
        install-html-am install-html-local install-info \
-       install-info-am install-libsciexcel_la_demosDATA \
-       install-libsciexcel_la_etcDATA \
-       install-libsciexcel_la_includeHEADERS \
-       install-libsciexcel_la_rootDATA \
-       install-libsciexcel_la_sci_gatewayDATA install-man install-pdf \
+       install-info-am install-libscispreadsheet_la_demosDATA \
+       install-libscispreadsheet_la_etcDATA \
+       install-libscispreadsheet_la_includeHEADERS \
+       install-libscispreadsheet_la_rootDATA \
+       install-libscispreadsheet_la_sci_gatewayDATA install-man install-pdf \
        install-pdf-am install-pkglibLTLIBRARIES install-ps \
        install-ps-am install-strip installcheck installcheck-am \
        installdirs maintainer-clean maintainer-clean-generic \
        mostlyclean mostlyclean-compile mostlyclean-generic \
        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-       uninstall-am uninstall-libsciexcel_la_demosDATA \
-       uninstall-libsciexcel_la_etcDATA \
-       uninstall-libsciexcel_la_includeHEADERS \
-       uninstall-libsciexcel_la_rootDATA \
-       uninstall-libsciexcel_la_sci_gatewayDATA \
+       uninstall-am uninstall-libscispreadsheet_la_demosDATA \
+       uninstall-libscispreadsheet_la_etcDATA \
+       uninstall-libscispreadsheet_la_includeHEADERS \
+       uninstall-libscispreadsheet_la_rootDATA \
+       uninstall-libscispreadsheet_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
 
 #.java .class .jar
index 125313e..36bc211 100644 (file)
@@ -1 +1 @@
-changelog excel module
\ No newline at end of file
+changelog spreadsheet module
\ No newline at end of file
similarity index 77%
rename from scilab/modules/spreadsheet/etc/excel.quit
rename to scilab/modules/spreadsheet/etc/spreadsheet.quit
index 905156b..6ee8b85 100644 (file)
@@ -1,8 +1,8 @@
 // ====================================================================\r
 // This file contains command to be executed at the end \r
-// of a scilab session for excel module\r
+// of a scilab session for spreadsheet module\r
 // Copyright INRIA 2007\r
 // ====================================================================\r
 // delete help chapter\r
-del_module_help_chapter('excel');\r
+del_module_help_chapter('spreadsheet');\r
 // ====================================================================\r
@@ -1,17 +1,17 @@
 // ====================================================================\r
-// excel module initialisation file \r
+// spreadsheet module initialisation file \r
 // Copyright INRIA 2007\r
 // ====================================================================\r
 //Load  functions librarie\r
-load('SCI/modules/excel/macros/lib');\r
+load('SCI/modules/spreadsheet/macros/lib');\r
 // ====================================================================\r
 //add help chapter\r
-add_module_help_chapter('excel');\r
+add_module_help_chapter('spreadsheet');\r
 // ====================================================================\r
 //add demos\r
-//path = get_absolute_file_path('excel.start');\r
+//path = get_absolute_file_path('spreadsheet.start');\r
 //path = getshortpathname(path);\r
-//pathdemos = pathconvert(part(path,1:(length(path)-5))+'/demos/excel.dem',%f,%f);\r
+//pathdemos = pathconvert(part(path,1:(length(path)-5))+'/demos/spreadsheet.dem',%f,%f);\r
 //add_demo('Excel',pathdemos);\r
 //clear path pathdemos;\r
 // ====================================================================\r
diff --git a/scilab/modules/spreadsheet/excel.iss b/scilab/modules/spreadsheet/excel.iss
deleted file mode 100644 (file)
index 84386ed..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-;##############################################################################################################\r
-; Script d'installation Inno Setup (5.1.7) pour scilab\r
-; Allan CORNET\r
-; Version TRUNK\r
-; Copyright INRIA 2007\r
-;##############################################################################################################\r
-;--------------------------------------------------------------------------------------------------------------\r
-; excel module\r
-;--------------------------------------------------------------------------------------------------------------\r
-;\r
-#define EXCEL "excel"\r
-;\r
-Source: bin\excel.dll; DestDir: {app}\bin; Components: {#COMPN_EXCEL}\r
-;\r
-Source: bin\noexcel.dll; DestDir: {app}\bin; DestName: excel.dll; Components: not ({#COMPN_EXCEL})\r
-;\r
-Source: modules\{#EXCEL}\changelog.txt; DestDir: {app}\modules\{#EXCEL}; Components: {#COMPN_EXCEL}; Check: set_with_excel\r
-Source: modules\{#EXCEL}\licence.txt; DestDir: {app}\modules\{#EXCEL}; Components: {#COMPN_EXCEL}\r
-Source: modules\{#EXCEL}\readme.txt; DestDir: {app}\modules\{#EXCEL}; Components: {#COMPN_EXCEL}\r
-Source: modules\{#EXCEL}\VERSION.xml; DestDir: {app}\modules\{#EXCEL}; Components: {#COMPN_EXCEL}\r
-;\r
-Source: modules\{#EXCEL}\sci_gateway\excel_gateway.xml; DestDir: {app}\modules\{#EXCEL}\sci_gateway; Components: {#COMPN_EXCEL}\r
-;\r
-Source: modules\{#EXCEL}\includes\*.h; DestDir: {app}\modules\{#EXCEL}\includes; Components: {#COMPN_EXCEL}\r
-;\r
-Source: modules\{#EXCEL}\etc\{#EXCEL}.quit; DestDir: {app}\modules\{#EXCEL}\etc; Components: {#COMPN_EXCEL}\r
-Source: modules\{#EXCEL}\etc\{#EXCEL}.start; DestDir: {app}\modules\{#EXCEL}\etc; Components: {#COMPN_EXCEL}\r
-;\r
-Source: modules\{#EXCEL}\help\addchapter.sce; DestDir: {app}\modules\{#EXCEL}\help; Flags: recursesubdirs; Components:  {#COMPN_EXCEL}\r
-Source: modules\{#EXCEL}\help\removechapter.sce; DestDir: {app}\modules\{#EXCEL}\help; Flags: recursesubdirs; Components: {#COMPN_EXCEL}\r
-;\r
-Source: modules\{#EXCEL}\help\*.htm; DestDir: {app}\modules\{#EXCEL}\help; Flags: recursesubdirs; Components: {#COMPN_EXCEL}\r
-;\r
-;\r
-Source: modules\{#EXCEL}\macros\buildmacros.sce; DestDir: {app}\modules\{#EXCEL}\macros; Components: {#COMPN_EXCEL}\r
-Source: modules\{#EXCEL}\macros\buildmacros.bat; DestDir: {app}\modules\{#EXCEL}\macros; Components: {#COMPN_EXCEL}\r
-Source: modules\{#EXCEL}\macros\cleanmacros.bat; DestDir: {app}\modules\{#EXCEL}\macros; Components: {#COMPN_EXCEL}\r
-Source: modules\{#EXCEL}\macros\*.bin; DestDir: {app}\modules\{#EXCEL}\macros; Components: {#COMPN_EXCEL}\r
-Source: modules\{#EXCEL}\macros\*.sci; DestDir: {app}\modules\{#EXCEL}\macros; Components: {#COMPN_EXCEL}\r
-Source: modules\{#EXCEL}\macros\lib; DestDir: {app}\modules\{#EXCEL}\macros; Components: {#COMPN_EXCEL}\r
-Source: modules\{#EXCEL}\macros\names; DestDir: {app}\modules\{#EXCEL}\macros; Components: {#COMPN_EXCEL}\r
-;\r
-Source: modules\{#EXCEL}\demos\*.*; DestDir: {app}\modules\{#EXCEL}\demos; Flags: recursesubdirs; Components: {#COMPN_EXCEL}\r
-;\r
-Source: modules\{#EXCEL}\unit_tests\*.ref; DestDir: {app}\modules\{#EXCEL}\unit_tests; Flags: recursesubdirs; Components: {#COMPN_EXCEL} and {#COMPN_DEVTOOLS}\r
-Source: modules\{#EXCEL}\unit_tests\*.tst; DestDir: {app}\modules\{#EXCEL}\unit_tests; Flags: recursesubdirs; Components: {#COMPN_EXCEL} and {#COMPN_DEVTOOLS}\r
-\r
-;\r
-;--------------------------------------------------------------------------------------------------------------\r
diff --git a/scilab/modules/spreadsheet/excel_header.def b/scilab/modules/spreadsheet/excel_header.def
deleted file mode 100644 (file)
index 7539446..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY    excel.dll\r
-\r
-\r
-EXPORTS\r
index 5e46099..77a5346 100644 (file)
@@ -1,5 +1,5 @@
 // ====================================================================\r
-// help excel module\r
+// help spreadsheet module\r
 // Add chapter\r
 // Copyright INRIA 2007\r
 // Allan CORNET\r
index c5386ac..590c498 100644 (file)
@@ -2,12 +2,12 @@
 <!DOCTYPE MAN SYSTEM "../../../../modules/helptools/help.dtd">
 <MAN>
   <LANGUAGE>eng</LANGUAGE>
-  <TITLE>excel2sci</TITLE>
+  <TITLE>spreadsheet2sci</TITLE>
   <TYPE>Scilab Function</TYPE>
   <DATE>$LastChangedDate$</DATE>
-  <SHORT_DESCRIPTION name="excel2sci"> reads ascii Excel files</SHORT_DESCRIPTION>
+  <SHORT_DESCRIPTION name="spreadsheet2sci"> reads ascii Excel files</SHORT_DESCRIPTION>
   <CALLING_SEQUENCE>
-    <CALLING_SEQUENCE_ITEM>M=excel2sci(fname [,sep])  </CALLING_SEQUENCE_ITEM>
+    <CALLING_SEQUENCE_ITEM>M=spreadsheet2sci(fname [,sep])  </CALLING_SEQUENCE_ITEM>
   </CALLING_SEQUENCE>
   <PARAM>
     <PARAM_INDENT>
index 5b2be9b..5ce1857 100644 (file)
 
   <EXAMPLE><![CDATA[
    //Decode ole file, extract and open Excel stream
-    [fd,SST,Sheetnames,Sheetpos] = xls_open('SCI/demos/excel/Test1.xls')
+    [fd,SST,Sheetnames,Sheetpos] = xls_open('SCI/demos/spreadsheet/Test1.xls')
     //Read first data sheet
     [Value,TextInd] = xls_read(fd,Sheetpos(1))
-    //close the excel stream
+    //close the spreadsheet stream
     mclose(fd)
   ]]></EXAMPLE>
 
   <BIBLIO>
     <SP>This function is based on the Microsoft ole2 file documentation
       (http://chicago.sourceforge.net/devel/docs/ole/) and on Excel
-      stream description from OpenOffice (http://sc.openoffice.org/excelfileformat.pdf).</SP>
+      stream description from OpenOffice (http://sc.openoffice.org/spreadsheetfileformat.pdf).</SP>
   </BIBLIO>
 
   <USED_FUNCTIONS>
      <SP>The ripole-0.1.4 procedure (http://www.pldaniels.com/ripole)  is used
-      to extract the excel stream out of the ole file. </SP>
+      to extract the spreadsheet stream out of the ole file. </SP>
   </USED_FUNCTIONS>
 </MAN>
index ec7b10c..3c8a46c 100644 (file)
 
   <EXAMPLE><![CDATA[
    //Decode ole file, extract and open Excel stream
-    [fd,SST,Sheetnames,Sheetpos] = xls_open('SCI/demos/excel/Test1.xls')
+    [fd,SST,Sheetnames,Sheetpos] = xls_open('SCI/demos/spreadsheet/Test1.xls')
     //Read first data sheet
     [Value,TextInd] = xls_read(fd,Sheetpos(1))
-    //close the excel stream
+    //close the spreadsheet stream
     mclose(fd)
   ]]></EXAMPLE>
 
@@ -95,7 +95,7 @@
 
   <BIBLIO>
     <SP>This function is based on Excel
-      stream description from OpenOffice (http://sc.openoffice.org/excelfileformat.pdf).</SP>
+      stream description from OpenOffice (http://sc.openoffice.org/spreadsheetfileformat.pdf).</SP>
   </BIBLIO>
 
 
@@ -2,15 +2,15 @@
 /* INRIA 2007 */\r
 /* Allan CORNET */\r
 /*-----------------------------------------------------------------------------------*/ \r
-#ifndef __GW_EXCEL__\r
-#define __GW_EXCEL__\r
+#ifndef __GW_SPREADSHEET__\r
+#define __GW_SPREADSHEET__\r
 /*-----------------------------------------------------------------------------------*/ \r
 #include "machine.h"\r
 /*-----------------------------------------------------------------------------------*/ \r
-int C2F(gw_excel)(void);\r
+int C2F(gw_spreadsheet)(void);\r
 /*-----------------------------------------------------------------------------------*/ \r
 int C2F(sci_xls_read) _PARAMS((char *fname,unsigned long fname_len));\r
 int C2F(sci_xls_open) _PARAMS((char *fname,unsigned long fname_len));\r
 /*-----------------------------------------------------------------------------------*/ \r
-#endif /*  __GW_EXCEL__ */\r
+#endif /*  __GW_SPREADSHEET__ */\r
 /*-----------------------------------------------------------------------------------*/\r
index 567ec77..59ce17e 100644 (file)
@@ -5,5 +5,5 @@ if (isdef('genlib') == %f) then
   exec(SCI+'/modules/functions/scripts/buildmacros/loadgenlib.sce');\r
 end\r
 //------------------------------------\r
-genlib('excellib','SCI/modules/excel/macros',%f,%t);\r
+genlib('spreadsheetlib','SCI/modules/spreadsheet/macros',%f,%t);\r
 //------------------------------------\r
index 4f21b58..debb91c 100644 (file)
@@ -1,4 +1,4 @@
-function mat=excel2sci(fname,sep)
+function mat=spreadsheet2sci(fname,sep)
 // Given an ascii  file created by Excel using "Text and comma" format
 // exel2sci(fname) returns the corresponding Scilab matrix of strings.
 // Copyright INRIA
index f676fef..3a40b42 100644 (file)
@@ -1,11 +1,11 @@
-function sci2excel(var,fname,sep,dec)
+function sci2spreadsheet(var,fname,sep,dec)
 // var : a matrix of numbers or a matrix of strings
 // fname : a character string, the path of the file to create
 // sep   : the column separator mark, a tab by default
 // dec   : the decimal mark . or ,
 // Example
 // a=rand(3,5);
-// sci2excel(a,'/tmp/foo.txt',sep=',')
+// sci2spreadsheet(a,'/tmp/foo.txt',sep=',')
 if exists('sep','local')==0 then sep=code2str(-40),end
 if exists('dec','local')==0 then dec=',',end
 if dec<>['.',','] then error('decimal mark must be ''.'' or '','''),end
index 047c51f..018aaec 100644 (file)
@@ -1 +1 @@
-readme.txt about excel module
\ No newline at end of file
+readme.txt about spreadsheet module
\ No newline at end of file
@@ -3,7 +3,7 @@
 /* Allan CORNET */\r
 /*-----------------------------------------------------------------------------------*/\r
 #include <string.h>\r
-#include "gw_excel.h"\r
+#include "gw_spreadsheet.h"\r
 #include "stack-c.h"\r
 #include "callFunctionFromGateway.h"\r
 /*-----------------------------------------------------------------------------------*/ \r
@@ -12,7 +12,7 @@ static gw_generic_table Tab[]={
        {C2F(sci_xls_read),"xls_read"}\r
 };\r
 /*-----------------------------------------------------------------------------------*/ \r
-int C2F(gw_excel)()\r
+int C2F(gw_spreadsheet)()\r
 {  \r
        Rhs = Max(0, Rhs);\r
        callFunctionFromGateway(Tab);\r
index b99652b..24d6610 100644 (file)
@@ -6,7 +6,7 @@
 #include "stack-c.h"
 #include "ole.h"
 #include "ripole.h"
-#include "gw_excel.h"
+#include "gw_spreadsheet.h"
 #include "intreadxls.h"
 #include "tmpdir.h"
 #include "cluni0.h"
index 6fdbb4f..b6c9180 100644 (file)
@@ -4,7 +4,7 @@
 /*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
-#include "gw_excel.h"
+#include "gw_spreadsheet.h"
 #include "intreadxls.h"
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_xls_open) _PARAMS((char *fname,unsigned long fname_len))
index ae6c033..84e11d2 100644 (file)
@@ -4,7 +4,7 @@
 /*-----------------------------------------------------------------------------------*/ 
 #include "machine.h"
 #include "stack-c.h"
-#include "gw_excel.h"
+#include "gw_spreadsheet.h"
 #include "intreadxls.h"
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_xls_read) _PARAMS((char *fname,unsigned long fname_len))
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 \r
 <!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-<GATEWAY name="excel">\r
+<GATEWAY name="spreadsheet">\r
 <!-- =================== -->\r
 <!--\r
  Scilab\r
diff --git a/scilab/modules/spreadsheet/spreadsheet.iss b/scilab/modules/spreadsheet/spreadsheet.iss
new file mode 100644 (file)
index 0000000..f20a005
--- /dev/null
@@ -0,0 +1,49 @@
+;##############################################################################################################\r
+; Script d'installation Inno Setup (5.1.7) pour scilab\r
+; Allan CORNET\r
+; Version TRUNK\r
+; Copyright INRIA 2007\r
+;##############################################################################################################\r
+;--------------------------------------------------------------------------------------------------------------\r
+; spreadsheet module\r
+;--------------------------------------------------------------------------------------------------------------\r
+;\r
+#define SPREADSHEET "spreadsheet"\r
+;\r
+Source: bin\spreadsheet.dll; DestDir: {app}\bin; Components: {#COMPN_SPREADSHEET}\r
+;\r
+Source: bin\nospreadsheet.dll; DestDir: {app}\bin; DestName: spreadsheet.dll; Components: not ({#COMPN_SPREADSHEET})\r
+;\r
+Source: modules\{#SPREADSHEET}\changelog.txt; DestDir: {app}\modules\{#SPREADSHEET}; Components: {#COMPN_SPREADSHEET}; Check: set_with_spreadsheet\r
+Source: modules\{#SPREADSHEET}\licence.txt; DestDir: {app}\modules\{#SPREADSHEET}; Components: {#COMPN_SPREADSHEET}\r
+Source: modules\{#SPREADSHEET}\readme.txt; DestDir: {app}\modules\{#SPREADSHEET}; Components: {#COMPN_SPREADSHEET}\r
+Source: modules\{#SPREADSHEET}\VERSION.xml; DestDir: {app}\modules\{#SPREADSHEET}; Components: {#COMPN_SPREADSHEET}\r
+;\r
+Source: modules\{#SPREADSHEET}\sci_gateway\spreadsheet_gateway.xml; DestDir: {app}\modules\{#SPREADSHEET}\sci_gateway; Components: {#COMPN_SPREADSHEET}\r
+;\r
+Source: modules\{#SPREADSHEET}\includes\*.h; DestDir: {app}\modules\{#SPREADSHEET}\includes; Components: {#COMPN_SPREADSHEET}\r
+;\r
+Source: modules\{#SPREADSHEET}\etc\{#SPREADSHEET}.quit; DestDir: {app}\modules\{#SPREADSHEET}\etc; Components: {#COMPN_SPREADSHEET}\r
+Source: modules\{#SPREADSHEET}\etc\{#SPREADSHEET}.start; DestDir: {app}\modules\{#SPREADSHEET}\etc; Components: {#COMPN_SPREADSHEET}\r
+;\r
+Source: modules\{#SPREADSHEET}\help\addchapter.sce; DestDir: {app}\modules\{#SPREADSHEET}\help; Flags: recursesubdirs; Components:  {#COMPN_SPREADSHEET}\r
+Source: modules\{#SPREADSHEET}\help\removechapter.sce; DestDir: {app}\modules\{#SPREADSHEET}\help; Flags: recursesubdirs; Components: {#COMPN_SPREADSHEET}\r
+;\r
+Source: modules\{#SPREADSHEET}\help\*.htm; DestDir: {app}\modules\{#SPREADSHEET}\help; Flags: recursesubdirs; Components: {#COMPN_SPREADSHEET}\r
+;\r
+;\r
+Source: modules\{#SPREADSHEET}\macros\buildmacros.sce; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}\r
+Source: modules\{#SPREADSHEET}\macros\buildmacros.bat; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}\r
+Source: modules\{#SPREADSHEET}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}\r
+Source: modules\{#SPREADSHEET}\macros\*.bin; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}\r
+Source: modules\{#SPREADSHEET}\macros\*.sci; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}\r
+Source: modules\{#SPREADSHEET}\macros\lib; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}\r
+Source: modules\{#SPREADSHEET}\macros\names; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}\r
+;\r
+Source: modules\{#SPREADSHEET}\demos\*.*; DestDir: {app}\modules\{#SPREADSHEET}\demos; Flags: recursesubdirs; Components: {#COMPN_SPREADSHEET}\r
+;\r
+Source: modules\{#SPREADSHEET}\unit_tests\*.ref; DestDir: {app}\modules\{#SPREADSHEET}\unit_tests; Flags: recursesubdirs; Components: {#COMPN_SPREADSHEET} and {#COMPN_DEVTOOLS}\r
+Source: modules\{#SPREADSHEET}\unit_tests\*.tst; DestDir: {app}\modules\{#SPREADSHEET}\unit_tests; Flags: recursesubdirs; Components: {#COMPN_SPREADSHEET} and {#COMPN_DEVTOOLS}\r
+\r
+;\r
+;--------------------------------------------------------------------------------------------------------------\r
similarity index 84%
rename from scilab/modules/spreadsheet/excel.vcproj
rename to scilab/modules/spreadsheet/spreadsheet.vcproj
index b53e1d6..0f3aea1 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8,00"\r
-       Name="excel"\r
+       Name="spreadsheet"\r
        ProjectGUID="{CE521770-0466-4743-B9F6-38F8AEB93888}"\r
-       RootNamespace="excel"\r
+       RootNamespace="spreadsheet"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -41,7 +41,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="includes;src/c;../core/includes;../../libs/MALLOC/includes;../../libs/intl"\r
-                               PreprocessorDefinitions="FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;EXCEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="0"\r
                                RuntimeLibrary="3"\r
@@ -59,7 +59,7 @@
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                                Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n excel.dll %%f &gt;nul&#x0D;&#x0A;copy *.def exceltmp.def &gt;nul&#x0D;&#x0A;copy ..\excel_header.def+exceltmp.def  ..\excel.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n spreadsheet.dll %%f &gt;nul&#x0D;&#x0A;copy *.def spreadsheettmp.def &gt;nul&#x0D;&#x0A;copy ..\spreadsheet_header.def+spreadsheettmp.def  ..\spreadsheet.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
@@ -67,7 +67,7 @@
                                AdditionalDependencies="LibScilab.lib"\r
                                OutputFile="../../bin/$(ProjectName).dll"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="excel.def"\r
+                               ModuleDefinitionFile="spreadsheet.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
                                FavorSizeOrSpeed="1"\r
                                WholeProgramOptimization="false"\r
                                AdditionalIncludeDirectories="includes;src/c;../core/includes;../../libs/MALLOC/includes;../../libs/intl"\r
-                               PreprocessorDefinitions="FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;EXCEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                                Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n excel.dll %%f &gt;nul&#x0D;&#x0A;copy *.def exceltmp.def &gt;nul&#x0D;&#x0A;copy ..\excel_header.def+exceltmp.def  ..\excel.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n spreadsheet.dll %%f &gt;nul&#x0D;&#x0A;copy *.def spreadsheettmp.def &gt;nul&#x0D;&#x0A;copy ..\spreadsheet_header.def+spreadsheettmp.def  ..\spreadsheet.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="LibScilab.lib"\r
                                OutputFile="../../bin/$(ProjectName).dll"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="excel.def"\r
+                               ModuleDefinitionFile="spreadsheet.def"\r
                                GenerateDebugInformation="false"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\sci_gateway\c\gw_excel.c"\r
+                               RelativePath=".\sci_gateway\c\gw_spreadsheet.c"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\includes\gw_excel.h"\r
+                               RelativePath=".\includes\gw_spreadsheet.h"\r
                                >\r
                        </File>\r
                        <File\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
-                               RelativePath=".\src\c\excel.rc"\r
+                               RelativePath=".\src\c\spreadsheet.rc"\r
                                >\r
                        </File>\r
                </Filter>\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath=".\excel.iss"\r
+                       RelativePath=".\spreadsheet.iss"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath=".\sci_gateway\excel_gateway.xml"\r
+                       RelativePath=".\sci_gateway\spreadsheet_gateway.xml"\r
                        >\r
                </File>\r
                <File\r
diff --git a/scilab/modules/spreadsheet/spreadsheet_header.def b/scilab/modules/spreadsheet/spreadsheet_header.def
new file mode 100644 (file)
index 0000000..c8a91db
--- /dev/null
@@ -0,0 +1,4 @@
+LIBRARY    spreadsheet.dll\r
+\r
+\r
+EXPORTS\r
index b8391aa..093fed4 100644 (file)
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}\r
 // Microsoft Visual C++ generated include file.\r
-// Used by excel.rc\r
+// Used by spreadsheet.rc\r
 \r
 // Next default values for new objects\r
 // \r
index fb23671..5f9fdde 100644 (file)
@@ -385,9 +385,9 @@ int ripole(char *inputfile, char *outputdir, int debug, int verbose)
        OLE_init(&ole);
        if (debug ==1 ) OLE_set_debug(&ole, OLE_DEBUG_NORMAL);
        if (verbose == 1) OLE_set_verbose(&ole, OLE_VERBOSE_NORMAL);
-       /*ole->save_unknown_streams==2 added for Scilab to extract onlyexcel streams
+       /*ole->save_unknown_streams==2 added for Scilab to extract onlyspreadsheet streams
         see  OLE_decode_stream in ole.c file */
-       OLE_set_save_unknown_streams(&ole, 2); /* get only excel streams */
+       OLE_set_save_unknown_streams(&ole, 2); /* get only spreadsheet streams */
 
        OLE_set_filename_report_fn(&ole, ROLE_report_filename_decoded );
 
similarity index 86%
rename from scilab/modules/spreadsheet/src/c/excel.rc
rename to scilab/modules/spreadsheet/src/c/spreadsheet.rc
index 72935ee..1e3916d 100644 (file)
@@ -65,13 +65,13 @@ BEGIN
         BLOCK "040c04b0"\r
         BEGIN\r
             VALUE "CompanyName", "Scilab"\r
-            VALUE "FileDescription", "excel module"\r
+            VALUE "FileDescription", "spreadsheet module"\r
             VALUE "FileVersion", "5, 0, 0, 0"\r
-            VALUE "InternalName", "excel"\r
+            VALUE "InternalName", "spreadsheet"\r
             VALUE "LegalCopyright", "Copyright (C) 2007"\r
             VALUE "LegalTrademarks", "INRIA"\r
-            VALUE "OriginalFilename", "excel.rc"\r
-            VALUE "ProductName", " excel"\r
+            VALUE "OriginalFilename", "spreadsheet.rc"\r
+            VALUE "ProductName", " spreadsheet"\r
             VALUE "ProductVersion", "5, 0, 0, 0"\r
         END\r
     END\r
index cb15f00..d690fa1 100644 (file)
@@ -5,7 +5,7 @@
 #include "machine.h" \r
 #include "Scierror.h"\r
 /*-----------------------------------------------------------------------------------*/ \r
-int C2F(gw_excel)()\r
+int C2F(gw_spreadsheet)()\r
 {\r
        Scierror(999,_("sound interface not installed.\n"));\r
        return 0;\r
index 10483fa..6a49c2f 100644 (file)
@@ -65,12 +65,12 @@ BEGIN
     BEGIN\r
         BLOCK "040c04b0"\r
         BEGIN\r
-            VALUE "FileDescription", "noexcel module"\r
+            VALUE "FileDescription", "nospreadsheet module"\r
             VALUE "FileVersion", "5, 0, 0, 0"\r
-            VALUE "InternalName", "noexcel module"\r
+            VALUE "InternalName", "nospreadsheet module"\r
             VALUE "LegalCopyright", "Copyright (C) 2007"\r
-            VALUE "OriginalFilename", "noexcel.dll"\r
-            VALUE "ProductName", " noexcel"\r
+            VALUE "OriginalFilename", "nospreadsheet.dll"\r
+            VALUE "ProductName", " nospreadsheet"\r
             VALUE "ProductVersion", "5, 0, 0, 0"\r
         END\r
     END\r
index 4961d0f..28cfde1 100644 (file)
@@ -2,9 +2,9 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8,00"\r
-       Name="noexcel"\r
+       Name="nospreadsheet"\r
        ProjectGUID="{AC43B2A6-601A-4E15-97DF-2B296FFAD4F9}"\r
-       RootNamespace="noexcel"\r
+       RootNamespace="nospreadsheet"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -41,7 +41,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../../core/includes;../../../../libs/intl"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOEXCEL_EXPORTS"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOSPREADSHEET_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="0"\r
                                RuntimeLibrary="3"\r
@@ -59,7 +59,7 @@
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                                Description="Make dependencies"\r
-                               CommandLine="if NOT EXIST LibScilab.lib lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n noexcel.dll %%f &gt;nul&#x0D;&#x0A;copy *.def noexceltmp.def &gt;nul&#x0D;&#x0A;copy ..\noexcel_header.def+noexceltmp.def  ..\noexcel.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
+                               CommandLine="if NOT EXIST LibScilab.lib lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n nospreadsheet.dll %%f &gt;nul&#x0D;&#x0A;copy *.def nospreadsheettmp.def &gt;nul&#x0D;&#x0A;copy ..\nospreadsheet_header.def+nospreadsheettmp.def  ..\nospreadsheet.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
@@ -67,7 +67,7 @@
                                AdditionalDependencies="LibScilab.lib ../../../../bin/intl.lib"\r
                                OutputFile="../../../../bin/$(ProjectName).dll"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="noexcel.def"\r
+                               ModuleDefinitionFile="nospreadsheet.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
                                FavorSizeOrSpeed="1"\r
                                WholeProgramOptimization="false"\r
                                AdditionalIncludeDirectories="../../../core/includes;../../../../libs/intl"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOEXCEL_EXPORTS"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOSPREADSHEET_EXPORTS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
                                EnableEnhancedInstructionSet="1"\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                                Description="Make dependencies"\r
-                               CommandLine="if NOT EXIST LibScilab.lib lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n noexcel.dll %%f &gt;nul&#x0D;&#x0A;copy *.def noexceltmp.def &gt;nul&#x0D;&#x0A;copy ..\noexcel_header.def+noexceltmp.def  ..\noexcel.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
+                               CommandLine="if NOT EXIST LibScilab.lib lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n nospreadsheet.dll %%f &gt;nul&#x0D;&#x0A;copy *.def nospreadsheettmp.def &gt;nul&#x0D;&#x0A;copy ..\nospreadsheet_header.def+nospreadsheettmp.def  ..\nospreadsheet.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="LibScilab.lib ../../../../bin/intl.lib"\r
                                OutputFile="../../../../bin/$(ProjectName).dll"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="noexcel.def"\r
+                               ModuleDefinitionFile="nospreadsheet.def"\r
                                GenerateDebugInformation="false"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath=".\noexcel.c"\r
+                               RelativePath=".\nospreadsheet.c"\r
                                >\r
                        </File>\r
                </Filter>\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
-                               RelativePath=".\noexcel.rc"\r
+                               RelativePath=".\nospreadsheet.rc"\r
                                >\r
                        </File>\r
                </Filter>\r
index b8391aa..093fed4 100644 (file)
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}\r
 // Microsoft Visual C++ generated include file.\r
-// Used by excel.rc\r
+// Used by spreadsheet.rc\r
 \r
 // Next default values for new objects\r
 // \r
index 264eaa1..7f0418c 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 \r
 <!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">\r
-<MODULE_VERSION name="excel">\r
+<MODULE_VERSION name="spreadsheet">\r
 <!-- =================== -->\r
 <!--\r
  Scilab\r