Revert "explicit dependency on libscicommons to get the giws exception management" 22/12622/2
Vincent COUVERT [Fri, 20 Sep 2013 13:01:39 +0000 (15:01 +0200)]
Does not fix the issue.

This reverts commit b1dcfe3dfa763a81a4d9fe98c8676d2800f26c73.

Change-Id: I4fb78baac6dd9dcd03d42203ca9a1753a15cbb08

scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in

index 4eac6c7..84d7560 100644 (file)
@@ -18,8 +18,7 @@ GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_buildDocv2.cpp
 GIWS_WRAPPERS = src/jni/BuildDocObject.giws.xml \
        src/jni/BuildDocObjectv2.giws.xml
 
-libscihelptools_la_LIBADD = libscihelptools-algo.la \
-       $(top_builddir)/modules/commons/libscicommons.la
+libscihelptools_la_LIBADD = libscihelptools-algo.la
 libscihelptools_algo_la_SOURCES =  $(HELPTOOLS_SOURCES)
 libscihelptools_algo_la_CPPFLAGS = $(libscihelptools_la_CPPFLAGS)
 noinst_LTLIBRARIES = libscihelptools-algo.la
index 9a3b0e0..990d63b 100644 (file)
@@ -184,8 +184,7 @@ am__v_lt_0 = --silent
 am__v_lt_1 = 
 @BUILD_HELP_TRUE@@GUI_TRUE@am_libscihelptools_algo_la_rpath =
 @BUILD_HELP_TRUE@@GUI_TRUE@libscihelptools_la_DEPENDENCIES =  \
-@BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools-algo.la \
-@BUILD_HELP_TRUE@@GUI_TRUE@    $(top_builddir)/modules/commons/libscicommons.la
+@BUILD_HELP_TRUE@@GUI_TRUE@    libscihelptools-algo.la
 am__libscihelptools_la_SOURCES_DIST = sci_gateway/nogui/nogui.c \
        sci_gateway/c/gw_helptools.c \
        sci_gateway/cpp/sci_buildDocv2.cpp
@@ -566,9 +565,7 @@ top_srcdir = @top_srcdir@
 @BUILD_HELP_TRUE@@GUI_TRUE@GIWS_WRAPPERS = src/jni/BuildDocObject.giws.xml \
 @BUILD_HELP_TRUE@@GUI_TRUE@    src/jni/BuildDocObjectv2.giws.xml
 
-@BUILD_HELP_TRUE@@GUI_TRUE@libscihelptools_la_LIBADD = libscihelptools-algo.la \
-@BUILD_HELP_TRUE@@GUI_TRUE@    $(top_builddir)/modules/commons/libscicommons.la
-
+@BUILD_HELP_TRUE@@GUI_TRUE@libscihelptools_la_LIBADD = libscihelptools-algo.la
 @BUILD_HELP_TRUE@@GUI_TRUE@libscihelptools_algo_la_SOURCES = $(HELPTOOLS_SOURCES)
 @BUILD_HELP_TRUE@@GUI_TRUE@libscihelptools_algo_la_CPPFLAGS = $(libscihelptools_la_CPPFLAGS)
 @BUILD_HELP_TRUE@@GUI_TRUE@noinst_LTLIBRARIES = libscihelptools-algo.la