doublylinkedlist was no longer used. Drop it. Found thanks to the code coverage:... 17/10617/2
Sylvestre Ledru [Tue, 26 Feb 2013 11:28:16 +0000 (12:28 +0100)]
Change-Id: I6b48d92b67712fb6648c2c907003c6485aa14f8c

48 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/bin/bin.iss
scilab/configure
scilab/configure.ac
scilab/libs/.gitignore
scilab/libs/Makefile.am
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.am [deleted file]
scilab/libs/doublylinkedlist/Makefile.in [deleted file]
scilab/libs/doublylinkedlist/doublylinkedlist.rc [deleted file]
scilab/libs/doublylinkedlist/doublylinkedlist.vcxproj [deleted file]
scilab/libs/doublylinkedlist/doublylinkedlist.vcxproj.filters [deleted file]
scilab/libs/doublylinkedlist/doublylinkedlist_header.def [deleted file]
scilab/libs/doublylinkedlist/includes/DoublyLinkedList.h [deleted file]
scilab/libs/doublylinkedlist/license.txt [deleted file]
scilab/libs/doublylinkedlist/src/DoublyLinkedList.c [deleted file]
scilab/libs/libs.iss
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.vcxproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/core.vcxproj
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/src/nographics/nographics.vcxproj
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/helptools/src/c/helptools.vcxproj
scilab/modules/javasci/Javasci.vcxproj
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/renderer.vcxproj
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj

index aaddd8e..87090a7 100644 (file)
@@ -352,8 +352,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "modules\rendere
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "modules\console\src\c\console.vcxproj", "{445D3B85-C9B1-498B-9C88-0A3C2390B1CC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doublylinkedlist", "libs\doublylinkedlist\doublylinkedlist.vcxproj", "{ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "completion", "modules\completion\src\c\completion.vcxproj", "{CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nocompletion", "modules\completion\src\nocompletion\nocompletion.vcxproj", "{D1586C83-3F16-467B-85C6-6A12A08CCB8D}"
index 97bad2f..d076211 100644 (file)
@@ -352,8 +352,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "modules\rendere
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "modules\console\src\c\console.vcxproj", "{445D3B85-C9B1-498B-9C88-0A3C2390B1CC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doublylinkedlist", "libs\doublylinkedlist\doublylinkedlist.vcxproj", "{ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "completion", "modules\completion\src\c\completion.vcxproj", "{CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nocompletion", "modules\completion\src\nocompletion\nocompletion.vcxproj", "{D1586C83-3F16-467B-85C6-6A12A08CCB8D}"
index dac8c68..1ccd621 100644 (file)
@@ -50,7 +50,6 @@ Source: bin\GNU_gettext.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\zlib1.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\GetWindowsVersion.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\hashtable.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\doublylinkedlist.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\lapack.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\libf2c.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\scilab_windows.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
index a956347..9fae683 100755 (executable)
@@ -38888,7 +38888,7 @@ SCI_LDFLAGS=$(echo  $LARGEFILE_LDFLAGS  $CODECOVERAGE_LDFLAGS  $DEBUG_LDFLAGS  $
 
 
 
-ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
+ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
 
 
 # Detection of the module for the future version of Scilab 6
@@ -40226,7 +40226,6 @@ do
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "libs/MALLOC/Makefile") CONFIG_FILES="$CONFIG_FILES libs/MALLOC/Makefile" ;;
     "libs/dynamiclibrary/Makefile") CONFIG_FILES="$CONFIG_FILES libs/dynamiclibrary/Makefile" ;;
-    "libs/doublylinkedlist/Makefile") CONFIG_FILES="$CONFIG_FILES libs/doublylinkedlist/Makefile" ;;
     "libs/hashtable/Makefile") CONFIG_FILES="$CONFIG_FILES libs/hashtable/Makefile" ;;
     "libs/libst/Makefile") CONFIG_FILES="$CONFIG_FILES libs/libst/Makefile" ;;
     "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
index 88d4ee0..6c5ff25 100644 (file)
@@ -1787,7 +1787,6 @@ AC_SUBST(SCI_LDFLAGS)
 AC_CONFIG_FILES([
 libs/MALLOC/Makefile
 libs/dynamiclibrary/Makefile
-libs/doublylinkedlist/Makefile
 libs/hashtable/Makefile
 libs/libst/Makefile
 contrib/Makefile
index 027eaab..29ac8f2 100644 (file)
@@ -1,8 +1,6 @@
 #
 # windows directories (binaries)
 #
-doublylinkedlist/doublylinkedlist.def
-google_breakpad
 LibScilab.def
 *.vcdef
 f2c
index 747f01b..011508d 100644 (file)
@@ -8,7 +8,5 @@ SUBDIRS = \
        MALLOC \
        hashtable \
        libst \
-       dynamiclibrary \
-       doublylinkedlist
-
+       dynamiclibrary
 
index d3081c5..ef628fd 100644 (file)
@@ -387,8 +387,7 @@ SUBDIRS = \
        MALLOC \
        hashtable \
        libst \
-       dynamiclibrary \
-       doublylinkedlist
+       dynamiclibrary
 
 all: all-recursive
 
diff --git a/scilab/libs/doublylinkedlist/Makefile.am b/scilab/libs/doublylinkedlist/Makefile.am
deleted file mode 100644 (file)
index 7f84f30..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) 2007 - INRIA - Sylvestre LEDRU
-#
-# This file is distributed under the same license as the Scilab package.
-
-DOUBLYLINKEDLIST_C_SOURCES = src/DoublyLinkedList.c
-
-libscidoublylinkedlist_la_includedir=$(pkgincludedir)
-
-libscidoublylinkedlist_la_include_HEADERS = includes/DoublyLinkedList.h
-
-libscidoublylinkedlist_la_CPPFLAGS= -I$(srcdir)/src/ \
-    -I$(srcdir)/includes/ \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
-    $(AM_CPPFLAGS)
-
-pkglib_LTLIBRARIES = libscidoublylinkedlist.la
-
-libscidoublylinkedlist_la_SOURCES = $(DOUBLYLINKEDLIST_C_SOURCES)
-
-# For the code check (splint)
-CHECK_SRC= $(DOUBLYLINKEDLIST_C_SOURCES)
-INCLUDE_FLAGS = $(libscidoublylinkedlist_la_CPPFLAGS)
-
-libscidoublylinkedlist_la_LIBADD = 
-
-#### Target ######
-modulename=doublylinkedlist
-
-include $(top_srcdir)/Makefile.incl.am
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
deleted file mode 100644 (file)
index 95b5161..0000000
+++ /dev/null
@@ -1,1062 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) 2007 - INRIA - Sylvestre LEDRU
-#
-# This file is distributed under the same license as the Scilab package.
-
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
-# Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
-#
-# This file must be used under the terms of the CeCILL.
-# This source file is licensed as described in the file COPYING, which
-# you should have received as part of this distribution.  The terms
-# are also available at
-# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-#
-
-##########
-### Makefile included stuff
-### Target, variable, suffixes which are supposed to be useful in every makefile.am
-##########
-
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(libscidoublylinkedlist_la_include_HEADERS) \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(top_srcdir)/Makefile.incl.am
-@NEED_JAVA_TRUE@am__append_1 = java
-subdir = libs/doublylinkedlist
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
-       $(top_srcdir)/m4/doxygen.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
-       $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
-       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
-       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
-       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
-       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
-       $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(pkglibdir)" \
-       "$(DESTDIR)$(libscidoublylinkedlist_la_includedir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libscidoublylinkedlist_la_DEPENDENCIES =
-am__objects_1 = libscidoublylinkedlist_la-DoublyLinkedList.lo
-am_libscidoublylinkedlist_la_OBJECTS = $(am__objects_1)
-libscidoublylinkedlist_la_OBJECTS =  \
-       $(am_libscidoublylinkedlist_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-SOURCES = $(libscidoublylinkedlist_la_SOURCES)
-DIST_SOURCES = $(libscidoublylinkedlist_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-HEADERS = $(libscidoublylinkedlist_la_include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-ALL_LINGUAS_DOC = @ALL_LINGUAS_DOC@
-AMTAR = @AMTAR@
-ANT = @ANT@
-ANTLR = @ANTLR@
-AR = @AR@
-ARPACK_LIBS = @ARPACK_LIBS@
-ASM3 = @ASM3@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
-AWK = @AWK@
-BATIK = @BATIK@
-BLAS_LIBS = @BLAS_LIBS@
-CC = @CC@
-CCACHE = @CCACHE@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECKSTYLE = @CHECKSTYLE@
-COBERTURA = @COBERTURA@
-COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
-COMMONS_IO = @COMMONS_IO@
-COMMONS_LOGGING = @COMMONS_LOGGING@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
-DEPDIR = @DEPDIR@
-DOCBOOK_ROOT = @DOCBOOK_ROOT@
-DOXYGEN_BIN = @DOXYGEN_BIN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFTW3_LIB = @FFTW3_LIB@
-FFTW_ENABLE = @FFTW_ENABLE@
-FGREP = @FGREP@
-FLEXDOCK = @FLEXDOCK@
-FLIBS = @FLIBS@
-FOP = @FOP@
-GENHTML = @GENHTML@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GIWS_BIN = @GIWS_BIN@
-GLUEGEN2_RT = @GLUEGEN2_RT@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
-GREP = @GREP@
-GUI_ENABLE = @GUI_ENABLE@
-HDF5_CFLAGS = @HDF5_CFLAGS@
-HDF5_LIBS = @HDF5_LIBS@
-HELP_ENABLE = @HELP_ENABLE@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JAR = @JAR@
-JAVA = @JAVA@
-JAVAC = @JAVAC@
-JAVAC_DEBUG = @JAVAC_DEBUG@
-JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
-JAVASCI_ENABLE = @JAVASCI_ENABLE@
-JAVA_ENABLE = @JAVA_ENABLE@
-JAVA_G = @JAVA_G@
-JAVA_HOME = @JAVA_HOME@
-JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
-JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
-JDB = @JDB@
-JEUCLID_CORE = @JEUCLID_CORE@
-JGRAPHX = @JGRAPHX@
-JHALL = @JHALL@
-JLATEXMATH = @JLATEXMATH@
-JLATEXMATH_FOP = @JLATEXMATH_FOP@
-JOGL2 = @JOGL2@
-JROSETTA_API = @JROSETTA_API@
-JROSETTA_ENGINE = @JROSETTA_ENGINE@
-JUNIT4 = @JUNIT4@
-LAPACK_LIBS = @LAPACK_LIBS@
-LCOV = @LCOV@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOGGING_LEVEL = @LOGGING_LEVEL@
-LOOKS = @LOOKS@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MATIO_CFLAGS = @MATIO_CFLAGS@
-MATIO_ENABLE = @MATIO_ENABLE@
-MATIO_LIBS = @MATIO_LIBS@
-MKDIR_P = @MKDIR_P@
-MSGCAT = @MSGCAT@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OCAMLC = @OCAMLC@
-OCAMLDEP = @OCAMLDEP@
-OCAMLLEX = @OCAMLLEX@
-OCAMLOPT = @OCAMLOPT@
-OCAMLYACC = @OCAMLYACC@
-OPENMP_CFLAGS = @OPENMP_CFLAGS@
-OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
-OPENMP_ENABLE = @OPENMP_ENABLE@
-OPENMP_LIBS = @OPENMP_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PCRE_CFLAGS = @PCRE_CFLAGS@
-PCRE_CONFIG = @PCRE_CONFIG@
-PCRE_LIBS = @PCRE_LIBS@
-PCRE_VERSION = @PCRE_VERSION@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-POW_LIB = @POW_LIB@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-RELOCATABLE = @RELOCATABLE@
-RT_LIB = @RT_LIB@
-SAXON = @SAXON@
-SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
-SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
-SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
-SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
-SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
-SCIRENDERER = @SCIRENDERER@
-SCI_CFLAGS = @SCI_CFLAGS@
-SCI_CXXFLAGS = @SCI_CXXFLAGS@
-SCI_FFLAGS = @SCI_FFLAGS@
-SCI_LDFLAGS = @SCI_LDFLAGS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SET_RELOCATABLE = @SET_RELOCATABLE@
-SHELL = @SHELL@
-SKINLF = @SKINLF@
-SPLINT = @SPLINT@
-STRIP = @STRIP@
-SWIG_BIN = @SWIG_BIN@
-SWIG_JAVA = @SWIG_JAVA@
-SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
-TCLTK_LIBS = @TCLTK_LIBS@
-TCL_INC_PATH = @TCL_INC_PATH@
-TK_INC_PATH = @TK_INC_PATH@
-UMFPACK_ENABLE = @UMFPACK_ENABLE@
-UMFPACK_LIB = @UMFPACK_LIB@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WITH_OCAML = @WITH_OCAML@
-WITH_TKSCI = @WITH_TKSCI@
-XCOS_ENABLE = @XCOS_ENABLE@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
-XML_APIS_EXT = @XML_APIS_EXT@
-XML_CONFIG = @XML_CONFIG@
-XML_FLAGS = @XML_FLAGS@
-XML_LIBS = @XML_LIBS@
-XML_VERSION = @XML_VERSION@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_F77 = @ac_ct_F77@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-cxx_present = @cxx_present@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-DOUBLYLINKEDLIST_C_SOURCES = src/DoublyLinkedList.c
-libscidoublylinkedlist_la_includedir = $(pkgincludedir)
-libscidoublylinkedlist_la_include_HEADERS = includes/DoublyLinkedList.h
-libscidoublylinkedlist_la_CPPFLAGS = -I$(srcdir)/src/ \
-    -I$(srcdir)/includes/ \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
-    $(AM_CPPFLAGS)
-
-pkglib_LTLIBRARIES = libscidoublylinkedlist.la
-libscidoublylinkedlist_la_SOURCES = $(DOUBLYLINKEDLIST_C_SOURCES)
-
-# For the code check (splint)
-CHECK_SRC = $(DOUBLYLINKEDLIST_C_SOURCES)
-INCLUDE_FLAGS = $(libscidoublylinkedlist_la_CPPFLAGS)
-libscidoublylinkedlist_la_LIBADD = 
-
-#### Target ######
-modulename = doublylinkedlist
-
-# Where all the Scilab stuff is installed (macros, help, ...)
-mydatadir = $(pkgdatadir)/modules/$(modulename)
-
-# Set AM_* SCI detected settings
-AM_CPPFLAGS = $(SCI_CPPFLAGS)
-AM_CFLAGS = $(SCI_CFLAGS)
-AM_CXXFLAGS = $(SCI_CXXFLAGS)
-# append includes to AM_FFLAGS to manage fortran includes
-AM_FFLAGS = $(SCI_FFLAGS) -I$(top_srcdir)/modules/core/includes/
-
-# Tag shared libraries with the Scilab version
-AM_LDFLAGS = $(SCI_LDFLAGS) -version-number $(SCILAB_LIBRARY_VERSION)
-
-# splint options
-SPLINT_OPTIONS = -weak -booltype BOOL
-
-########################### JAVA ######################################
-#### We are delegating java compilation to ant... Thanks to that
-#### the procedure will be the same with Microsoft Windows (C)
-#### and Linux/Unix
-#######################################################################
-TARGETS_ALL = $(am__append_1)
-
-################ MACROS ######################
-# Rule to build a macro
-# NOT USED  AT THE MOMENT
-SUFFIXES = .sci 
-
-########### INSTALL DOCUMENTATION ###################
-
-# Install documentation files into the right target
-# We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because
-# automake needs the html files to be present which is not the case when
-# we are building Scilab
-
-# Where it should be installed
-pkgdocdir = $(mydatadir)
-
-# What is the mask of the help source
-DOCMASKXML = *.xml
-
-# What is the mask of the MathML sources
-DOCMASKMML = *.mml
-
-########### INSTALL DATA ###################
-# Install macros, help & demos
-# Where it should be installed
-pkgmacrosdir = $(mydatadir)
-# Which directory we process
-MACRODIRS = macros/
-# Mask of the Scilab sources macros
-MACROMASK = *.sci
-# Mask of the Scilab executable sources macros
-MACROBUILDMASK = *.sce
-# Mask of the Scilab compiled macros
-MACROBINMASK = *.bin
-# List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
-# Where the demos should be installed
-pkgdemosdir = $(mydatadir)
-# List of the standard directory for demos
-DEMOS_DIR = demos
-# List of the standard directory for examples
-EXAMPLES_DIR = examples
-# Where to export JAVA archives (.jar)
-JARDIR = jar/
-# JAR files mask
-JARMASK = *.jar
-# Chapter file 
-HELP_CHAPTERDIR = help/
-HELP_CHAPTERFILE = addchapter.sce
-HELP_CHAPTERLANG = en_US fr_FR pt_BR
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .sci .bin .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-               && { if test -f $@; then exit 0; else break; fi; }; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libs/doublylinkedlist/Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --foreign libs/doublylinkedlist/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-$(top_srcdir)/Makefile.incl.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
-       @$(NORMAL_INSTALL)
-       @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-       list2=; for p in $$list; do \
-         if test -f $$p; then \
-           list2="$$list2 $$p"; \
-         else :; fi; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
-       }
-
-uninstall-pkglibLTLIBRARIES:
-       @$(NORMAL_UNINSTALL)
-       @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-       for p in $$list; do \
-         $(am__strip_dir) \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
-       done
-
-clean-pkglibLTLIBRARIES:
-       -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-       @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" != "$$p" || dir=.; \
-         echo "rm -f \"$${dir}/so_locations\""; \
-         rm -f "$${dir}/so_locations"; \
-       done
-libscidoublylinkedlist.la: $(libscidoublylinkedlist_la_OBJECTS) $(libscidoublylinkedlist_la_DEPENDENCIES) $(EXTRA_libscidoublylinkedlist_la_DEPENDENCIES) 
-       $(LINK) -rpath $(pkglibdir) $(libscidoublylinkedlist_la_OBJECTS) $(libscidoublylinkedlist_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscidoublylinkedlist_la-DoublyLinkedList.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
-
-libscidoublylinkedlist_la-DoublyLinkedList.lo: src/DoublyLinkedList.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscidoublylinkedlist_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscidoublylinkedlist_la-DoublyLinkedList.lo -MD -MP -MF $(DEPDIR)/libscidoublylinkedlist_la-DoublyLinkedList.Tpo -c -o libscidoublylinkedlist_la-DoublyLinkedList.lo `test -f 'src/DoublyLinkedList.c' || echo '$(srcdir)/'`src/DoublyLinkedList.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscidoublylinkedlist_la-DoublyLinkedList.Tpo $(DEPDIR)/libscidoublylinkedlist_la-DoublyLinkedList.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/DoublyLinkedList.c' object='libscidoublylinkedlist_la-DoublyLinkedList.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) $(libscidoublylinkedlist_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscidoublylinkedlist_la-DoublyLinkedList.lo `test -f 'src/DoublyLinkedList.c' || echo '$(srcdir)/'`src/DoublyLinkedList.c
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-install-libscidoublylinkedlist_la_includeHEADERS: $(libscidoublylinkedlist_la_include_HEADERS)
-       @$(NORMAL_INSTALL)
-       @list='$(libscidoublylinkedlist_la_include_HEADERS)'; test -n "$(libscidoublylinkedlist_la_includedir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libscidoublylinkedlist_la_includedir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libscidoublylinkedlist_la_includedir)" || exit 1; \
-       fi; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscidoublylinkedlist_la_includedir)'"; \
-         $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscidoublylinkedlist_la_includedir)" || exit $$?; \
-       done
-
-uninstall-libscidoublylinkedlist_la_includeHEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(libscidoublylinkedlist_la_include_HEADERS)'; test -n "$(libscidoublylinkedlist_la_includedir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(libscidoublylinkedlist_la_includedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       set x; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       shift; \
-       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         if test $$# -gt 0; then \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             "$$@" $$unique; \
-         else \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$unique; \
-         fi; \
-       fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && $(am__cd) $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-       $(MAKE) $(AM_MAKEFLAGS) check-local
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local
-installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscidoublylinkedlist_la_includedir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       if test -z '$(STRIP)'; then \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-             install; \
-       else \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-       fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-local distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local \
-       install-libscidoublylinkedlist_la_includeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-pkglibLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am: install-html-local
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libscidoublylinkedlist_la_includeHEADERS \
-       uninstall-pkglibLTLIBRARIES
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
-       clean clean-generic clean-libtool clean-local \
-       clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-local \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am \
-       install-data-local install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am \
-       install-html-local install-info install-info-am \
-       install-libscidoublylinkedlist_la_includeHEADERS 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-libscidoublylinkedlist_la_includeHEADERS \
-       uninstall-pkglibLTLIBRARIES
-
-
-# This target enables tests for Scilab
-check-local: $(top_builddir)/scilab-bin test
-       if test -d $(mydatadir)/tests; then \
-         @COMMAND="try test_run('$(modulename)');catch exit(-1);end;exit(0)"; export LANG=C; $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"; \
-       fi
-check-code:
-       if test -f build.xml; then \
-               $(ANT) checkstyle; \
-       fi
-       if test -x "$(SPLINT)"; then \
-               $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
-       fi
-@NEED_JAVA_TRUE@java:
-# Some configurations needs to export JAVA_HOME in the current env
-@NEED_JAVA_TRUE@       @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
-@NEED_JAVA_TRUE@       if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
-@NEED_JAVA_TRUE@       if test -f build.xml -a $$USEANT -eq 1; then \
-@NEED_JAVA_TRUE@               $(ANT); \
-@NEED_JAVA_TRUE@       fi
-
-@NEED_JAVA_TRUE@clean-java:
-# Some configurations needs to export JAVA_HOME in the current env
-@NEED_JAVA_TRUE@       @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
-@NEED_JAVA_TRUE@       if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
-@NEED_JAVA_TRUE@       if test -f build.xml -a $$USEANT -eq 1; then \
-@NEED_JAVA_TRUE@               $(ANT) clean; \
-@NEED_JAVA_TRUE@       fi;
-
-# If the user request for the SWIG generation of the wrappers Java => C/C++ 
-# We call the target swig-build on the variable SWIG_WRAPPERS
-
-@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
-@SWIG_TRUE@    @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
-@SWIG_TRUE@    SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
-@SWIG_TRUE@    if test -n "$(SWIG_WRAPPERS)"; then \
-@SWIG_TRUE@            for file in $(SWIG_WRAPPERS) ; do \
-@SWIG_TRUE@                    echo "Swig process of $$file ..."; \
-@SWIG_TRUE@                    $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME  -outdir $$SWIG_OUTDIR $$file; \
-@SWIG_TRUE@            done; \
-@SWIG_TRUE@    fi
-
-# If the user request for the SWIG generation of the wrappers Java => C/C++ 
-# We call the target swig-build on the variable SWIG_WRAPPERS
-
-@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
-@GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
-@GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
-@GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
-@GIWS_TRUE@                    $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
-@GIWS_TRUE@            done; \
-@GIWS_TRUE@    fi
-
-@GIWS_TRUE@giws-exception:
-@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
-@GIWS_TRUE@    echo "GIWS: Generation of exception class ..."; \
-@GIWS_TRUE@    $(GIWS_BIN) --generate-exception-class --output-dir $$GIWS_OUTPUTDIR 
-
-macros:
-       -@( if test ! -x $(top_builddir)/scilab-bin; then \
-               echo "Error : Cannot build $< : Scilab has not been built"; \
-       else \
-               $(top_builddir)/bin/scilab -ns -nwni -e "exec('macros/buildmacros.sce');quit;";\
-       fi)
-
-# Removes the macros
-clean-macros:
-# Removes macros (*.bin generated from .sci)
-       @for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
-               echo "rm -f $(builddir)/$$dir/$(MACROBINMASK)"; \
-               rm -f $(builddir)/$$dir/$(MACROBINMASK); \
-       done
-
-test:
-# More tests could be added here
-       @if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
-       if test -f build.xml -a $$USEANT -eq 1; then \
-               $(ANT) test; \
-       fi
-
-all-local: $(TARGETS_ALL)
-
-.sci.bin:
-       -@( if test ! -x $(top_builddir)/scilab-bin; then \
-       echo "Error : Cannot build $< : Scilab has not been build"; \
-       else \
-       echo "Creating $@"; \
-       $(top_builddir)/bin/scilab -ns -nwni -e "exec('$(abs_srcdir)/$<');save('$(abs_srcdir)/$@');exit;"; \
-       fi )
-
-install-html-local:
-
-install-data-local-local:
-# Mainly for javasci
-       @if test -d $(srcdir)/javadoc; then \
-               cp -R $(srcdir)/javadoc $(DESTDIR)/$(mydatadir)/; \
-       fi
-# If the user wants the help sources to be installed
-@INSTALL_HELP_XML_TRUE@        @echo "-------- Install of XML sources of help files --------"; \
-@INSTALL_HELP_XML_TRUE@        for lang in $(ALL_LINGUAS); do \
-@INSTALL_HELP_XML_TRUE@         if test -d $(srcdir)/help/$$lang; then \
-@INSTALL_HELP_XML_TRUE@          $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/$$lang && \
-@INSTALL_HELP_XML_TRUE@                if ls -lLd $(srcdir)/help/$$lang/$(DOCMASKXML) >/dev/null 2>&1; then \
-@INSTALL_HELP_XML_TRUE@                  for file in $(srcdir)/help/$$lang/$(DOCMASKXML) ; do \
-@INSTALL_HELP_XML_TRUE@                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/$$lang" ; \
-@INSTALL_HELP_XML_TRUE@                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/$$lang ; \
-@INSTALL_HELP_XML_TRUE@                  done ; \
-@INSTALL_HELP_XML_TRUE@                fi; \
-@INSTALL_HELP_XML_TRUE@         fi; \
-@INSTALL_HELP_XML_TRUE@        done; \
-@INSTALL_HELP_XML_TRUE@        @echo "-------- Install of MathML sources --------"; \
-@INSTALL_HELP_XML_TRUE@         if test -d $(srcdir)/help/mml/; then \
-@INSTALL_HELP_XML_TRUE@          $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/mml/ && \
-@INSTALL_HELP_XML_TRUE@                if ls -lLd $(srcdir)/help/mml/$(DOCMASKMML) >/dev/null 2>&1; then \
-@INSTALL_HELP_XML_TRUE@                  for file in $(srcdir)/help/mml/$(DOCMASKMML) ; do \
-@INSTALL_HELP_XML_TRUE@                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/mml" ; \
-@INSTALL_HELP_XML_TRUE@                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/mml ; \
-@INSTALL_HELP_XML_TRUE@                  done ; \
-@INSTALL_HELP_XML_TRUE@                fi; \
-@INSTALL_HELP_XML_TRUE@        fi
-install-data-local:
-# Install the tests
-       @echo "-------- Install tests (if any) --------"; \
-       for dir in $(TESTS_DIR) $(TESTS_DIREXT) ; do \
-         if test -d $(srcdir)/$$dir/; then \
-           $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-                 for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
-                   if test -d "$(srcdir)/$$dir/$$file"; then \
-                         echo $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir/$$file; \
-                         $(mkinstalldirs) "$(DESTDIR)$(pkgmacrosdir)/$$dir/$$file"; \
-                   else \
-                     echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
-                 $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
-                   fi \
-                 done; \
-         fi; \
-       done
-# Install the help chapter
-       @echo "-------- Install the help chapter (if any) --------"; \
-       for lang in $(HELP_CHAPTERLANG); do \
-               HELPFILE=$(srcdir)/$(HELP_CHAPTERDIR)$$lang/$(HELP_CHAPTERFILE); \
-               if test -f $$HELPFILE; then \
-                       echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
-                       $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
-                       echo $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
-                       $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
-               fi; \
-       done
-# Install the demos & examples
-       @echo "-------- Install demos & examples (if any) --------"; \
-       for dir in $(DEMOS_DIR) $(DEMOS_DIREXT) $(EXAMPLES_DIR) $(EXAMPLES_DIREXT) ; do \
-         if test -d $(srcdir)/$$dir/; then \
-           $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
-                 for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
-                   if test -d "$(srcdir)/$$dir/$$file"; then \
-                         echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir/$$file; \
-                         $(mkinstalldirs) "$(DESTDIR)$(pkgdocdir)/$$dir/$$file"; \
-                   else \
-                     echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
-                 $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
-                   fi \
-                 done; \
-         fi; \
-       done
-# Install the macros
-       @echo "-------- Install macros (if any) --------"; \
-       for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
-         $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
-               if test -d $(srcdir)/$$dir/; then \
-                       FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
-                       if test -n "$(MACROSSPECIALEXT)"; then \
-                               specialExtDir=""; \
-                               for specialExt in $(MACROSSPECIALEXT); do \
-                                       specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
-                               done; \
-                               FILELIST="$$FILELIST $$specialExtDir"; \
-                       fi; \
-                 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
-                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
-               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
-                 done; \
-               fi; \
-       done
-# Install java files (.jar)
-       @if ls -lLd $(srcdir)/$(JARDIR)$(JARMASK) >/dev/null 2>&1; then \
-       echo "-------- Install jar files --------"; \
-    $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(JARDIR); \
-         for file in $(srcdir)/$(JARDIR)$(JARMASK); do\
-                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$(JARDIR)" ; \
-               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/$(JARDIR) ; \
-         done ; \
-       fi
-
-########### CLEAN ###################
-# Clean help (generated automatically by Scilab)
-# It used to clean the macro (clean-macros) but this was causing
-# make clean && make to fail Scilab startup
-@NEED_JAVA_TRUE@clean-local: clean-java
-@NEED_JAVA_FALSE@clean-local:
-
-distclean-local:
-       rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_*
-
-.PHONY: macros java swig giws
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/scilab/libs/doublylinkedlist/doublylinkedlist.rc b/scilab/libs/doublylinkedlist/doublylinkedlist.rc
deleted file mode 100644 (file)
index efd8b89..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-//#include "afxres.h"
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,4,1,0
- PRODUCTVERSION 5,4,1,0
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040c04b0"
-        BEGIN
-            VALUE "FileDescription", "doublylinkedlist library for Scilab 5.x"
-            VALUE "FileVersion", "5, 4, 1, 0"
-            VALUE "InternalName", "doublylinkedlist library for Scilab 5.x"
-            VALUE "LegalCopyright", "Copyright (C) 2013"
-            VALUE "OriginalFilename", "doublylinkedlist.dll"
-            VALUE "ProductName", "doublylinkedlist library for Scilab 5.x"
-            VALUE "ProductVersion", "5, 4, 1, 0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x40c, 1200
-    END
-END
-
-#endif    // French (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/scilab/libs/doublylinkedlist/doublylinkedlist.vcxproj b/scilab/libs/doublylinkedlist/doublylinkedlist.vcxproj
deleted file mode 100644 (file)
index 7f989ab..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-<?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">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}</ProjectGuid>
-    <RootNamespace>doublylinkedlist</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>EXPORT_DOUBLYLINKEDLIST_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>cd $(IntDir) &gt;nul
-for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n doublylinkedlist.dll %%f &gt;nul
-copy *.def doublylinkedlisttmp.def &gt;nul
-copy ..\doublylinkedlist_header.def+doublylinkedlisttmp.def  ..\doublylinkedlist.def &gt;nul
-del *.def &gt;nul
-cd .. &gt;nul
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>doublylinkedlist.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>EXPORT_DOUBLYLINKEDLIST_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>cd $(IntDir) &gt;nul
-for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n doublylinkedlist.dll %%f &gt;nul
-copy *.def doublylinkedlisttmp.def &gt;nul
-copy ..\doublylinkedlist_header.def+doublylinkedlisttmp.def  ..\doublylinkedlist.def &gt;nul
-del *.def &gt;nul
-cd .. &gt;nul
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>doublylinkedlist.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>EXPORT_DOUBLYLINKEDLIST_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>cd $(IntDir) &gt;nul
-for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n doublylinkedlist.dll %%f &gt;nul
-copy *.def doublylinkedlisttmp.def &gt;nul
-copy ..\doublylinkedlist_header.def+doublylinkedlisttmp.def  ..\doublylinkedlist.def &gt;nul
-del *.def &gt;nul
-cd .. &gt;nul
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>doublylinkedlist.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>EXPORT_DOUBLYLINKEDLIST_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>cd $(IntDir) &gt;nul
-for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n doublylinkedlist.dll %%f &gt;nul
-copy *.def doublylinkedlisttmp.def &gt;nul
-copy ..\doublylinkedlist_header.def+doublylinkedlisttmp.def  ..\doublylinkedlist.def &gt;nul
-del *.def &gt;nul
-cd .. &gt;nul
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>doublylinkedlist.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="src\DoublyLinkedList.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="includes\DoublyLinkedList.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="doublylinkedlist.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile.am" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\tools\Dumpexts\Dumpexts.vcxproj">
-      <Project>{3170e4c2-1173-4264-a222-7ee8ccb3ddf7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\MALLOC\MALLOC.vcxproj">
-      <Project>{6a84ad8c-ba18-4a3f-9c72-ec3df0939e9e}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/scilab/libs/doublylinkedlist/doublylinkedlist.vcxproj.filters b/scilab/libs/doublylinkedlist/doublylinkedlist.vcxproj.filters
deleted file mode 100644 (file)
index b3c9e8b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\DoublyLinkedList.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="includes\DoublyLinkedList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="doublylinkedlist.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile.am" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/scilab/libs/doublylinkedlist/doublylinkedlist_header.def b/scilab/libs/doublylinkedlist/doublylinkedlist_header.def
deleted file mode 100644 (file)
index fb4baff..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY    doublylinkedlist.dll
-
-
-EXPORTS
diff --git a/scilab/libs/doublylinkedlist/includes/DoublyLinkedList.h b/scilab/libs/doublylinkedlist/includes/DoublyLinkedList.h
deleted file mode 100644 (file)
index 3090b6c..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-
-/*************************************************************************/
-/* Doubly Linked DoublyLinkedList Management                             */
-/* DoublyLinkedList.h                                                    */
-/*                                                                       */
-/* Authors : Daniel Lacroix (Public Domain)                              */
-/* Software by Daniel Lacroix 15/09/2006.                                */
-/* Modification : Jean-Baptiste Silvy for compatibility with Scilab      */
-/*                                                                       */
-/*************************************************************************/
-
-
-#ifndef _DOUBLY_LINKED_LIST_
-#define _DOUBLY_LINKED_LIST_
-
-#include "BOOL.h"
-
-/* pour les DoublyLinkedListes chainees */
-typedef struct _DlDoublyLinkedList DoublyLinkedList;
-
-struct _DlDoublyLinkedList {
-  void * data;
-  DoublyLinkedList *next;
-  DoublyLinkedList *prev;
-};
-
-/* Cree une nouvelle DoublyLinkedListe chainee. */
-/* DoublyLinkedList *List_new()                 */
-#define DoublyLinkedList_new() NULL
-
-/* Rajoute en tete de la DoublyLinkedListe pDoublyLinkedList l'element data. */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe.    */
-DoublyLinkedList *List_prepend(DoublyLinkedList *pDoublyLinkedList, void * data);
-
-/* Rajoute en queue de la DoublyLinkedListe pDoublyLinkedList l'element data. */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe.     */
-DoublyLinkedList *List_append(DoublyLinkedList *pDoublyLinkedList, void * data);
-
-/* Rajoute un element apres l'element before. Si l'element before  */
-/* n'est pas trouve alors le nouvel element sera rajoute a la fin. */
-/* Renvoie ne nouveau point d'entree de la DoublyLinkedListe pDoublyLinkedList.            */
-DoublyLinkedList *List_insert_after_item(DoublyLinkedList *pDoublyLinkedList, void * before, void * data);
-
-/* Concatene la DoublyLinkedListe p2 a la DoublyLinkedListe p1 (p1 devant, p2 derriere)             */
-/* Renvoie la nouvelle DoublyLinkedListe cree. p1 et p2 sont consideres comme detruites */
-DoublyLinkedList *List_concat(DoublyLinkedList *p1, DoublyLinkedList *p2);
-
-/* Empile data a la fin de la DoublyLinkedListe pDoublyLinkedList.              */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe pDoublyLinkedList. */
-/* void List_push(DoublyLinkedList *pDoublyLinkedList, void * data);           */
-#define List_push(pDoublyLinkedList,data) List_append(pDoublyLinkedList,data)
-
-/* Depile le dernier element de la DoublyLinkedListe pDoublyLinkedList.                  */
-/* Le dernier est place dans data et est sorti de la DoublyLinkedListe       */
-/* List_pop renvoie le nouveau point d'entree de la DoublyLinkedListe pDoublyLinkedList. */
-DoublyLinkedList *List_pop(DoublyLinkedList *pDoublyLinkedList, void ** data);
-
-/* Renvoie une copie de la DoublyLinkedListe pDoublyLinkedList. Les pointeurs data sont copies */
-/* pas le contenu pointe. Il s'agit d'une DoublyLinkedListe avec des "alias" sur   */
-/* les elements de la premiere DoublyLinkedListe.                                  */
-DoublyLinkedList *List_copy(DoublyLinkedList *pDoublyLinkedList);
-
-/* Renvoie une copie de la DoublyLinkedListe pDoublyLinkedList. Les donnees contenu dans la DoublyLinkedListe sont copies */
-/* avec la fonction copy_func. Elle recoit le pointeur de l'element d'origine et doit */
-/* renvoyer un pointeur vers la copie.                                                */
-DoublyLinkedList *List_copy_full(DoublyLinkedList *pDoublyLinkedList, void * (* copy_func)(void * data));
-
-/* Libere la DoublyLinkedListe (pas les elements) */
-void List_free(DoublyLinkedList *pDoublyLinkedList);
-
-/* Libere la DoublyLinkedListe et appele la procedure free_func pour chaque elements */
-void List_free_full(DoublyLinkedList *pDoublyLinkedList, void (* free_func)(void * data));
-
-/* Libere la DoublyLinkedListe et appele la procedure free (du C) pour chaque elements */
-void List_free_full_simple(DoublyLinkedList *pDoublyLinkedList);
-
-/* Libere un element de la DoublyLinkedListe (pas ce que l'element pointe si c'est un pointeur) */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe.                                   */
-DoublyLinkedList *List_free_item(DoublyLinkedList *pDoublyLinkedList, void * data);
-
-/* Libere un element de la DoublyLinkedListe (pas ce que l'element pointe si c'est un pointeur) */
-/* Si l'element a ete libere alors done == TRUE sinon FALSE.                        */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe.                                   */
-DoublyLinkedList *List_free_item_with_check(DoublyLinkedList *pDoublyLinkedList, void * data, BOOL *done);
-
-/* Libere un element de la DoublyLinkedListe pDoublyLinkedList (pas la donnee pointe par data) */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe.                      */
-DoublyLinkedList *List_free_chunk(DoublyLinkedList *pDoublyLinkedList, DoublyLinkedList *pToFree);
-
-/* Renvoi le nombre d'element contenue dans la DoublyLinkedListe */
-/* Cette operation est realisee par comptage.        */
-int List_nb_item(DoublyLinkedList *pDoublyLinkedList);
-
-/* Renvoie l'element a la position item_nb dans la DoublyLinkedListe pDoublyLinkedList */
-/* Si l'element item_nb n'exite pas, la fonction renvoi NULL.  */
-/* item_nb commence a 1.                                       */
-void * List_item(DoublyLinkedList *pDoublyLinkedList, int item_nb);
-
-/* Renvoie la donnee correspondant a l'element de DoublyLinkedListe pDoublyLinkedList */
-/* void * List_data(DoublyLinkedList *pDoublyLinkedList);                            */
-#define List_data(pDoublyLinkedList) ((pDoublyLinkedList)?(pDoublyLinkedList)->data:NULL)
-
-/* Renvoie l'element a la derniere position de la DoublyLinkedListe pDoublyLinkedList. */
-/* Renvoie NULL si la DoublyLinkedListe est vide.                          */
-/* DoublyLinkedList *List_last(DoublyLinkedList *pDoublyLinkedList);                               */
-#define List_last(pDoublyLinkedList) ((pDoublyLinkedList)?(pDoublyLinkedList)->prev:NULL)
-
-/* Renvoie TRUE si la DoublyLinkedListe pDoublyLinkedList est vide. Renvoie FALSE sinon. */
-/* BOOL List_is_empty(DoublyLinkedList *pDoublyLinkedList);                           */
-#define List_is_empty(pDoublyLinkedList) (pDoublyLinkedList == NULL)
-
-/* Renvoie TRUE si pCurrentDoublyLinkedList est au dela du dernier   */
-/* element de la DoublyLinkedListe pDoublyLinkedList. Sinon renvoie FALSE        */
-/* BOOL List_is_end(DoublyLinkedList *pDoublyLinkedList, DoublyLinkedList *pCurrentDoublyLinkedList); */
-#define List_is_end(pDoublyLinkedList,pCurrentDoublyLinkedList) (pCurrentDoublyLinkedList == NULL)
-
-/* Renvoie TRUE si pCurrentDoublyLinkedList est le premier            */
-/* element de la DoublyLinkedListe pDoublyLinkedList. Sinon renvoie FALSE         */
-/* BOOL List_is_first(DoublyLinkedList *pDoublyLinkedList, DoublyLinkedList *pCurrentDoublyLinkedList);*/
-#define List_is_first(pDoublyLinkedList,pCurrentDoublyLinkedList) ((pCurrentDoublyLinkedList) == pDoublyLinkedList)
-
-/* Renvoie TRUE si pCurrentDoublyLinkedList est le dernier            */
-/* element de la DoublyLinkedListe pDoublyLinkedList. Sinon renvoie FALSE         */
-/* BOOL List_is_last(DoublyLinkedList *pDoublyLinkedList, DoublyLinkedList *pCurrentDoublyLinkedList); */
-#define List_is_last(pDoublyLinkedList,pCurrentDoublyLinkedList)\
-  ((pCurrentDoublyLinkedList != NULL) && (pDoublyLinkedList != NULL) && ((pCurrentDoublyLinkedList)->next == pDoublyLinkedList))
-
-/* Renvoie l'element apres pCurrentDoublyLinkedList dans la DoublyLinkedListe pDoublyLinkedList.       */
-/* Si on arrive au dela de la fin de la DoublyLinkedListe pDoublyLinkedList, renvoie NULL. */
-/* DoublyLinkedList *List_next(DoublyLinkedList *pDoublyLinkedList, DoublyLinkedList *pCurrentDoublyLinkedList);               */
-#define List_next(pDoublyLinkedList,pCurrentDoublyLinkedList)\
-  (((pCurrentDoublyLinkedList)&&((pCurrentDoublyLinkedList)->next!=pDoublyLinkedList))?(pCurrentDoublyLinkedList)->next:NULL)
-
-/* Renvoie l'element avant pCurrentDoublyLinkedList dans la DoublyLinkedListe pDoublyLinkedList.          */
-/* Si l'element precedent est avant le premier element, renvoie NULL. */
-/* DoublyLinkedList *List_prev(DoublyLinkedList *pDoublyLinkedList, DoublyLinkedList *pCurrentDoublyLinkedList);                  */
-#define List_prev(pDoublyLinkedList,pCurrentDoublyLinkedList)\
-  (((pCurrentDoublyLinkedList)&&((pCurrentDoublyLinkedList)!=pDoublyLinkedList))?(pCurrentDoublyLinkedList)->prev:NULL)
-
-/* Deplace pCurrentDoublyLinkedList sur le prochain element de la DoublyLinkedListe pDoublyLinkedList */
-/* Si on arrive a la fin pCurrentDoublyLinkedList devient NULL.               */
-/* void List_move_next(DoublyLinkedList *pDoublyLinkedList, DoublyLinkedList *pCurrentDoublyLinkedList);          */
-#define List_move_next(pDoublyLinkedList,pCurrentDoublyLinkedList) (pCurrentDoublyLinkedList = List_next(pDoublyLinkedList,pCurrentDoublyLinkedList))
-
-/* Deplace pCurrentDoublyLinkedList sur l'element precedent de la DoublyLinkedListe pDoublyLinkedList         */
-/* Si on arrive avant le premier element alors pCurrentDoublyLinkedList devient NULL. */
-/* void List_move_prev(DoublyLinkedList *pDoublyLinkedList, DoublyLinkedList *pCurrentDoublyLinkedList);                  */
-#define List_move_prev(pDoublyLinkedList,pCurrentDoublyLinkedList) (pCurrentDoublyLinkedList = List_prev(pDoublyLinkedList,pCurrentDoublyLinkedList))
-
-/* Trie la DoublyLinkedListe pDoublyLinkedList. La fonction cmp_func est utilise pour  */
-/* determine l'ordre. Elle doit renvoyer 0 si p1 pointe sur un */
-/* element equivalent a p2. < 0 si p1 est inferieur a p2, >0   */
-/* si p2 est superieur a p1.                                   */
-/* Renvoie la DoublyLinkedListe triee.                                     */
-DoublyLinkedList *List_sort(DoublyLinkedList *pDoublyLinkedList,int (* cmp_func)(void * p1, void * p2));
-
-/* Insere l'element data dans la DoublyLinkedListe pDoublyLinkedList de maniere trie */
-/* d'apres la fonction cmp_func. Elle doit renvoyer 0 si p1  */
-/* pointe sur un element equivalent a p2. < 0 si p1 est      */
-/* inferieur a p2, >0 si p2 est superieur a p1.              */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe.            */
-DoublyLinkedList *List_insert_sorted(DoublyLinkedList *pDoublyLinkedList,int (* cmp_func)(void * p1, void * p2),
-                         void * data);
-
-/* Inverse l'ordre des elements de la DoublyLinkedListe pDoublyLinkedList          */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe           */
-/* Cette operation peut ce faire pendant que l'on parcours */
-/* (pas au sens multithreade du terme)                     */
-/* la DoublyLinkedListe mais bien evidemment, le sens s'inverse.       */
-DoublyLinkedList *List_invert(DoublyLinkedList *pDoublyLinkedList);
-
-/* Recherche l'element de DoublyLinkedListe qui contient la premiere donnee data */
-/* Renvoie l'element de DoublyLinkedListe si trouve, NULL sinon.                 */
-DoublyLinkedList *List_find(DoublyLinkedList *pDoublyLinkedList, void * data);
-
-/* Recherche l'element de DoublyLinkedListe qui contient la premiere donnee pour laquelle la */
-/* fonction find_func renvoie TRUE. La fonction find_func prend en parametre le  */
-/* pointeur contenu dans la DoublyLinkedListe et le pointeur your_data qui est donne par     */
-/* l'utilisateur (pour y stocker ce dont il a besoin pour la comparaison).       */
-/* Renvoie l'element de DoublyLinkedListe si trouve, NULL sinon.                             */
-DoublyLinkedList *List_find_full(DoublyLinkedList *pDoublyLinkedList, void * your_data,  BOOL (* find_func)(void * data, void * your_data));
-
-#endif /* _DOUBLY_LINKED_LIST_ */
-
diff --git a/scilab/libs/doublylinkedlist/license.txt b/scilab/libs/doublylinkedlist/license.txt
deleted file mode 100644 (file)
index bf0df49..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-
-DoublyLinkedList:
-=================
-Files: includes/DoublyLinkedList.h src/DoublyLinkedList.c
-
-Copyright: Daniel Lacroix 
-
-License:
-Release in the public domain
diff --git a/scilab/libs/doublylinkedlist/src/DoublyLinkedList.c b/scilab/libs/doublylinkedlist/src/DoublyLinkedList.c
deleted file mode 100644 (file)
index 3b17f32..0000000
+++ /dev/null
@@ -1,576 +0,0 @@
-
-/*************************************************************************/
-/* Doubly Linked DoublyLinkedList Management                             */
-/* DoublyLinkedList.c                                                    */
-/*                                                                       */
-/* Authors : Daniel Lacroix (Public Domain)                              */
-/* Software by Daniel Lacroix 15/09/2006.                                */
-/* Modification : Jean-Baptiste Silvy for compatibility with Scilab      */
-/*                                                                       */
-/* TODO : Translate comments and use doxygen help syntax                 */
-/*                                                                       */
-/*************************************************************************/
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "DoublyLinkedList.h"
-#include "MALLOC.h"
-
-/*****************************************************/
-/**
- * Rajoute en tete de la DoublyLinkedListe pDoublyLinkedList l'element data.
- * Renvoie le nouveau point d'entree de la DoublyLinkedListe.
- * @param pDoublyLinkedList
- * @param data
- * @return DoublyLinkedList
- */
-DoublyLinkedList *List_prepend(DoublyLinkedList *pDoublyLinkedList, void * data)
-{
-       DoublyLinkedList *vDoublyLinkedList;
-
-       /* on alloue la memoire pour le nouvel element */
-       if((vDoublyLinkedList = (DoublyLinkedList *)MALLOC(sizeof(DoublyLinkedList))) == NULL)
-               { printf("MALLOC failed.\n"); return NULL ; }
-
-       if(pDoublyLinkedList == NULL)
-               { /* the DoublyLinkedListe is empty */
-                       vDoublyLinkedList->data = data;
-                       vDoublyLinkedList->prev = vDoublyLinkedList;
-                       vDoublyLinkedList->next = vDoublyLinkedList;
-               } else {
-                       /* il y a deja au moins un element dans la DoublyLinkedListe */
-                       vDoublyLinkedList->data = data;
-                       vDoublyLinkedList->prev = pDoublyLinkedList->prev;
-                       vDoublyLinkedList->next = pDoublyLinkedList;
-                       pDoublyLinkedList->prev->next = vDoublyLinkedList;
-                       pDoublyLinkedList->prev = vDoublyLinkedList;
-               }
-       return(vDoublyLinkedList);
-}
-/*****************************************************/
-
-/******************************************************/
-/**
- * Rajoute en queue de la DoublyLinkedListe pDoublyLinkedList l'element data.
- * Renvoie le nouveau point d'entree de la DoublyLinkedListe.
- * @param pDoublyLinkedList
- * @param data
- * @return DoublyLinkedList
- */
-DoublyLinkedList *List_append(DoublyLinkedList *pDoublyLinkedList, void *  data)
-{
-       DoublyLinkedList *vDoublyLinkedList;
-
-       /* on alloue la memoire pour le nouvelle element */
-       if((vDoublyLinkedList = (DoublyLinkedList *)MALLOC(sizeof(DoublyLinkedList))) == NULL)
-               { printf("MALLOC failed.\n"); return NULL ; }
-
-       if(pDoublyLinkedList == NULL)
-               { /* la DoublyLinkedListe est vide */
-                       vDoublyLinkedList->data = data;
-                       vDoublyLinkedList->prev = vDoublyLinkedList;
-                       vDoublyLinkedList->next = vDoublyLinkedList;
-                       return(vDoublyLinkedList);
-               } else {
-                       /* il y a deja au moins un element dans la DoublyLinkedListe */
-                       vDoublyLinkedList->data = data;
-                       vDoublyLinkedList->prev = pDoublyLinkedList->prev;
-                       vDoublyLinkedList->next = pDoublyLinkedList;
-                       pDoublyLinkedList->prev->next = vDoublyLinkedList;
-                       pDoublyLinkedList->prev = vDoublyLinkedList;
-                       return(pDoublyLinkedList);
-               }
-}
-/******************************************************/
-
-/**************************************/
-/**
- * Libere la DoublyLinkedListe (pas les elements)
- * @param DoublyLinkedList
- */
-void List_free(DoublyLinkedList *pDoublyLinkedList)
-{
-       DoublyLinkedList *vDoublyLinkedListMove,*vDoublyLinkedListMoveNext;
-
-       vDoublyLinkedListMove = pDoublyLinkedList;
-       while(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove))
-               {
-                       vDoublyLinkedListMoveNext = List_next(pDoublyLinkedList,vDoublyLinkedListMove);
-                       FREE(vDoublyLinkedListMove);
-                       vDoublyLinkedListMove = vDoublyLinkedListMoveNext;
-               }
-}
-/**************************************/
-
-/*************************************************************************/
-/* Libere la DoublyLinkedListe et appele la procedure FREE_func pour chaque elements */
-void List_free_full(DoublyLinkedList *pDoublyLinkedList, void (* FREE_func)(void *  data))
-{
-       DoublyLinkedList *vDoublyLinkedListMove,*vDoublyLinkedListMoveNext;
-
-       vDoublyLinkedListMove = pDoublyLinkedList;
-       while(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove))
-               {
-                       vDoublyLinkedListMoveNext = List_next(pDoublyLinkedList,vDoublyLinkedListMove);
-                       FREE_func(vDoublyLinkedListMove->data);
-                       FREE(vDoublyLinkedListMove);
-                       vDoublyLinkedListMove = vDoublyLinkedListMoveNext;
-               }
-}
-/*************************************************************************/
-
-/***************************************************************************/
-/* Libere la DoublyLinkedListe et appele la procedure FREE (du C) pour chaque elements */
-void List_free_full_simple(DoublyLinkedList *pDoublyLinkedList)
-{
-       DoublyLinkedList *vDoublyLinkedListMove,*vDoublyLinkedListMoveNext;
-
-       vDoublyLinkedListMove = pDoublyLinkedList;
-       while(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove))
-               {
-                       vDoublyLinkedListMoveNext = List_next(pDoublyLinkedList,vDoublyLinkedListMove);
-                       if(vDoublyLinkedListMove->data != NULL) FREE(vDoublyLinkedListMove->data);
-                       FREE(vDoublyLinkedListMove);
-                       vDoublyLinkedListMove = vDoublyLinkedListMoveNext;
-               }
-}
-/***************************************************************************/
-
-/*****************************************************/
-/* Renvoi le nombre d'element contenue dans la DoublyLinkedListe */
-/* Cette operation est realisee par comptage.        */
-int List_nb_item(DoublyLinkedList *pDoublyLinkedList)
-{
-       DoublyLinkedList *vDoublyLinkedListMove;
-       int compteur = 0;
-
-       vDoublyLinkedListMove = pDoublyLinkedList;
-       while(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove))
-               {
-                       compteur++;
-                       List_move_next(pDoublyLinkedList,vDoublyLinkedListMove);
-               }
-       return(compteur);
-}
-/*****************************************************/
-
-/************************************************************************************/
-/* Libere un element de la DoublyLinkedListe (pas ce que l'element pointe si c'est un pointeur) */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe.                                   */
-DoublyLinkedList *List_free_item(DoublyLinkedList *pDoublyLinkedList, void *  data)
-{
-       DoublyLinkedList *vDoublyLinkedListMove,*vDoublyLinkedListMoveNext;
-
-       /* on parcourt la DoublyLinkedListe pDoublyLinkedList a la recherche de l'element a supprimer */
-       vDoublyLinkedListMove = pDoublyLinkedList;
-       while(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove) && (vDoublyLinkedListMove->data != data))
-               { List_move_next(pDoublyLinkedList,vDoublyLinkedListMove); }
-       /* si on a trouve l'element, on le libere */
-       if(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove))
-               {
-                       /* si il n'y a que notre element dans la DoublyLinkedListe */
-                       if(vDoublyLinkedListMove->next == vDoublyLinkedListMove)
-                               { /* on libere l'element */
-                                       FREE(vDoublyLinkedListMove);
-                                       /* on renvoie une DoublyLinkedListe vide */
-                                       return(NULL);
-                               } else {
-                                       /* on recupere l'element qui suit celui que l'on veut supprimer */
-                                       vDoublyLinkedListMoveNext = vDoublyLinkedListMove->next;
-                                       /* on chaine l'element precedent avec celui qui suit */
-                                       vDoublyLinkedListMove->prev->next = vDoublyLinkedListMoveNext;
-                                       vDoublyLinkedListMoveNext->prev = vDoublyLinkedListMove->prev;
-                                       /* on libere l'element a liberer */
-                                       FREE(vDoublyLinkedListMove);
-                                       if(pDoublyLinkedList == vDoublyLinkedListMove)
-                                               {
-                                                       /* l'element a supprimer etait le premier, c'est */
-                                                       /* donc le suivant qui devient le premier        */
-                                                       return(vDoublyLinkedListMoveNext);
-                                               } else {
-                                                       /* l'element a supprimer n'etait pas le premier.       */
-                                                       /* le premiere element de la DoublyLinkedListe ne change donc pas. */
-                                                       return(pDoublyLinkedList);
-                                               }
-                               }
-               }
-       /* si on est ici c'est l'element a supprimer n'existe */
-       /* pas dans la DoublyLinkedListe. on rend donc la DoublyLinkedListe intacte.  */
-       return(pDoublyLinkedList);
-}
-/************************************************************************************/
-
-/************************************************************************************/
-/* Libere un element de la DoublyLinkedListe (pas ce que l'element pointe si c'est un pointeur) */
-/* Si l'element a ete libere alors done == TRUE sinon FALSE.                        */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe.                                   */
-DoublyLinkedList *List_free_item_with_check(DoublyLinkedList *pDoublyLinkedList, void *  data, BOOL *done)
-{
-       DoublyLinkedList *vDoublyLinkedListMove,*vDoublyLinkedListMoveNext;
-
-       /* on parcourt la DoublyLinkedListe pDoublyLinkedList a la recherche de l'element a supprimer */
-       vDoublyLinkedListMove = pDoublyLinkedList;
-       while(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove) && (vDoublyLinkedListMove->data != data))
-               { List_move_next(pDoublyLinkedList,vDoublyLinkedListMove); }
-       /* si on a trouve l'element, on le libere */
-       if(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove))
-               {
-                       /* on signal que l'element a bien etait trouve */
-                       *done = TRUE;
-                       /* si il n'y a que notre element dans la DoublyLinkedListe */
-                       if(vDoublyLinkedListMove->next == vDoublyLinkedListMove)
-                               { /* on libere l'element */
-                                       FREE(vDoublyLinkedListMove);
-                                       /* on renvoie une DoublyLinkedListe vide */
-                                       return(NULL);
-                               } else {
-                                       /* on recupere l'element qui suit celui que l'on veut supprimer */
-                                       vDoublyLinkedListMoveNext = vDoublyLinkedListMove->next;
-                                       /* on chaine l'element precedent avec celui qui suit */
-                                       vDoublyLinkedListMove->prev->next = vDoublyLinkedListMoveNext;
-                                       vDoublyLinkedListMoveNext->prev = vDoublyLinkedListMove->prev;
-                                       /* on libere l'element a liberer */
-                                       FREE(vDoublyLinkedListMove);
-                                       if(pDoublyLinkedList == vDoublyLinkedListMove)
-                                               {
-                                                       /* l'element a supprimer etait le premier, c'est */
-                                                       /* donc le suivant qui devient le premier        */
-                                                       return(vDoublyLinkedListMoveNext);
-                                               } else {
-                                                       /* l'element a supprimer n'etait pas le premier.       */
-                                                       /* le premiere element de la DoublyLinkedListe ne change donc pas. */
-                                                       return(pDoublyLinkedList);
-                                               }
-                               }
-               }
-       /* si on est ici c'est l'element a supprimer n'existe pas dans la DoublyLinkedListe.*/
-       /* on signal de fait que l'on n'a pas trouve l'element cherche.         */
-       *done = FALSE;
-       /* on rend donc la DoublyLinkedListe intacte. */
-       return(pDoublyLinkedList);
-}
-/************************************************************************************/
-
-/***************************************************************/
-/* Renvoie l'element a la position item_nb dans la DoublyLinkedListe pDoublyLinkedList */
-/* Si l'element item_nb n'exite pas, la fonction renvoi NULL.  */
-/* item_nb commence a 1.                                       */
-void *  List_item(DoublyLinkedList *pDoublyLinkedList, int item_nb)
-{
-       DoublyLinkedList *vDoublyLinkedListMove;
-       int offset=0;
-
-       vDoublyLinkedListMove = pDoublyLinkedList;
-       while(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove) && (offset<item_nb-1))
-               { List_move_next(pDoublyLinkedList,vDoublyLinkedListMove); offset++; }
-
-       if(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove))
-               { /* si il y a bien un element a la position demande, on le renvoie */
-                       return(vDoublyLinkedListMove->data);
-               } else {
-                       /* si on c'est retrouve a la fin de la DoublyLinkedListe, il n'y a pas d'element */
-                       /* a la postion demande. On renvoie donc NULL pour le signaler       */
-                       return(NULL);
-               }
-}
-/***************************************************************/
-
-/*******************************************************************/
-/* Rajoute un element apres l'element before. Si l'element before  */
-/* n'est pas trouve alors le nouvel element sera rajoute a la fin. */
-/* Renvoie ne nouveau point d'entree de la DoublyLinkedListe pDoublyLinkedList.            */
-DoublyLinkedList *List_insert_after_item(DoublyLinkedList *pDoublyLinkedList, void *  before, void *  data)
-{
-       DoublyLinkedList *vDoublyLinkedList;
-       DoublyLinkedList *vDoublyLinkedListMove;
-
-       /* on alloue la memoire pour le nouvelle element */
-       if((vDoublyLinkedList = (DoublyLinkedList *)MALLOC(sizeof(DoublyLinkedList))) == NULL)
-               { printf("MALLOC failed.\n"); return NULL; }
-
-       vDoublyLinkedListMove = pDoublyLinkedList;
-       while(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove) && (vDoublyLinkedListMove->data != before))
-               { List_move_next(pDoublyLinkedList,vDoublyLinkedListMove); }
-
-       /* si on a trouve l'element precedent */
-       if(!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove))
-               {
-                       vDoublyLinkedList->data = data;
-                       vDoublyLinkedList->prev = vDoublyLinkedListMove;
-                       vDoublyLinkedList->next = vDoublyLinkedListMove->next;
-                       vDoublyLinkedListMove->next = vDoublyLinkedList;
-                       vDoublyLinkedList->next->prev = vDoublyLinkedList;
-                       return(pDoublyLinkedList);
-                       /* si on n'a pas trouve l'element precedent */
-               } else {
-                       if(pDoublyLinkedList == NULL)
-                               { /* si la DoublyLinkedListe est vide */
-                                       vDoublyLinkedList->data = data;
-                                       vDoublyLinkedList->prev = vDoublyLinkedList;
-                                       vDoublyLinkedList->next = vDoublyLinkedList;
-                                       return(vDoublyLinkedList);
-                               } else {
-                                       /* c'est une insertion en queue d'une DoublyLinkedListe non vide */
-                                       vDoublyLinkedList->data = data;
-                                       vDoublyLinkedList->prev = pDoublyLinkedList->prev;
-                                       vDoublyLinkedList->next = pDoublyLinkedList;
-                                       vDoublyLinkedList->prev->next = vDoublyLinkedList;
-                                       pDoublyLinkedList->prev = vDoublyLinkedList;
-                                       return(pDoublyLinkedList);
-                               }
-               }
-}
-/*********************************************************************/
-
-/****************************************************************************/
-/* Concatene la DoublyLinkedListe p2 a la DoublyLinkedListe p1 (p1 devant, p2 derriere)             */
-/* Renvoie la nouvelle DoublyLinkedListe cree. p1 et p2 sont consideres comme detruites */
-DoublyLinkedList *List_concat(DoublyLinkedList *p1, DoublyLinkedList *p2)
-{
-       DoublyLinkedList *vDoublyLinkedListPrev;
-
-       if(p1 == NULL) return(p2);
-       if(p2 == NULL) return(p1);
-
-       p1->prev->next = p2;
-       vDoublyLinkedListPrev = p1->prev;
-       p1->prev = p2->prev;
-       p2->prev->next = p1;
-       p2->prev = vDoublyLinkedListPrev;
-
-       return(p1);
-}
-/****************************************************************************/
-
-/*****************************************************************/
-/* Depile le dernier element de la DoublyLinkedListe pDoublyLinkedList.                  */
-/* Le dernier est place dans data et est sorti de la DoublyLinkedListe       */
-/* List_pop renvoie le nouveau point d'entree de la DoublyLinkedListe pDoublyLinkedList. */
-DoublyLinkedList *List_pop(DoublyLinkedList *pDoublyLinkedList, void *  *data)
-{
-       DoublyLinkedList *vDoublyLinkedListPrev;
-
-       if(pDoublyLinkedList == NULL) { *data = NULL; return(NULL); }
-
-       /* si il n'y a que notre element dans la DoublyLinkedListe */
-       if(pDoublyLinkedList->next == pDoublyLinkedList)
-               {
-                       *data = pDoublyLinkedList->data;
-                       /* on libere l'element */
-                       FREE(pDoublyLinkedList);
-                       /* on renvoie une DoublyLinkedListe vide */
-                       return(NULL);
-               } else {
-                       *data = pDoublyLinkedList->prev->data;
-                       vDoublyLinkedListPrev = pDoublyLinkedList->prev->prev;
-                       vDoublyLinkedListPrev->next = pDoublyLinkedList;
-                       FREE(pDoublyLinkedList->prev);
-                       pDoublyLinkedList->prev = vDoublyLinkedListPrev;
-                       return(pDoublyLinkedList);
-               }
-}
-/*****************************************************************/
-
-/***********************************************************************/
-/* Renvoie une copie de la DoublyLinkedListe pDoublyLinkedList. Les pointeurs data sont copies */
-/* pas le contenu pointe. Il s'agit d'une DoublyLinkedListe avec des "alias" sur   */
-/* les elements de la premiere DoublyLinkedListe.                                  */
-DoublyLinkedList *List_copy(DoublyLinkedList *pDoublyLinkedList)
-{
-       DoublyLinkedList *vDoublyLinkedListMove, *vCopy;
-
-       vCopy = DoublyLinkedList_new();
-       for(vDoublyLinkedListMove = pDoublyLinkedList;!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove);List_move_next(pDoublyLinkedList,vDoublyLinkedListMove))
-               {
-                       vCopy = List_append(vCopy, vDoublyLinkedListMove->data);
-               }
-       return(vCopy);
-}
-/***********************************************************************/
-
-/**************************************************************************************/
-/* Renvoie une copie de la DoublyLinkedListe pDoublyLinkedList. Les donnees contenu dans la DoublyLinkedListe sont copies */
-/* avec la fonction copy_func. Elle recoit le pointeur de l'element d'origine et doit */
-/* renvoyer un pointeur vers la copie.                                                */
-DoublyLinkedList *List_copy_full(DoublyLinkedList *pDoublyLinkedList, void *  (* copy_func)(void *  data))
-{
-       DoublyLinkedList *vDoublyLinkedListMove, *vCopy;
-
-       vCopy = DoublyLinkedList_new();
-       for(vDoublyLinkedListMove = pDoublyLinkedList;!List_is_end(pDoublyLinkedList,vDoublyLinkedListMove);List_move_next(pDoublyLinkedList,vDoublyLinkedListMove))
-               {
-                       vCopy = List_append(vCopy, copy_func(vDoublyLinkedListMove->data));
-               }
-       return(vCopy);
-}
-/**************************************************************************************/
-
-/***********************************************************************/
-/* Libere un element de la DoublyLinkedListe pDoublyLinkedList (pas la donnee pointe par data) */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe.                      */
-DoublyLinkedList *List_free_chunk(DoublyLinkedList *pDoublyLinkedList, DoublyLinkedList *pToFREE)
-{
-       DoublyLinkedList *vDoublyLinkedListNext;
-
-       if(pDoublyLinkedList == NULL) return(NULL);
-       if(pToFREE == NULL) return(pDoublyLinkedList);
-
-       /* si il n'y a que notre element dans la DoublyLinkedListe */
-       if(pToFREE->next == pToFREE)
-               { /* on libere l'element */
-                       FREE(pToFREE);
-                       /* on renvoie une DoublyLinkedListe vide */
-                       return(NULL);
-               } else {
-                       /* on recupere l'element qui suit celui que l'on veut supprimer */
-                       vDoublyLinkedListNext = pToFREE->next;
-                       /* on chaine l'element precedent avec celui qui suit */
-                       pToFREE->prev->next = vDoublyLinkedListNext;
-                       vDoublyLinkedListNext->prev = pToFREE->prev;
-                       /* on libere l'element a liberer */
-                       FREE(pToFREE);
-                       if(pDoublyLinkedList == pToFREE)
-                               {
-                                       /* l'element a supprimer etait le premier, c'est */
-                                       /* donc le suivant qui devient le premier        */
-                                       return(vDoublyLinkedListNext);
-                               } else {
-                                       /* l'element a supprimer n'etait pas le premier.       */
-                                       /* le premiere element de la DoublyLinkedListe ne change donc pas. */
-                                       return(pDoublyLinkedList);
-                               }
-               }
-}
-/***********************************************************************/
-
-/***************************************************************/
-/* Trie la DoublyLinkedListe pDoublyLinkedList. La fonction cmp_func est utilise pour  */
-/* determine l'ordre. Elle doit renvoyer 0 si p1 pointe sur un */
-/* element equivalent a p2. < 0 si p1 est inferieur a p2, >0   */
-/* si p2 est superieur a p1.                                   */
-/* Renvoie la DoublyLinkedListe triee.                                     */
-DoublyLinkedList *List_sort(DoublyLinkedList *pDoublyLinkedList,int (* cmp_func)(void *  p1, void *  p2))
-{
-       DoublyLinkedList *vDoublyLinkedListMove;
-       DoublyLinkedList *vDoublyLinkedListSmallest;
-       DoublyLinkedList *vDoublyLinkedListRes;
-
-       vDoublyLinkedListRes = DoublyLinkedList_new();
-
-       /* l'algorithme de trie utilise est le trie par selection          */
-       /* cela consiste a chercher le plus petit element le sortir de     */
-       /* la DoublyLinkedListe pDoublyLinkedList et le rajouter a la fin de la DoublyLinkedListe vDoublyLinkedListRes     */
-       /* et de repeter cela jusqu'a ce qu'il n'y ai plus rien dans pDoublyLinkedList */
-       while(!List_is_empty(pDoublyLinkedList))
-               {
-                       for(vDoublyLinkedListMove = List_next(pDoublyLinkedList,pDoublyLinkedList), vDoublyLinkedListSmallest = pDoublyLinkedList;
-                               !List_is_end(pDoublyLinkedList,vDoublyLinkedListMove); List_move_next(pDoublyLinkedList,vDoublyLinkedListMove))
-                               {
-                                       if(cmp_func(List_data(vDoublyLinkedListMove),List_data(vDoublyLinkedListSmallest)) < 0)
-                                               { vDoublyLinkedListSmallest = vDoublyLinkedListMove; }
-                               }
-                       vDoublyLinkedListRes = List_append(vDoublyLinkedListRes,List_data(vDoublyLinkedListSmallest));
-                       pDoublyLinkedList = List_free_chunk(pDoublyLinkedList, vDoublyLinkedListSmallest);
-               }
-
-       return(vDoublyLinkedListRes);
-}
-/***************************************************************/
-
-/*************************************************************/
-/* Insere l'element data dans la DoublyLinkedListe pDoublyLinkedList de maniere trie */
-/* d'apres la fonction cmp_func. Elle doit renvoyer 0 si p1  */
-/* pointe sur un element equivalent a p2. < 0 si p1 est      */
-/* inferieur a p2, >0 si p2 est superieur a p1.              */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe.            */
-DoublyLinkedList *List_insert_sorted(DoublyLinkedList *pDoublyLinkedList,int (* cmp_func)(void *  p1, void *  p2), void *  data)
-{
-       DoublyLinkedList *vDoublyLinkedListMove, *vDoublyLinkedList, *tmp;
-
-       /* on recherche le premier element superieur ou egale au nouveau */
-       for(vDoublyLinkedListMove = pDoublyLinkedList; !List_is_end(pDoublyLinkedList,vDoublyLinkedListMove) &&
-             (cmp_func(List_data(vDoublyLinkedListMove),data) < 0); ) {
-         tmp = List_move_next(pDoublyLinkedList,vDoublyLinkedListMove);
-         vDoublyLinkedListMove = tmp;
-       }
-
-       /* on alloue la memoire pour le nouvelle element */
-       if((vDoublyLinkedList = (DoublyLinkedList *)MALLOC(sizeof(DoublyLinkedList))) == NULL)
-               { printf("MALLOC failed.\n"); return NULL; }
-
-       if(List_is_empty(pDoublyLinkedList))
-               { /* si la DoublyLinkedListe est vide */
-                       vDoublyLinkedList->data = data;
-                       vDoublyLinkedList->prev = vDoublyLinkedList;
-                       vDoublyLinkedList->next = vDoublyLinkedList;
-                       return(vDoublyLinkedList);
-               } else {
-                       vDoublyLinkedList->data = data;
-                       vDoublyLinkedList->prev = vDoublyLinkedListMove->prev;
-                       vDoublyLinkedList->next = vDoublyLinkedListMove;
-                       vDoublyLinkedListMove->prev = vDoublyLinkedList;
-                       vDoublyLinkedList->prev->next = vDoublyLinkedList;
-                       if(pDoublyLinkedList == vDoublyLinkedListMove)
-                               return(vDoublyLinkedList);
-                       else
-                               return(pDoublyLinkedList);
-               }
-}
-/*************************************************************/
-
-/***********************************************************/
-/* Inverse l'ordre des elements de la DoublyLinkedListe pDoublyLinkedList          */
-/* Renvoie le nouveau point d'entree de la DoublyLinkedListe           */
-/* Cette operation peut ce faire pendant que l'on parcours */
-/* (pas au sens multithreade du terme)                     */
-/* la DoublyLinkedListe mais bien evidemment, le sens s'inverse.       */
-DoublyLinkedList *List_invert(DoublyLinkedList *pDoublyLinkedList)
-{
-       DoublyLinkedList *vDoublyLinkedListMove, *vDoublyLinkedListMoveNext;
-
-       if(pDoublyLinkedList == NULL) return(NULL);
-
-       vDoublyLinkedListMove = pDoublyLinkedList;
-       do {
-               vDoublyLinkedListMoveNext = vDoublyLinkedListMove->next;
-               vDoublyLinkedListMove->next = vDoublyLinkedListMove->prev;
-               vDoublyLinkedListMove->prev = vDoublyLinkedListMoveNext;
-               vDoublyLinkedListMove = vDoublyLinkedListMoveNext;
-       } while(vDoublyLinkedListMove != pDoublyLinkedList);
-       /* pDoublyLinkedList est devenu le dernier element, donc le premier est celui qui suit */
-       return(pDoublyLinkedList->next);
-}
-/***********************************************************/
-
-/*********************************************************************/
-/* Recherche l'element de DoublyLinkedListe qui contient la premiere donnee data */
-/* Renvoie l'element de DoublyLinkedListe si trouve, NULL sinon.                 */
-DoublyLinkedList *List_find(DoublyLinkedList *pDoublyLinkedList, void *  data)
-{
-       DoublyLinkedList *vDoublyLinkedListMove;
-
-       for(vDoublyLinkedListMove = pDoublyLinkedList; !List_is_end(pDoublyLinkedList,vDoublyLinkedListMove) && (List_data(vDoublyLinkedListMove) != data);
-               List_move_next(pDoublyLinkedList,vDoublyLinkedListMove));
-
-       return(vDoublyLinkedListMove);
-}
-/*********************************************************************/
-
-/*********************************************************************************/
-/* Recherche l'element de DoublyLinkedListe qui contient la premiere donnee pour laquelle la */
-/* fonction find_func renvoie TRUE. La fonction find_func prend en parametre le  */
-/* pointeur contenu dans la DoublyLinkedListe et le pointeur your_data qui est donne par     */
-/* l'utilisateur (pour y stocker ce dont il a besoin pour la comparaison).       */
-/* Renvoie l'element de DoublyLinkedListe si trouve, NULL sinon.                             */
-DoublyLinkedList *List_find_full(DoublyLinkedList *pDoublyLinkedList, void *  your_data, BOOL (* find_func)(void *  data, void *  your_data))
-{
-       DoublyLinkedList *vDoublyLinkedListMove;
-
-       for(vDoublyLinkedListMove = pDoublyLinkedList;
-               !List_is_end(pDoublyLinkedList,vDoublyLinkedListMove) && !find_func(List_data(vDoublyLinkedListMove),your_data);
-               List_move_next(pDoublyLinkedList,vDoublyLinkedListMove));
-
-       return(vDoublyLinkedListMove);
-}
-/*********************************************************************************/
index a096064..9578655 100644 (file)
@@ -18,9 +18,6 @@ Source: libs\MALLOC\includes\*.h; DestDir: {app}\libs\MALLOC\includes; Component
 ; dynamiclibrary directory
 Source: libs\dynamiclibrary\includes\*.h; DestDir: {app}\libs\dynamiclibrary\includes; Components: {#COMPN_SCILAB}
 ;
-; doublylinkedlist directory
-Source: libs\doublylinkedlist\includes\*.h; DestDir: {app}\libs\doublylinkedlist\includes; Components: {#COMPN_SCILAB}
-
 ; hashtable directory
 Source: libs\hashtable\*.h; DestDir: {app}\libs\hashtable\includes; Components: {#COMPN_SCILAB}
 ;
index edd5acb..c2524a5 100644 (file)
@@ -119,7 +119,6 @@ libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS)
 
 EXTERNAL_LIBS = $(top_builddir)/libs/hashtable/libscihashtable.la \
 $(top_builddir)/libs/MALLOC/libscimalloc.la  \
-$(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la  \
 $(top_builddir)/libs/libst/libscilibst.la
 
 
index 10dcce4..4874569 100644 (file)
@@ -496,7 +496,6 @@ libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS)
 #libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) -lstdc++
 EXTERNAL_LIBS = $(top_builddir)/libs/hashtable/libscihashtable.la \
 $(top_builddir)/libs/MALLOC/libscimalloc.la  \
-$(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la  \
 $(top_builddir)/libs/libst/libscilibst.la
 
 GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
index dbe4a99..143edf9 100644 (file)
@@ -18,7 +18,6 @@ libscicall_scilab_la_CPPFLAGS= -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
-                       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/action_binding/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
index d8ed66f..1f232d6 100644 (file)
@@ -446,7 +446,6 @@ libscicall_scilab_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
-                       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/action_binding/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
index e61a965..70ce6e6 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -108,7 +108,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -138,7 +138,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +176,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -275,4 +275,4 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index be8a56c..2b76b1c 100644 (file)
@@ -278,7 +278,6 @@ libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ \
        -I$(srcdir)/src/cpp/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
-       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
        -I$(top_srcdir)/modules/intersci/includes/ \
        -I$(top_srcdir)/modules/call_scilab/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
index f7d6737..507b180 100644 (file)
@@ -811,7 +811,6 @@ sci_gateway/fortran/sci_f_isglobal.f
 libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/cpp/ -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
-       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
        -I$(top_srcdir)/modules/intersci/includes/ \
        -I$(top_srcdir)/modules/call_scilab/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
index dda92d6..e881847 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">
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/GetWindowsVersion;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;../../../preferences/includes;../../../history_manager/includes;../../../external_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/GetWindowsVersion;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;../../../preferences/includes;../../../history_manager/includes;../../../external_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_USRDLL;CORE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -112,7 +112,7 @@ cd ..
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/GetWindowsVersion;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;../../../preferences/includes;../../../history_manager/includes;../../../external_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/GetWindowsVersion;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;../../../preferences/includes;../../../history_manager/includes;../../../external_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_USRDLL;CORE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -146,7 +146,7 @@ cd ..
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/GetWindowsVersion;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;../../../preferences/includes;../../../history_manager/includes;../../../external_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/GetWindowsVersion;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;../../../preferences/includes;../../../history_manager/includes;../../../external_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_USRDLL;CORE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -187,7 +187,7 @@ cd ..
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/GetWindowsVersion;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;../../../preferences/includes;../../../history_manager/includes;../../../external_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/GetWindowsVersion;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;../../../preferences/includes;../../../history_manager/includes;../../../external_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_USRDLL;CORE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -605,4 +605,4 @@ cd ..
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 9203d9f..38b4843 100644 (file)
@@ -62,7 +62,6 @@ libscigraphic_export_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/commons/src/jni \
-                               -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                                -I$(top_srcdir)/modules/graphic_objects/includes/ \
                                -I$(top_srcdir)/modules/gui/src/jni/ \
                                $(AM_CPPFLAGS)
index a7fd5ab..10caeec 100644 (file)
@@ -519,7 +519,6 @@ libscigraphic_export_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/commons/src/jni \
-                               -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                                -I$(top_srcdir)/modules/graphic_objects/includes/ \
                                -I$(top_srcdir)/modules/gui/src/jni/ \
                                $(AM_CPPFLAGS)
index 62f14f0..11633da 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">
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../commons/src/jni;../graphic_objects/includes;../gui/src/jni;../windows_tools/includes/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../commons/src/jni;../graphic_objects/includes;../gui/src/jni;../windows_tools/includes/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -110,7 +110,7 @@ lib /DEF:"$(ProjectDir)graphics_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../commons/src/jni;../graphic_objects/includes;../gui/src/jni;../windows_tools/includes/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../commons/src/jni;../graphic_objects/includes;../gui/src/jni;../windows_tools/includes/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -138,7 +138,7 @@ lib /DEF:"$(ProjectDir)graphics_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../commons/src/jni;../graphic_objects/includes;../gui/src/jni;../windows_tools/includes/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../commons/src/jni;../graphic_objects/includes;../gui/src/jni;../windows_tools/includes/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -172,7 +172,7 @@ lib /DEF:"$(ProjectDir)graphics_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../commons/src/jni;../graphic_objects/includes;../gui/src/jni;../windows_tools/includes/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../commons/src/jni;../graphic_objects/includes;../gui/src/jni;../windows_tools/includes/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -282,4 +282,4 @@ lib /DEF:"$(ProjectDir)graphics_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 66a62bf..4a69c79 100644 (file)
@@ -398,7 +398,6 @@ libscigraphics_la_CPPFLAGS = \
        -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(srcdir)/src/cpp/ \
-       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
        -I$(top_srcdir)/libs/hashtable/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/action_binding/includes/ \
@@ -479,7 +478,6 @@ libscigraphics_disable_la_CPPFLAGS = \
        -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(srcdir)/src/cpp/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
-       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
        -I$(top_srcdir)/libs/hashtable/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
index 911d03a..7d9310a 100644 (file)
@@ -1178,7 +1178,6 @@ libscigraphics_la_CPPFLAGS = \
        -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(srcdir)/src/cpp/ \
-       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
        -I$(top_srcdir)/libs/hashtable/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/action_binding/includes/ \
index dcf5f46..95b505b 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -105,7 +105,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -131,7 +131,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -165,7 +165,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     </Midl>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -626,10 +626,6 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ResourceCompile Include="graphic.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\libs\doublylinkedlist\doublylinkedlist.vcxproj">
-      <Project>{ed02137f-0a4f-4ef0-ac58-97ace37fa89d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\..\libs\hashtable\hashtable.vcxproj">
       <Project>{2daec214-b0b4-4bc3-96b2-77c6ad1450cd}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -680,4 +676,4 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 68b303f..a51071d 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">
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes;../c/getHandleProperty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes;../c/getHandleProperty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -98,7 +98,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes;../c/getHandleProperty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes;../c/getHandleProperty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes;../c/getHandleProperty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes;../c/getHandleProperty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes;../c/getHandleProperty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes;../c/getHandleProperty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index e66a04b..da7536b 100644 (file)
@@ -198,7 +198,6 @@ libscigui_la_CPPFLAGS = \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/jni/ \
-                       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                        -I$(top_srcdir)/libs/hashtable/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
index 053c9d3..808b927 100644 (file)
@@ -728,7 +728,6 @@ libscigui_la_CPPFLAGS = \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/jni/ \
-                       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                        -I$(top_srcdir)/libs/hashtable/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
index c86cc43..29fc2f9 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">
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 1231727..731f5f0 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">
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 10687f9..322659e 100644 (file)
@@ -74,7 +74,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes;src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 7d4141d..0a9e629 100644 (file)
@@ -47,7 +47,6 @@ libjavasci2_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        $(TCL_INC_PATH) \
                        $(TK_INC_PATH) \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
-                       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                        -I$(top_srcdir)/modules/tclsci/includes/ \
                        -I$(top_srcdir)/modules/call_scilab/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
index 30ad4c4..aa027c6 100644 (file)
@@ -460,7 +460,6 @@ libjavasci2_la_etc_DATA = etc/javasci.quit etc/javasci.start
 @JAVASCI_TRUE@                 $(TCL_INC_PATH) \
 @JAVASCI_TRUE@                 $(TK_INC_PATH) \
 @JAVASCI_TRUE@                 -I$(top_srcdir)/libs/MALLOC/includes/ \
-@JAVASCI_TRUE@                 -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
 @JAVASCI_TRUE@                 -I$(top_srcdir)/modules/tclsci/includes/ \
 @JAVASCI_TRUE@                 -I$(top_srcdir)/modules/call_scilab/includes/ \
 @JAVASCI_TRUE@                 -I$(top_srcdir)/modules/api_scilab/includes/ \
index 63c1cbc..a299191 100644 (file)
@@ -44,7 +44,6 @@ libscirenderer_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/commons/src/jni \
                                -I$(top_srcdir)/modules/graphics/includes/ \
                                -I$(top_srcdir)/modules/graphics/includes/handleDrawing/ \
-                               -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/graphic_export/includes/ \
                                -I$(top_srcdir)/modules/elementary_functions/includes/ \
index f6913f6..2724cc0 100644 (file)
@@ -462,7 +462,6 @@ libscirenderer_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/commons/src/jni \
                                -I$(top_srcdir)/modules/graphics/includes/ \
                                -I$(top_srcdir)/modules/graphics/includes/handleDrawing/ \
-                               -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/graphic_export/includes/ \
                                -I$(top_srcdir)/modules/elementary_functions/includes/ \
index 640060d..7b38e8c 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes;../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes;../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -111,7 +111,7 @@ lib /DEF:"$(ProjectDir)scilab_windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes;../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes;../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -140,7 +140,7 @@ lib /DEF:"$(ProjectDir)scilab_windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes;../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes;../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +176,7 @@ lib /DEF:"$(ProjectDir)scilab_windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes;../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes;../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -236,10 +236,6 @@ lib /DEF:"$(ProjectDir)scilab_windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(
     <None Include="renderer.iss" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\libs\doublylinkedlist\doublylinkedlist.vcxproj">
-      <Project>{ed02137f-0a4f-4ef0-ac58-97ace37fa89d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\..\libs\MALLOC\MALLOC.vcxproj">
       <Project>{6a84ad8c-ba18-4a3f-9c72-ec3df0939e9e}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -267,4 +263,4 @@ lib /DEF:"$(ProjectDir)scilab_windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 49326b5..038b6c0 100644 (file)
@@ -111,7 +111,6 @@ libsciscicos_la_CPPFLAGS= -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
-                       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                        -I$(top_srcdir)/modules/graphics/includes/ \
                        -I$(top_srcdir)/modules/dynamic_link/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
index c10a492..cf977ac 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">
@@ -78,7 +78,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../windows_tools/includes;../../../graphics/includes;../../../localization/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials/include;../scicos_sundials/include/sundials;../scicos_sundials/src/ida;../../../action_binding/includes;../../../../libs/intl;../../../intersci/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../time/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../windows_tools/includes;../../../graphics/includes;../../../localization/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials/include;../scicos_sundials/include/sundials;../scicos_sundials/src/ida;../../../action_binding/includes;../../../../libs/intl;../../../intersci/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -121,7 +121,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../windows_tools/includes;../../../graphics/includes;../../../localization/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials/include;../scicos_sundials/include/sundials;../scicos_sundials/src/ida;../../../action_binding/includes;../../../../libs/intl;../../../intersci/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../time/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../windows_tools/includes;../../../graphics/includes;../../../localization/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials/include;../scicos_sundials/include/sundials;../scicos_sundials/src/ida;../../../action_binding/includes;../../../../libs/intl;../../../intersci/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -162,7 +162,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../windows_tools/includes;../../../graphics/includes;../../../localization/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials/include;../scicos_sundials/include/sundials;../scicos_sundials/src/ida;../../../action_binding/includes;../../../../libs/intl;../../../intersci/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../time/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../windows_tools/includes;../../../graphics/includes;../../../localization/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials/include;../scicos_sundials/include/sundials;../scicos_sundials/src/ida;../../../action_binding/includes;../../../../libs/intl;../../../intersci/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -210,7 +210,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../windows_tools/includes;../../../graphics/includes;../../../localization/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials/include;../scicos_sundials/include/sundials;../scicos_sundials/src/ida;../../../action_binding/includes;../../../../libs/intl;../../../intersci/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../time/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../windows_tools/includes;../../../graphics/includes;../../../localization/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials/include;../scicos_sundials/include/sundials;../scicos_sundials/src/ida;../../../action_binding/includes;../../../../libs/intl;../../../intersci/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index fb0ed3c..ab38740 100644 (file)
@@ -412,7 +412,6 @@ libsciscicos_blocks_la_CPPFLAGS= -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/jni/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
-                       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni/ \
                        -I$(top_srcdir)/modules/elementary_functions/includes/ \
index ddf2a5d..aaff6f4 100644 (file)
@@ -1385,7 +1385,6 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @XCOS_TRUE@                    -I$(srcdir)/src/cpp/ \
 @XCOS_TRUE@                    -I$(srcdir)/src/jni/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/libs/MALLOC/includes/ \
-@XCOS_TRUE@                    -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/api_scilab/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/commons/src/jni/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/elementary_functions/includes/ \
index 859fdd7..4d2a97b 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">
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -112,7 +112,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -146,7 +146,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -187,7 +187,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/hashtable;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -614,4 +614,4 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>