Merge commit 'origin/master' into sas
Bruno JOFRET [Fri, 26 Feb 2010 08:36:41 +0000 (09:36 +0100)]
Conflicts:
scilab/Scilab.sln
scilab/Version.incl
scilab/modules/elementary_functions/Makefile.in
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/pvm/src/nopvm/nopvm.vcproj
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/src/c/scicos.vcproj

128 files changed:
1  2 
scilab/Scilab.sln
scilab/Version.incl
scilab/configure
scilab/configure.ac
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/api_scilab.vcproj
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/arnoldi.vcproj
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/src/c/boolean.vcproj
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/src/c/cacsd.vcproj
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.vcproj
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/c/completion.vcproj
scilab/modules/completion/src/nocompletion/nocompletion.vcproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/core.vcproj
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/src/c/data_structures.vcproj
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/src/c/differential_equations.vcproj
scilab/modules/double/Makefile.in
scilab/modules/double/src/c/double.vcproj
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/macros/ilib_compile.sci
scilab/modules/dynamic_link/src/c/dynamic_link.vcproj
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/fftw/Makefile.in
scilab/modules/fftw/fftw.vcproj
scilab/modules/fftw/src/nofftw/nofftw.vcproj
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcproj
scilab/modules/functions/Makefile.in
scilab/modules/functions/src/c/functions.vcproj
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.vcproj
scilab/modules/graphic_export/src/nographic_export/nographic_export.vcproj
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcproj
scilab/modules/graphics/src/nographics/nographics.vcproj
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/c/gui.vcproj
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/src/c/hdf5.vcproj
scilab/modules/helptools/Makefile.in
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/src/c/history_manager.vcproj
scilab/modules/history_manager/src/nohistory_manager/nohistory_manager.vcproj
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/interpolation/src/c/interpolation.vcproj
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/io/src/c/io.vcproj
scilab/modules/javasci/Javasci.vcproj
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/libjvm.vcproj
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/help/en_US/schur.xml
scilab/modules/localization/Makefile.in
scilab/modules/localization/src/localization.vcproj
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/src/c/optimization.vcproj
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/src/c/output_stream.vcproj
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/Makefile.in
scilab/modules/pvm/pvm.vcproj
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/src/c/randlib.vcproj
scilab/modules/randlib/src/norandlib/norandlib.vcproj
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/shell/src/c/shell.vcproj
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/src/c/signal_processing.vcproj
scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj
scilab/modules/sound/Makefile.in
scilab/modules/sound/sound.vcproj
scilab/modules/sound/src/nosound/nosound.vcproj
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/src/c/sparse.vcproj
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/src/c/special_functions.vcproj
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/spreadsheet.vcproj
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcproj
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/src/c/statistics.vcproj
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/string.vcproj
scilab/modules/symbolic/Makefile.in
scilab/modules/symbolic/src/c/symbolic.vcproj
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/tclsci.vcproj
scilab/modules/time/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/umfpack/src/c/umfpack.vcproj
scilab/modules/umfpack/src/noumfpack/noumfpack.vcproj
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/src/c/windows_tools.vcproj
scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.vcproj
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/c/xcos.vcproj
scilab/modules/xpad/Makefile.in
scilab/modules/xpad/src/c/xpad.vcproj

@@@ -1075,19 -1050,10 +1060,23 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
                {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
        EndProjectSection
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad", "modules\xpad\src\c\xpad.vcproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
 +              {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
 +              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
 +              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad-Ant", "modules\xpad\src\java\xpad-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
 +EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelicat", "modules\scicos\src\translator\translator.vcproj", "{9E0DE362-60A0-4584-9FF1-BB537DA94F40}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\scicos\src\xml2modelica\xml2modelica.vcproj", "{7CF15086-6DED-4F83-9C40-C4951FD373B3}"
+ EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|Win32.Build.0 = Release|Win32
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.ActiveCfg = Release|x64
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.Build.0 = Release|x64
++<<<<<<< HEAD:scilab/Scilab.sln
 +              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|Win32.Build.0 = Debug|Win32
 +              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|x64.ActiveCfg = Debug|x64
 +              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|x64.Build.0 = Debug|x64
 +              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|Win32.ActiveCfg = Release|Win32
 +              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|Win32.Build.0 = Release|Win32
 +              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.ActiveCfg = Release|x64
 +              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.Build.0 = Release|x64
 +              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.Build.0 = Debug|Win32
 +              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|x64.ActiveCfg = Debug|x64
 +              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|x64.Build.0 = Debug|x64
 +              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|Win32.ActiveCfg = Release|Win32
 +              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|Win32.Build.0 = Release|Win32
 +              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.ActiveCfg = Release|x64
 +              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.Build.0 = Release|x64
++=======
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|Win32.ActiveCfg = Debug|Win32
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|x64.ActiveCfg = Debug|x64
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|Win32.ActiveCfg = Release|Win32
+               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|x64.ActiveCfg = Release|x64
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|Win32.ActiveCfg = Debug|Win32
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|x64.ActiveCfg = Debug|x64
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.ActiveCfg = Release|Win32
+               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|x64.ActiveCfg = Release|x64
++>>>>>>> origin/master:scilab/Scilab.sln
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@@ -1,1 -1,1 +1,1 @@@
- SCIVERSION=Scilab-Branch-sas-GIT
 -SCIVERSION=Scilab-Branch-master-GIT
++SCIVERSION=Scilab-Branch-sas-GIT
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -22,9 -22,10 +22,11 @@@ GATEWAY_FORTRAN_SOURCES = sci_gateway/f
  
  libscidynamic_link_la_CFLAGS = \
  -I$(top_srcdir)/modules/output_stream/includes \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
  -I$(top_srcdir)/modules/fileio/includes \
+ -I$(top_srcdir)/modules/localization/includes \
  -I$(top_srcdir)/modules/io/includes \
 +-I$(top_srcdir)/modules/operations/includes \
  -I$(top_srcdir)/libs/dynamiclibrary/includes \
  -I$(srcdir)/src/c/ \
  -I$(top_srcdir)/modules/api_scilab/includes \
@@@ -425,12 -422,13 +426,14 @@@ sci_gateway/c/sci_ulink.c 
  sci_gateway/c/sci_c_link.c \
  sci_gateway/c/sci_ilib_verbose.c
  
 -GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_fort.f 
 +GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_fort.f
  libscidynamic_link_la_CFLAGS = \
  -I$(top_srcdir)/modules/output_stream/includes \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
  -I$(top_srcdir)/modules/fileio/includes \
+ -I$(top_srcdir)/modules/localization/includes \
  -I$(top_srcdir)/modules/io/includes \
 +-I$(top_srcdir)/modules/operations/includes \
  -I$(top_srcdir)/libs/dynamiclibrary/includes \
  -I$(srcdir)/src/c/ \
  -I$(top_srcdir)/modules/api_scilab/includes \
@@@ -1,4 -1,4 +1,4 @@@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -31,10 -31,10 +31,11 @@@ libscigraphics_la_CFLAGS = -I$(top_srcd
        -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(top_srcdir)/modules/gui/includes/ \
+       -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/fileio/includes/ \
 -      -I$(top_srcdir)/modules/string/includes/
 +      -I$(top_srcdir)/modules/string/includes/ \
 +      -I$(top_srcdir)/modules/operations/includes/
  
  
  GRAPHICS_C_SOURCES = src/c/GetCommandArg.c \
@@@ -779,11 -780,11 +780,12 @@@ libscigraphics_la_CFLAGS =  
        -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(top_srcdir)/modules/gui/includes/ \
+       -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/fileio/includes/ \
 -      -I$(top_srcdir)/modules/string/includes/ $(JAVA_JNI_INCLUDE) \
 -      -Isrc/cpp $(TCL_INC_PATH) $(TK_INC_PATH) \
 +      -I$(top_srcdir)/modules/string/includes/ \
 +      -I$(top_srcdir)/modules/operations/includes/ \
 +      $(JAVA_JNI_INCLUDE) -Isrc/cpp $(TCL_INC_PATH) $(TK_INC_PATH) \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/libs/hashtable/ \
        -I$(top_srcdir)/modules/jvm/includes/ \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1,4 -1,4 +1,4 @@@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -122,9 -122,9 +122,10 @@@ sci_gateway/fortran/Ex-lsqrsolve.
  
  libscioptimization_la_CFLAGS=         -I$(srcdir)/includes/ \
  -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/localization/includes \
  -I$(top_srcdir)/modules/output_stream/includes \
 --I$(top_srcdir)/modules/dynamic_link/includes
 +-I$(top_srcdir)/modules/dynamic_link/includes \
 +-I$(top_srcdir)/modules/operations/includes
  
  pkglib_LTLIBRARIES = libscioptimization.la
  
@@@ -535,9 -536,9 +536,10 @@@ sci_gateway/fortran/Ex-lsqrsolve.
  
  libscioptimization_la_CFLAGS = -I$(srcdir)/includes/ \
  -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/localization/includes \
  -I$(top_srcdir)/modules/output_stream/includes \
 --I$(top_srcdir)/modules/dynamic_link/includes
 +-I$(top_srcdir)/modules/dynamic_link/includes \
 +-I$(top_srcdir)/modules/operations/includes
  
  pkglib_LTLIBRARIES = libscioptimization.la
  libscioptimization_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -107,7 -119,10 +119,10 @@@ libsciscicos_la_CFLAGS= -I$(srcdir)/inc
                        -I$(top_srcdir)/modules/action_binding/includes \
                        -I$(top_srcdir)/modules/time/includes \
                        -I$(top_srcdir)/modules/api_scilab/includes \
+                       -I$(top_srcdir)/modules/scicos/src/scicos_sundials/include \
+                       -I$(top_srcdir)/modules/scicos/src/scicos_sundials/include/sundials \
 -                      -I$(top_srcdir)/modules/scicos/src/scicos_sundials/src/ida
 -                      
++                      -I$(top_srcdir)/modules/scicos/src/scicos_sundials/src/ida \
 +                      -I$(top_srcdir)/modules/operations/includes
  
  libsciscicos_la_SOURCES = $(SCICOS_C_SOURCES) $(SCICOS_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
  
@@@ -183,90 -228,11 +228,11 @@@ libscisundials_la_SOURCES = $(SUNDIALS_
  #### scicos : help files scripts ####
  
  libsciscicos_la_help_en_USdir = $(mydatadir)/help/en_US
 -libsciscicos_la_help_en_US_DATA = 
 +libsciscicos_la_help_en_US_DATA =
  
  libsciscicos_la_help_fr_FRdir = $(mydatadir)/help/fr_FR
 -libsciscicos_la_help_fr_FR_DATA = 
 +libsciscicos_la_help_fr_FR_DATA =
  
- ######### Modelica #############
- if OCAML
- TARGET = modelicac
- bin_PROGRAMS = $(TARGET)
- modelicac_SOURCES = $(MLS)
- OCAMLLIBS=nums.cma
- MLS = $(srcdir)/src/modelica_compiler/parseTree.ml $(srcdir)/src/modelica_compiler/linenum.ml $(srcdir)/src/modelica_compiler/parser.ml $(srcdir)/src/modelica_compiler/lexer.ml\
-       $(srcdir)/src/modelica_compiler/precompilation.ml $(srcdir)/src/modelica_compiler/compilation.ml $(srcdir)/src/modelica_compiler/instantiation.ml\
-       $(srcdir)/src/modelica_compiler/graphNodeSet.ml $(srcdir)/src/modelica_compiler/symbolicExpression.ml\
-       $(srcdir)/src/modelica_compiler/squareSparseMatrix.ml $(srcdir)/src/modelica_compiler/bipartiteGraph.ml $(srcdir)/src/modelica_compiler/hungarianMethod.ml\
-       $(srcdir)/src/modelica_compiler/causalityGraph.ml\
-       $(srcdir)/src/modelica_compiler/optimization.ml  $(srcdir)/src/modelica_compiler/xMLCodeGeneration.ml $(srcdir)/src/modelica_compiler/optimizingCompiler.ml\
-       $(srcdir)/src/modelica_compiler/scicosCodeGeneration.ml $(srcdir)/src/modelica_compiler/scicosOptimizingCompiler.ml
- MLIS = $(srcdir)/src/modelica_compiler/parseTree.mli \
-       $(srcdir)/src/modelica_compiler/precompilation.mli $(srcdir)/src/modelica_compiler/compilation.mli $(srcdir)/src/modelica_compiler/instantiation.mli\
-       $(srcdir)/src/modelica_compiler/graphNodeSet.mli $(srcdir)/src/modelica_compiler/symbolicExpression.mli \
-       $(srcdir)/src/modelica_compiler/squareSparseMatrix.mli $(srcdir)/src/modelica_compiler/bipartiteGraph.mli $(srcdir)/src/modelica_compiler/hungarianMethod.mli \
-       $(srcdir)/src/modelica_compiler/causalityGraph.mli \
-       $(srcdir)/src/modelica_compiler/optimization.mli \
-       $(srcdir)/src/modelica_compiler/xMLCodeGeneration.mli \
-       $(srcdir)/src/modelica_compiler/optimizingCompiler.mli \
-       $(srcdir)/src/modelica_compiler/scicosCodeGeneration.mli
- PARSER_SRC = $(srcdir)/src/modelica_compiler/parser.mly
- LEXER_SRC = $(srcdir)/src/modelica_compiler/lexer.mll
- BASE_PATH = $(srcdir)/src/modelica_compiler
- INCLUDE = -I $(BASE_PATH)
- SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
- # @TODO check how to avoid the rebuild of the parser/lexer
- .ml.cmo:
-       $(OCAMLC) $(INCLUDE)  -c $<
- .ml.cmx:
-       $(OCAMLOPT) $(INCLUDE) -c $<
- .mli.cmi:
-       $(OCAMLC) $(INCLUDE) -c $<
- .mll.ml:
-       $(OCAMLLEX) $<
- .mly.ml:
-       $(OCAMLYACC) $<
- # call the ocaml/Yacc
- generate-parser: $(PARSER_SRC)
-       $(OCAMLYACC) $(<)
-       $(RM) -f $(<:.mly=.mli)
- # Call the lexer
- generate-lexer: $(LEXER_SRC)
-       $(OCAMLLEX) $(<)
- # Build the binary
- $(TARGET): generate-parser generate-lexer $(MLIS:.mli=.cmi) $(MLS:.ml=.cmo) $(MLS:.ml=.cmx)
-       $(OCAMLOPT) -o $(TARGET) $(INCLUDE) $(OCAMLLIBS:.cma=.cmxa) $(MLS:.ml=.cmx)
- CLEANFILES = $(BASE_PATH)/*.cmi \
-       $(BASE_PATH)/*.o \
-       $(BASE_PATH)/*.cmo \
-       $(BASE_PATH)/*.cm[aiox] \
-       $(BASE_PATH)/parser.mli \
-       $(BASE_PATH)/lexer.mli \
-       $(BASE_PATH)/parser.ml \
-       $(BASE_PATH)/lexer.ml \
-       $(TARGET)
- endif # OCAML
  else
  
  pkglib_LTLIBRARIES = libsciscicos.la
@@@ -275,9 -241,10 +241,9 @@@ NO_SCICOS_C_SOURCES = src/c/noscicos/no
  libsciscicos_la_SOURCES = $(NO_SCICOS_C_SOURCES)
  
  libsciscicos_la_CFLAGS= -I$(top_srcdir)/modules/output_stream/includes \
 --I$(top_srcdir)/modules/api_scilab/includes \
  -I$(top_srcdir)/modules/scicos/includes
  
- libsciscicos_la_includedir=$(pkgincludedir)
+ libsciscicos_la_includedir=$(pkgincludedir)/scicos
  libsciscicos_la_include_HEADERS = src/c/noscicos/resource.h
  
  #### scicos : init scripts ####
@@@ -1,4 -1,4 +1,4 @@@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@@ -708,7 -908,9 +907,10 @@@ HELP_CHAPTERLANG = en_US fr_FR pt_B
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/action_binding/includes \
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/time/includes \
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/api_scilab/includes \
+ @SCICOS_TRUE@                 -I$(top_srcdir)/modules/scicos/src/scicos_sundials/include \
+ @SCICOS_TRUE@                 -I$(top_srcdir)/modules/scicos/src/scicos_sundials/include/sundials \
 -@SCICOS_TRUE@                 -I$(top_srcdir)/modules/scicos/src/scicos_sundials/src/ida
++@SCICOS_TRUE@                 -I$(top_srcdir)/modules/scicos/src/scicos_sundials/src/ida \
 +@SCICOS_TRUE@                 -I$(top_srcdir)/modules/operations/includes
  
  @SCICOS_FALSE@libsciscicos_la_SOURCES = $(NO_SCICOS_C_SOURCES)
  @SCICOS_TRUE@libsciscicos_la_SOURCES = $(SCICOS_C_SOURCES) $(SCICOS_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@@ -410,8 -423,8 +423,9 @@@ libsciscicos_blocks_la_CFLAGS= -I$(srcd
                        -I$(top_srcdir)/modules/renderer/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
                        -I$(top_srcdir)/modules/scicos/includes \
 +                      -I$(top_srcdir)/modules/operations/includes \
                        -I$(top_srcdir)/modules/fileio/includes \
+                       -I$(top_srcdir)/modules/string/includes \
                        -I$(top_srcdir)/modules/elementary_functions/includes
  
  libsciscicos_blocks_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/jvm/includes/ \
+                       -I$(top_srcdir)/modules/scicos/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
                        -I$(top_srcdir)/modules/localization/includes \
 -                      -I$(top_srcdir)/modules/api_scilab/includes
 +                      -I$(top_srcdir)/modules/api_scilab/includes \
 +                      -I$(top_srcdir)/modules/elementary_functions/includes
  
  libsciscicos_blocks_la_SOURCES = $(SCICOS_BLOCKS_C_SOURCES) \
  $(SCICOS_BLOCKS_FORTRAN_SOURCES) \
  $(NON_BLOCK_C_SOURCES) \
@@@ -1323,8 -1357,8 +1357,9 @@@ HELP_CHAPTERLANG = en_US fr_FR pt_B
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/renderer/includes/ \
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/output_stream/includes \
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/scicos/includes \
 +@SCICOS_TRUE@                 -I$(top_srcdir)/modules/operations/includes \
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/fileio/includes \
+ @SCICOS_TRUE@                 -I$(top_srcdir)/modules/string/includes \
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/elementary_functions/includes
  
  @SCICOS_TRUE@libsciscicos_blocks_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
  @SCICOS_TRUE@                 -I$(srcdir)/src/c/ \
  @SCICOS_TRUE@                 -I$(top_srcdir)/libs/MALLOC/includes/ \
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/jvm/includes/ \
+ @SCICOS_TRUE@                 -I$(top_srcdir)/modules/scicos/includes/ \
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/output_stream/includes \
  @SCICOS_TRUE@                 -I$(top_srcdir)/modules/localization/includes \
 -@SCICOS_TRUE@                 -I$(top_srcdir)/modules/api_scilab/includes
 +@SCICOS_TRUE@                 -I$(top_srcdir)/modules/api_scilab/includes \
 +@SCICOS_TRUE@                 -I$(top_srcdir)/modules/elementary_functions/includes
  
  @SCICOS_FALSE@libsciscicos_blocks_la_SOURCES = 
  @SCICOS_TRUE@libsciscicos_blocks_la_SOURCES = $(SCICOS_BLOCKS_C_SOURCES) \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -71,8 -71,8 +71,9 @@@ libscistring_la_CFLAGS= $(PCRE_CFLAGS) 
        -I$(srcdir)/src/c \
        -I$(srcdir)/includes/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
 +      -I$(top_srcdir)/modules/operations/includes \
        -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/output_stream/includes
  
  pkglib_LTLIBRARIES = libscistring.la
@@@ -487,8 -488,8 +488,9 @@@ libscistring_la_CFLAGS = $(PCRE_CFLAGS
        -I$(srcdir)/src/c \
        -I$(srcdir)/includes/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
 +      -I$(top_srcdir)/modules/operations/includes \
        -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/output_stream/includes
  
  pkglib_LTLIBRARIES = libscistring.la
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge