explicit dependency on libscicommons to get the giws exception management 01/12601/1
Sylvestre Ledru [Thu, 19 Sep 2013 15:44:08 +0000 (17:44 +0200)]
Change-Id: I278e861a71c58997b2593d39be54d37ddfae723b

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

index 84d7560..4eac6c7 100644 (file)
@@ -18,7 +18,8 @@ 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
+libscihelptools_la_LIBADD = libscihelptools-algo.la \
+       $(top_builddir)/modules/commons/libscicommons.la
 libscihelptools_algo_la_SOURCES =  $(HELPTOOLS_SOURCES)
 libscihelptools_algo_la_CPPFLAGS = $(libscihelptools_la_CPPFLAGS)
 noinst_LTLIBRARIES = libscihelptools-algo.la
index 990d63b..9a3b0e0 100644 (file)
@@ -184,7 +184,8 @@ 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@    libscihelptools-algo.la \
+@BUILD_HELP_TRUE@@GUI_TRUE@    $(top_builddir)/modules/commons/libscicommons.la
 am__libscihelptools_la_SOURCES_DIST = sci_gateway/nogui/nogui.c \
        sci_gateway/c/gw_helptools.c \
        sci_gateway/cpp/sci_buildDocv2.cpp
@@ -565,7 +566,9 @@ 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@libscihelptools_la_LIBADD = libscihelptools-algo.la \
+@BUILD_HELP_TRUE@@GUI_TRUE@    $(top_builddir)/modules/commons/libscicommons.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