Linux compilation fixed after https://codereview.scilab.org/#/c/17274/ 13/17313/2
Cedric Delamarre [Tue, 13 Oct 2015 08:38:14 +0000 (10:38 +0200)]
Change-Id: I7601812482b4cd631c1f1a7511d0f02f9564d451

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

index fba1bcb..83e7bd4 100644 (file)
@@ -138,7 +138,6 @@ GUI_LIBS =  $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/ui_data/libsciui_data.la \
        $(top_builddir)/modules/history_browser/libscihistory_browser.la \
        $(top_builddir)/modules/commons/libscicommons.la \
-       $(top_builddir)/modules/tclsci/libscitclsci.la \
        $(top_builddir)/modules/preferences/libscipreferences.la \
        $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la \
        $(top_builddir)/modules/helptools/libscihelptools.la
@@ -192,7 +191,8 @@ ENGINE_LIBS =       $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/functions_manager/libscifunctions_manager.la \
        $(top_builddir)/modules/types/libscitypes.la \
        $(top_builddir)/modules/xml/libscixml.la \
-       $(top_builddir)/modules/external_objects/libsciexternal_objects.la
+       $(top_builddir)/modules/external_objects/libsciexternal_objects.la \
+       $(top_builddir)/modules/tclsci/libscitclsci.la
 
 # These libraries are loaded dynamically from Scilab.
 ENGINE_LIBS_DYNAMIC_LOAD = \
index 8ac4f8d..0a7e2b2 100644 (file)
@@ -641,7 +641,6 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/ui_data/libsciui_data.la \
        $(top_builddir)/modules/history_browser/libscihistory_browser.la \
        $(top_builddir)/modules/commons/libscicommons.la \
-       $(top_builddir)/modules/tclsci/libscitclsci.la \
        $(top_builddir)/modules/preferences/libscipreferences.la \
        $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la \
        $(top_builddir)/modules/helptools/libscihelptools.la
@@ -695,7 +694,7 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/types/libscitypes.la \
        $(top_builddir)/modules/xml/libscixml.la \
        $(top_builddir)/modules/external_objects/libsciexternal_objects.la \
-       $(am__append_6)
+       $(top_builddir)/modules/tclsci/libscitclsci.la $(am__append_6)
 
 # These libraries are loaded dynamically from Scilab.
 ENGINE_LIBS_DYNAMIC_LOAD = \