Fix dependencies :

* JAVA :
        action_binding needs localization
        jvm needs action_binding
        gui needs action_binding
        (jvm needs gui)

* C/C++ :
        action_binding needs jvm => Cyclic dependancy explicitly removed
        tclsci no more needs action_binding
        console no more needs action_binding
        shell no more needs action_binding

* scilab-cli :
        linked against libsciaction_binding-disable.la

* scilab-adv-cli :
        linked against libsciaction_binding.la

Change-Id: I361b2c7f292b7c75ed06e2549fafada50f8982af

11 files changed, 98 insertions, 71 deletions

diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index caa64ee..fbcc142 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -18,7 +18,6 @@ SUBDIRS = core
 
 SUBDIRS += \
 output_stream \
-action_binding \
 arnoldi \
 elementary_functions \
 string \
@@ -29,6 +28,7 @@ history_manager \
 spreadsheet \
 tclsci \
 localization \
+action_binding \
 renderer \
 shell \
 completion \
@@ -143,6 +143,7 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
         $(top_builddir)/modules/graphics/libscigraphics-disable.la \
         $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
         $(top_builddir)/modules/console/libsciconsole-disable.la \
+        $(top_builddir)/modules/action_binding/libsciaction_binding-disable.la \
         $(top_builddir)/modules/jvm/libscijvm-disable.la \
         $(top_builddir)/modules/xcos/libscixcos-disable.la \
         $(top_builddir)/modules/xpad/libscixpad-disable.la
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 4b00f79..bade7d9 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -151,12 +151,12 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
         distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = core output_stream action_binding arnoldi \
-        elementary_functions string api_scilab dynamic_link fileio \
-        history_manager spreadsheet tclsci localization renderer shell \
-        completion console graphic_export gui jvm graphics \
-        optimization symbolic randlib statistics special_functions \
-        interpolation linear_algebra integer data_structures mexlib \
+DIST_SUBDIRS = core output_stream arnoldi elementary_functions string \
+        api_scilab dynamic_link fileio history_manager spreadsheet \
+        tclsci localization action_binding renderer shell completion \
+        console graphic_export gui jvm graphics optimization symbolic \
+        randlib statistics special_functions interpolation \
+        linear_algebra integer data_structures mexlib \
         differential_equations cacsd polynomials boolean double pvm io \
         intersci signal_processing call_scilab sound time sparse \
         windows_tools functions overloading maple2scilab m2sci texmacs \
@@ -433,12 +433,12 @@ top_srcdir = @top_srcdir@
 
 # core is the main module of Scilab. All the compilation deps has been removed
 # since it already linked almost the whole world
-SUBDIRS = core output_stream action_binding arnoldi \
-        elementary_functions string api_scilab dynamic_link fileio \
-        history_manager spreadsheet tclsci localization renderer shell \
-        completion console graphic_export gui jvm graphics \
-        optimization symbolic randlib statistics special_functions \
-        interpolation linear_algebra integer data_structures mexlib \
+SUBDIRS = core output_stream arnoldi elementary_functions string \
+        api_scilab dynamic_link fileio history_manager spreadsheet \
+        tclsci localization action_binding renderer shell completion \
+        console graphic_export gui jvm graphics optimization symbolic \
+        randlib statistics special_functions interpolation \
+        linear_algebra integer data_structures mexlib \
         differential_equations cacsd polynomials boolean double pvm io \
         intersci signal_processing core call_scilab interpolation \
         sound time randlib sparse windows_tools functions overloading \
@@ -477,6 +477,7 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
         $(top_builddir)/modules/graphics/libscigraphics-disable.la \
         $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
         $(top_builddir)/modules/console/libsciconsole-disable.la \
+        $(top_builddir)/modules/action_binding/libsciaction_binding-disable.la \
         $(top_builddir)/modules/jvm/libscijvm-disable.la \
         $(top_builddir)/modules/xcos/libscixcos-disable.la \
         $(top_builddir)/modules/xpad/libscixpad-disable.la \
diff --git a/scilab/modules/action_binding/Makefile.am b/scilab/modules/action_binding/Makefile.am
index 9c45824..e1d089b 100644
--- a/scilab/modules/action_binding/Makefile.am
+++ b/scilab/modules/action_binding/Makefile.am
@@ -29,10 +29,6 @@ GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_notify.cpp
 
 #### SWIG Declaration ####
 SWIG_WRAPPERS = src/jni/InterpreterManagement.i
-else
-# List of the c files
-ACTION_BINDING_C_SOURCES = src/noaction_binding/noaction_binding.c \
-src/c/dynamic_menus.c
 endif
 
 if SWIG
@@ -45,6 +41,9 @@ if GIWS
 BUILT_SOURCES=giws
 endif
 
+libsciaction_binding_disable_la_SOURCES = src/noaction_binding/noaction_binding.c
+libsciaction_binding_disable_la_CFLAGS =        -I$(srcdir)/includes/ \
+                                                                                        -I$(top_srcdir)/modules/output_stream/includes
 
 # Includes need for the compilation
 libsciaction_binding_la_CFLAGS=         $(JAVA_JNI_INCLUDE) \
@@ -68,7 +67,11 @@ libsciaction_binding_la_CPPFLAGS= 	$(JAVA_JNI_INCLUDE) \
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
-pkglib_LTLIBRARIES = libsciaction_binding.la
+pkglib_LTLIBRARIES = libsciaction_binding-disable.la
+
+if GUI
+pkglib_LTLIBRARIES += libsciaction_binding.la
+endif
 
 libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
 
@@ -83,8 +86,11 @@ INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS)
 ## Change to include other Scilab modules/lib
 libsciaction_binding_la_LIBADD =        $(top_builddir)/modules/core/libscicore.la \
                                                                         $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                                                                        $(top_builddir)/modules/jvm/libscijvm.la \
                                                                         $(top_builddir)/modules/output_stream/libscioutput_stream.la
+
+# Cyclic dependancy
+#                                                                       $(top_builddir)/modules/jvm/libscijvm.la
+
 #### Name of the module and the path ######
 modulename=action_binding
 
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 2a86de2..e3f6c89 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -61,12 +61,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@GUI_TRUE@am__append_1 = libsciaction_binding.la
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
         $(top_srcdir)/Makefile.incl.am
-@NEED_JAVA_TRUE@am__append_1 = java
+@NEED_JAVA_TRUE@am__append_2 = java
 
 # With --enable-compilation-tests, launch java unitary tests
-@COMPILATION_TESTS_TRUE@am__append_2 = test
+@COMPILATION_TESTS_TRUE@am__append_3 = test
 subdir = modules/action_binding
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -115,21 +116,25 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
         "$(DESTDIR)$(libsciaction_binding_la_rootdir)" \
         "$(DESTDIR)$(libsciaction_binding_la_sci_gatewaydir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
+libsciaction_binding_disable_la_LIBADD =
+am_libsciaction_binding_disable_la_OBJECTS =  \
+        libsciaction_binding_disable_la-noaction_binding.lo
+libsciaction_binding_disable_la_OBJECTS =  \
+        $(am_libsciaction_binding_disable_la_OBJECTS)
+libsciaction_binding_disable_la_LINK = $(LIBTOOL) --tag=CC \
+        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+        $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) \
+        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 libsciaction_binding_la_DEPENDENCIES =  \
         $(top_builddir)/modules/core/libscicore.la \
         $(top_builddir)/libs/MALLOC/libscimalloc.la \
-        $(top_builddir)/modules/jvm/libscijvm.la \
         $(top_builddir)/modules/output_stream/libscioutput_stream.la
 am__libsciaction_binding_la_SOURCES_DIST =  \
-        src/noaction_binding/noaction_binding.c src/c/dynamic_menus.c \
         src/c/InterpreterManagement.c src/jni/Signal.cpp \
         src/jni/Signal.hxx src/jni/GiwsException.cpp \
         src/jni/InterpreterManagement_wrap.c \
         sci_gateway/c/gw_action_binding.c \
         sci_gateway/cpp/sci_notify.cpp
-@GUI_FALSE@am__objects_1 =  \
-@GUI_FALSE@     libsciaction_binding_la-noaction_binding.lo \
-@GUI_FALSE@     libsciaction_binding_la-dynamic_menus.lo
 @GUI_TRUE@am__objects_1 =  \
 @GUI_TRUE@      libsciaction_binding_la-InterpreterManagement.lo
 @GUI_TRUE@am__objects_2 = libsciaction_binding_la-Signal.lo \
@@ -146,6 +151,7 @@ libsciaction_binding_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
         $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
         $(CXXFLAGS) $(libsciaction_binding_la_LDFLAGS) $(LDFLAGS) -o \
         $@
+@GUI_TRUE@am_libsciaction_binding_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -168,8 +174,10 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
         --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
         $(LDFLAGS) -o $@
-SOURCES = $(libsciaction_binding_la_SOURCES)
-DIST_SOURCES = $(am__libsciaction_binding_la_SOURCES_DIST)
+SOURCES = $(libsciaction_binding_disable_la_SOURCES) \
+        $(libsciaction_binding_la_SOURCES)
+DIST_SOURCES = $(libsciaction_binding_disable_la_SOURCES) \
+        $(am__libsciaction_binding_la_SOURCES_DIST)
 DATA = $(libsciaction_binding_la_etc_DATA) \
         $(libsciaction_binding_la_root_DATA) \
         $(libsciaction_binding_la_sci_gateway_DATA)
@@ -417,10 +425,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @GUI_TRUE@USEANT = 1
-# List of the c files
-@GUI_FALSE@ACTION_BINDING_C_SOURCES = src/noaction_binding/noaction_binding.c \
-@GUI_FALSE@src/c/dynamic_menus.c
-
 
 # List of the c files
 @GUI_TRUE@ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
@@ -441,6 +445,10 @@ top_srcdir = @top_srcdir@
 @GIWS_TRUE@BUILT_SOURCES = giws
 @SWIG_TRUE@BUILT_SOURCES = swig
 GIWS_WRAPPERS = src/jni/Signal.giws.xml
+libsciaction_binding_disable_la_SOURCES = src/noaction_binding/noaction_binding.c
+libsciaction_binding_disable_la_CFLAGS = -I$(srcdir)/includes/ \
+                                                                                        -I$(top_srcdir)/modules/output_stream/includes
+
 
 # Includes need for the compilation
 libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
@@ -466,7 +474,7 @@ libsciaction_binding_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
-pkglib_LTLIBRARIES = libsciaction_binding.la
+pkglib_LTLIBRARIES = libsciaction_binding-disable.la $(am__append_1)
 libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
 
 # All the sources needed by libsciaction_binding.la
@@ -477,9 +485,12 @@ CHECK_SRC = $(ACTION_BINDING_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS)
 libsciaction_binding_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \
                                                                         $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                                                                        $(top_builddir)/modules/jvm/libscijvm.la \
                                                                         $(top_builddir)/modules/output_stream/libscioutput_stream.la
 
+
+# Cyclic dependancy
+#                                                                       $(top_builddir)/modules/jvm/libscijvm.la
+
 #### Name of the module and the path ######
 modulename = action_binding
 
@@ -506,7 +517,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
 #### the procedure will be the same with Microsoft Windows (C)
 #### and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1) $(am__append_2)
+TARGETS_ALL = $(am__append_2) $(am__append_3)
 
 ################ MACROS ######################
 # Rule to build a macro
@@ -623,8 +634,10 @@ clean-pkglibLTLIBRARIES:
           echo "rm -f \"$${dir}/so_locations\""; \
           rm -f "$${dir}/so_locations"; \
         done
+libsciaction_binding-disable.la: $(libsciaction_binding_disable_la_OBJECTS) $(libsciaction_binding_disable_la_DEPENDENCIES) 
+        $(libsciaction_binding_disable_la_LINK) -rpath $(pkglibdir) $(libsciaction_binding_disable_la_OBJECTS) $(libsciaction_binding_disable_la_LIBADD) $(LIBS)
 libsciaction_binding.la: $(libsciaction_binding_la_OBJECTS) $(libsciaction_binding_la_DEPENDENCIES) 
-        $(libsciaction_binding_la_LINK) -rpath $(pkglibdir) $(libsciaction_binding_la_OBJECTS) $(libsciaction_binding_la_LIBADD) $(LIBS)
+        $(libsciaction_binding_la_LINK) $(am_libsciaction_binding_la_rpath) $(libsciaction_binding_la_OBJECTS) $(libsciaction_binding_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
@@ -632,13 +645,12 @@ mostlyclean-compile:
 distclean-compile:
         -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-GiwsException.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-Signal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-gw_action_binding.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-sci_notify.Plo@am__quote@
 
 .c.o:
@@ -662,19 +674,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
 
-libsciaction_binding_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c
-@am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
-@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_la-noaction_binding.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) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
-
-libsciaction_binding_la-dynamic_menus.lo: src/c/dynamic_menus.c
-@am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-dynamic_menus.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c
-@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='src/c/dynamic_menus.c' object='libsciaction_binding_la-dynamic_menus.lo' libtool=yes @AMDEPBACKSLASH@
+libsciaction_binding_disable_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c
+@am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_disable_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Tpo -c -o libsciaction_binding_disable_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
+@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_disable_la-noaction_binding.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) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c
+@am__fastdepCC_FALSE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_disable_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
 
 libsciaction_binding_la-InterpreterManagement.lo: src/c/InterpreterManagement.c
 @am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c
diff --git a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.c b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.c
index e9aa7ad..5940ef9 100644
--- a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.c
+++ b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.c
@@ -1,6 +1,6 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007-2008 - INRIA - Vincent COUVERT <vincent.couvert@inria.fr>
+ * Copyright (C) 2010 - DIGITEO - Bruno JOFRET
  *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
@@ -10,15 +10,11 @@
  *
  */
 
-#include "InterpreterManagement.h"
-/*--------------------------------------------------------------------------*/
-int putCommandInScilabQueue(char *command)
-{
-  return 0;
-}
-/*--------------------------------------------------------------------------*/
-int interruptScilab(void)
+#include "Scierror.h"
+#include "localization.h"
+
+int gw_action_binding()
 {
-  return 0;
+        Scierror(999,_("Scilab '%s' module not installed.\n"), "action_binding");
+        return 0;
 }
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/console/Makefile.am b/scilab/modules/console/Makefile.am
index 0971b1c..17a8b3a 100644
--- a/scilab/modules/console/Makefile.am
+++ b/scilab/modules/console/Makefile.am
@@ -94,7 +94,9 @@ INCLUDE_FLAGS = $(libsciconsole_la_CFLAGS)
 
 ## Libraries necessary
 ## Change to include other Scilab modules/lib
-libsciconsole_la_LIBADD =  $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/shell/libscishell.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/MALLOC/libscimalloc.la 
+libsciconsole_la_LIBADD =       $(top_builddir)/modules/shell/libscishell.la \
+                                                        $(top_builddir)/modules/fileio/libscifileio.la \
+                                                        $(top_builddir)/libs/MALLOC/libscimalloc.la 
 # java code is needed $(top_builddir)/modules/jvm/libscijvm.la
 
 
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index 25d6051..8b4443a 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -130,7 +130,7 @@ libsciconsole_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
         $(LIBTOOLFLAGS) --mode=link $(CCLD) \
         $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
         $(LDFLAGS) -o $@
-libsciconsole_la_DEPENDENCIES = $(top_builddir)/modules/action_binding/libsciaction_binding.la \
+libsciconsole_la_DEPENDENCIES =  \
         $(top_builddir)/modules/shell/libscishell.la \
         $(top_builddir)/modules/fileio/libscifileio.la \
         $(top_builddir)/libs/MALLOC/libscimalloc.la
@@ -490,7 +490,10 @@ libsciconsole_la_SOURCES = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) $(CONSO
 # For the code check (splint)
 CHECK_SRC = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES)
 INCLUDE_FLAGS = $(libsciconsole_la_CFLAGS)
-libsciconsole_la_LIBADD = $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/shell/libscishell.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/MALLOC/libscimalloc.la 
+libsciconsole_la_LIBADD = $(top_builddir)/modules/shell/libscishell.la \
+                                                        $(top_builddir)/modules/fileio/libscifileio.la \
+                                                        $(top_builddir)/libs/MALLOC/libscimalloc.la 
+
 # java code is needed $(top_builddir)/modules/jvm/libscijvm.la
 
 #### SWIG Declaration ####
diff --git a/scilab/modules/shell/Makefile.am b/scilab/modules/shell/Makefile.am
index 5383825..9d81500 100644
--- a/scilab/modules/shell/Makefile.am
+++ b/scilab/modules/shell/Makefile.am
@@ -74,7 +74,10 @@ INCLUDE_FLAGS = $(libscishell_la_CFLAGS)
 
 ## Libraries necessary
 # cyclic dep $(top_builddir)/modules/console/libsciconsole.la
-libscishell_la_LIBADD =   $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/history_manager/libscihistory_manager.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
+libscishell_la_LIBADD =         $(top_builddir)/modules/history_manager/libscihistory_manager.la \
+                                                        $(top_builddir)/modules/core/libscicore.la \
+                                                        $(top_builddir)/libs/MALLOC/libscimalloc.la \
+                                                        $(top_builddir)/modules/output_stream/libscioutput_stream.la 
 # $(top_builddir)/modules/completion/libscicompletion.la
 modulename=shell
 
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index c0f988a..4c31234 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -116,8 +116,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
         "$(DESTDIR)$(libscishell_la_sci_gatewaydir)" \
         "$(DESTDIR)$(libscishell_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libscishell_la_DEPENDENCIES = $(top_builddir)/modules/action_binding/libsciaction_binding.la \
-        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
+libscishell_la_DEPENDENCIES = $(top_builddir)/modules/history_manager/libscihistory_manager.la \
         $(top_builddir)/modules/core/libscicore.la \
         $(top_builddir)/libs/MALLOC/libscimalloc.la \
         $(top_builddir)/modules/output_stream/libscioutput_stream.la
@@ -461,7 +460,11 @@ CHECK_SRC = $(libscishell_la_SOURCES)
 INCLUDE_FLAGS = $(libscishell_la_CFLAGS)
 
 # cyclic dep $(top_builddir)/modules/console/libsciconsole.la
-libscishell_la_LIBADD = $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/history_manager/libscihistory_manager.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 
+libscishell_la_LIBADD = $(top_builddir)/modules/history_manager/libscihistory_manager.la \
+                                                        $(top_builddir)/modules/core/libscicore.la \
+                                                        $(top_builddir)/libs/MALLOC/libscimalloc.la \
+                                                        $(top_builddir)/modules/output_stream/libscioutput_stream.la 
+
 # $(top_builddir)/modules/completion/libscicompletion.la
 modulename = shell
 
diff --git a/scilab/modules/tclsci/Makefile.am b/scilab/modules/tclsci/Makefile.am
index 1f31721..14c874f 100644
--- a/scilab/modules/tclsci/Makefile.am
+++ b/scilab/modules/tclsci/Makefile.am
@@ -67,7 +67,10 @@ libscitclsci_la_SOURCES = $(TCLSCI_C_SOURCES) $(GATEWAY_C_SOURCES)
 CHECK_SRC= $(libscitclsci_la_SOURCES)
 INCLUDE_FLAGS = $(libscitclsci_la_CFLAGS)
 
-libscitclsci_la_LIBADD =  $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscitclsci_la_LIBADD =        $(top_builddir)/modules/fileio/libscifileio.la \
+                                                        $(top_builddir)/modules/core/libscicore.la \
+                                                        $(top_builddir)/libs/MALLOC/libscimalloc.la \
+                                                        $(top_builddir)/modules/output_stream/libscioutput_stream.la
 #### Target ######
 modulename=tclsci
 
diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index 15afe38..74e2a1c 100644
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -111,7 +111,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
         "$(DESTDIR)$(libscitclsci_la_sci_gatewaydir)" \
         "$(DESTDIR)$(libscitclsci_la_tcldir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libscitclsci_la_DEPENDENCIES = $(top_builddir)/modules/action_binding/libsciaction_binding.la \
+libscitclsci_la_DEPENDENCIES =  \
         $(top_builddir)/modules/fileio/libscifileio.la \
         $(top_builddir)/modules/core/libscicore.la \
         $(top_builddir)/libs/MALLOC/libscimalloc.la \
@@ -482,7 +482,11 @@ libscitclsci_la_SOURCES = $(TCLSCI_C_SOURCES) $(GATEWAY_C_SOURCES)
 # For the code check (splint)
 CHECK_SRC = $(libscitclsci_la_SOURCES)
 INCLUDE_FLAGS = $(libscitclsci_la_CFLAGS)
-libscitclsci_la_LIBADD = $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscitclsci_la_LIBADD = $(top_builddir)/modules/fileio/libscifileio.la \
+                                                        $(top_builddir)/modules/core/libscicore.la \
+                                                        $(top_builddir)/libs/MALLOC/libscimalloc.la \
+                                                        $(top_builddir)/modules/output_stream/libscioutput_stream.la
+
 #### Target ######
 modulename = tclsci