update ilib_* with new ast arch 88/14888/3
Antoine ELIAS [Thu, 17 Jul 2014 10:57:04 +0000 (12:57 +0200)]
Change-Id: Ibbe006327bd1481f49c2d171d61169231f90310a

scilab/modules/dynamic_link/macros/ilib_compile.sci
scilab/modules/dynamic_link/macros/windows/dlwGetScilabIncludes.sci
scilab/modules/dynamic_link/macros/windows/dlwGetScilabLibraries.sci
scilab/modules/dynamic_link/src/scripts/Makefile.am
scilab/modules/dynamic_link/src/scripts/Makefile.in

index 3b87f52..7515b35 100644 (file)
@@ -77,15 +77,19 @@ function libn = ilib_compile(lib_name, ..
         // Source tree version
         // Headers are dispatched in the source tree
         if isdir(SCI+"/modules/core/includes/") then
-            defaultModulesCHeader=[ "core", "mexlib","api_scilab","output_stream","localization", "operations", "symbol", "types", "ast",  "dynamic_link",  "system_env",  "threads",  "string",  "console"];
+            defaultModulesCHeader=[ "core", "mexlib","api_scilab","output_stream","localization",  "dynamic_link",  "threads",  "string",  "console"];
+            defaultKernelCHeader=[ "ast" "exps" "operations" "parse" "symbol" "system_env" "types"];
             defaultModulesFHeader=[ "core" ];
             ScilabTreeFound=%t
 
-            for x = defaultModulesCHeader(:)';
-                cflags=" -I"+SCI+"/modules/"+x+"/includes/ "+cflags;
+            for x = defaultModulesCHeader;
+                cflags = cflags + " -I" + SCI + "/modules/" + x + "/includes/ ";
+            end
+
+            for x = defaultKernelCHeader;
+                cflags = cflags + " -I" + SCI + "/modules/ast/includes/" + x;
             end
 
-            cflags=" -I"+SCI+"/modules/ast/includes/exps "+cflags;
             for x = defaultModulesFHeader(:)';
                 fflags=" -I"+SCI+"/modules/"+x+"/includes/ " + fflags;
             end
index fdc3b54..786b854 100644 (file)
@@ -23,13 +23,14 @@ function scilabincludeslist = dlwGetScilabIncludes()
     "$(SCIDIR)/modules/mexlib/includes"; ..
     "$(SCIDIR)/modules/time/includes"; ..
     "$(SCIDIR)/modules/windows_tools/includes"; ..
-    "$(SCIDIR)/modules/symbol/includes"; ..
-    "$(SCIDIR)/modules/system_env/includes"; ..
     "$(SCIDIR)/modules/threads/includes"; ..
-    "$(SCIDIR)/modules/types/includes"; ..
-    "$(SCIDIR)/modules/operations/includes"; ..
-    "$(SCIDIR)/modules/ast/includes"; ..
+    "$(SCIDIR)/modules/ast/includes/ast"; ..
     "$(SCIDIR)/modules/ast/includes/exps"; ..
+    "$(SCIDIR)/modules/ast/includes/operations"; ..
+    "$(SCIDIR)/modules/ast/includes/parse"; ..
+    "$(SCIDIR)/modules/ast/includes/symbol"; ..
+    "$(SCIDIR)/modules/ast/includes/system_env"; ..
+    "$(SCIDIR)/modules/ast/includes/types"; ..
     "$(SCIDIR)/modules/string/includes"; ..
     "$(SCIDIR)/modules/console/includes"; ..
     "$(SCIDIR)/libs/Eigen/includes"];
index ef43f09..2d6d1ea 100644 (file)
@@ -24,18 +24,10 @@ function scilablibrarieslist = dlwGetScilabLibraries()
     "call_scilab.lib"; ..
     "time.lib"; ..
     "api_scilab.lib"; ..
-    "types.lib"; ..
-    "typesmacro.lib"; ..
-    "operations.lib"; ..
-    "symbol.lib"; ..
     "libintl.lib"; ..
     "ast.lib"; ..
     "fileio.lib"; ..
     "io.lib"; ..
-    "parse.lib"; ..
-    "ast-tools.lib"; ..
-    "symbol.lib"; ..
-    "system_env.lib"; ..
     "string.lib"; ..
     "threads.lib"; ..
     "sciconsole.lib"; ..
index 978adbb..0d19092 100644 (file)
@@ -11,8 +11,8 @@
 #
 
 # Without this, flags will be overriden
-AM_CFLAGS=@CFLAGS@
-AM_CXXFLAGS=@CXXFLAGS@
+AM_CFLAGS=@CFLAGS@ @EIGEN_CPPFLAGS@
+AM_CXXFLAGS=@CXXFLAGS@ @EIGEN_CPPFLAGS@
 AM_FFLAGS=@FFLAGS@
 AM_LDFLAGS=@LDFLAGS@
 
index 91af001..6d4b373 100644 (file)
@@ -400,8 +400,8 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # Without this, flags will be overriden
-AM_CFLAGS = @CFLAGS@
-AM_CXXFLAGS = @CXXFLAGS@
+AM_CFLAGS = @CFLAGS@ @EIGEN_CPPFLAGS@
+AM_CXXFLAGS = @CXXFLAGS@ @EIGEN_CPPFLAGS@
 AM_FFLAGS = @FFLAGS@
 AM_LDFLAGS = @LDFLAGS@
 ACLOCAL_AMFLAGS = -I m4