libX dependencies removed in cli binary 49/17349/5
Cedric Delamarre [Tue, 20 Oct 2015 10:10:11 +0000 (12:10 +0200)]
Change-Id: Ib1412fd4ed890efbf4be8185e049dd5a9552bb76

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

index 068f111..cd8f929 100644 (file)
@@ -141,7 +141,8 @@ GUI_LIBS =  $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/commons/libscicommons.la \
        $(top_builddir)/modules/preferences/libscipreferences.la \
        $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la \
-       $(top_builddir)/modules/helptools/libscihelptools.la
+       $(top_builddir)/modules/helptools/libscihelptools.la \
+       $(top_builddir)/modules/tclsci/libscitclsci.la
 
 NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
        $(top_builddir)/modules/graphics/libscigraphics-disable.la \
@@ -155,7 +156,8 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
        $(top_builddir)/modules/ui_data/libsciui_data-disable.la \
        $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la \
        $(top_builddir)/modules/commons/libscicommons-disable.la \
-       $(top_builddir)/modules/preferences/libscipreferences-cli.la
+       $(top_builddir)/modules/preferences/libscipreferences-cli.la \
+       $(top_builddir)/modules/tclsci/libscitclsci-disable.la
 
 
 ENGINE_LIBS =  $(top_builddir)/modules/fileio/libscifileio.la \
@@ -193,7 +195,6 @@ 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 \
-       $(top_builddir)/modules/tclsci/libscitclsci.la \
        $(top_builddir)/modules/slint/libscislint.la
 
 # These libraries are loaded dynamically from Scilab.
index 40e7d7d..00ccb4c 100644 (file)
@@ -643,7 +643,8 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/commons/libscicommons.la \
        $(top_builddir)/modules/preferences/libscipreferences.la \
        $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la \
-       $(top_builddir)/modules/helptools/libscihelptools.la
+       $(top_builddir)/modules/helptools/libscihelptools.la \
+       $(top_builddir)/modules/tclsci/libscitclsci.la
 
 NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
        $(top_builddir)/modules/graphics/libscigraphics-disable.la \
@@ -657,7 +658,8 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
        $(top_builddir)/modules/ui_data/libsciui_data-disable.la \
        $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la \
        $(top_builddir)/modules/commons/libscicommons-disable.la \
-       $(top_builddir)/modules/preferences/libscipreferences-cli.la
+       $(top_builddir)/modules/preferences/libscipreferences-cli.la \
+       $(top_builddir)/modules/tclsci/libscitclsci-disable.la
 
 ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/mexlib/libmex.la \
@@ -694,7 +696,6 @@ 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 \
-       $(top_builddir)/modules/tclsci/libscitclsci.la \
        $(top_builddir)/modules/slint/libscislint.la $(am__append_6)
 
 # These libraries are loaded dynamically from Scilab.
index 1c9d0be..d73c715 100644 (file)
@@ -3,7 +3,6 @@
 #
 # This file is distributed under the same license as the Scilab package.
 
-
 if TCLTK
 
 TCLSCI_C_SOURCES = \
@@ -52,9 +51,6 @@ GATEWAY_C_SOURCES =
 
 endif
 
-pkglib_LTLIBRARIES = libscitclsci.la
-noinst_LTLIBRARIES = libscitclsci-algo.la
-
 libscitclsci_la_LDFLAGS = $(AM_LDFLAGS)
 
 libscitclsci_la_CPPFLAGS= \
@@ -83,15 +79,42 @@ libscitclsci_la_CPPFLAGS= \
     -I$(top_srcdir)/modules/console/includes/ \
     $(AM_CPPFLAGS)
 
+# Without the TCLSCI module
+libscitclsci_disable_la_CPPFLAGS = \
+    -I$(srcdir)/includes/ \
+    -I$(top_srcdir)/modules/ast/includes/ast/ \
+    -I$(top_srcdir)/modules/ast/includes/exps/ \
+    -I$(top_srcdir)/modules/ast/includes/operations/ \
+    -I$(top_srcdir)/modules/ast/includes/parse/ \
+    -I$(top_srcdir)/modules/ast/includes/symbol/ \
+    -I$(top_srcdir)/modules/ast/includes/system_env/ \
+    -I$(top_srcdir)/modules/ast/includes/types/ \
+    -I$(top_srcdir)/modules/ast/includes/analysis/ \
+    -I$(top_srcdir)/modules/api_scilab/includes/ \
+    -I$(top_srcdir)/modules/localization/includes/ \
+    -I$(top_srcdir)/modules/output_stream/includes/ \
+    $(AM_CPPFLAGS)
+
 libscitclsci_algo_la_SOURCES = $(TCLSCI_CPP_SOURCES) $(TCLSCI_C_SOURCES)
 libscitclsci_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 libscitclsci_algo_la_CPPFLAGS = $(libscitclsci_la_CPPFLAGS)
 
+TCLSCI_DISABLE_CPP_SOURCES = src/notclsci/notclsci.cpp
+libscitclsci_disable_la_SOURCES = $(TCLSCI_DISABLE_CPP_SOURCES)
+
+pkglib_LTLIBRARIES = libscitclsci-disable.la libscitclsci.la
+noinst_LTLIBRARIES = libscitclsci-algo.la
+
+
 # For the code check (splint)
 CHECK_SRC= $(libscitclsci_la_SOURCES)
 INCLUDE_FLAGS = $(libscitclsci_la_CPPFLAGS)
 
-libscitclsci_la_LIBADD = libscitclsci-algo.la $(TCLTK_LIBS)
+libscitclsci_la_LIBADD = libscitclsci-algo.la
+if TCLTK
+libscitclsci_la_LIBADD += $(TCLTK_LIBS)
+endif
+
 #### Target ######
 modulename=tclsci
 
index 1c94b86..54f3268 100644 (file)
@@ -110,7 +110,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@NEED_JAVA_TRUE@am__append_1 = java
+@TCLTK_TRUE@am__append_1 = $(TCLTK_LIBS)
+@NEED_JAVA_TRUE@am__append_2 = java
 subdir = modules/tclsci
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
@@ -205,9 +206,15 @@ AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+libscitclsci_disable_la_LIBADD =
+am__objects_3 = src/notclsci/libscitclsci_disable_la-notclsci.lo
+am_libscitclsci_disable_la_OBJECTS = $(am__objects_3)
+libscitclsci_disable_la_OBJECTS =  \
+       $(am_libscitclsci_disable_la_OBJECTS)
 am__DEPENDENCIES_1 =
+@TCLTK_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 libscitclsci_la_DEPENDENCIES = libscitclsci-algo.la \
-       $(am__DEPENDENCIES_1)
+       $(am__DEPENDENCIES_2)
 am__libscitclsci_la_SOURCES_DIST = sci_gateway/c/sci_opentk.c \
        sci_gateway/c/sci_TCL_SetVar.c \
        sci_gateway/c/sci_TCL_ExistVar.c \
@@ -221,7 +228,7 @@ am__libscitclsci_la_SOURCES_DIST = sci_gateway/c/sci_opentk.c \
        sci_gateway/c/sci_TCL_GetVar.c \
        sci_gateway/c/sci_TCL_ExistArray.c \
        sci_gateway/c/sci_TCL_UpVar.c sci_gateway/cpp/tclsci_gw.cpp
-@TCLTK_TRUE@am__objects_3 =  \
+@TCLTK_TRUE@am__objects_4 =  \
 @TCLTK_TRUE@   sci_gateway/c/libscitclsci_la-sci_opentk.lo \
 @TCLTK_TRUE@   sci_gateway/c/libscitclsci_la-sci_TCL_SetVar.lo \
 @TCLTK_TRUE@   sci_gateway/c/libscitclsci_la-sci_TCL_ExistVar.lo \
@@ -235,9 +242,9 @@ am__libscitclsci_la_SOURCES_DIST = sci_gateway/c/sci_opentk.c \
 @TCLTK_TRUE@   sci_gateway/c/libscitclsci_la-sci_TCL_GetVar.lo \
 @TCLTK_TRUE@   sci_gateway/c/libscitclsci_la-sci_TCL_ExistArray.lo \
 @TCLTK_TRUE@   sci_gateway/c/libscitclsci_la-sci_TCL_UpVar.lo
-@TCLTK_TRUE@am__objects_4 =  \
+@TCLTK_TRUE@am__objects_5 =  \
 @TCLTK_TRUE@   sci_gateway/cpp/libscitclsci_la-tclsci_gw.lo
-am_libscitclsci_la_OBJECTS = $(am__objects_3) $(am__objects_4)
+am_libscitclsci_la_OBJECTS = $(am__objects_4) $(am__objects_5)
 libscitclsci_la_OBJECTS = $(am_libscitclsci_la_OBJECTS)
 libscitclsci_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -295,8 +302,10 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(libscitclsci_algo_la_SOURCES) $(libscitclsci_la_SOURCES)
+SOURCES = $(libscitclsci_algo_la_SOURCES) \
+       $(libscitclsci_disable_la_SOURCES) $(libscitclsci_la_SOURCES)
 DIST_SOURCES = $(am__libscitclsci_algo_la_SOURCES_DIST) \
+       $(libscitclsci_disable_la_SOURCES) \
        $(am__libscitclsci_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -656,8 +665,6 @@ yacc_present = @yacc_present@
 @TCLTK_TRUE@    sci_gateway/c/sci_TCL_ExistArray.c \
 @TCLTK_TRUE@    sci_gateway/c/sci_TCL_UpVar.c
 
-pkglib_LTLIBRARIES = libscitclsci.la
-noinst_LTLIBRARIES = libscitclsci-algo.la
 libscitclsci_la_LDFLAGS = $(AM_LDFLAGS)
 libscitclsci_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
@@ -685,14 +692,36 @@ libscitclsci_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/console/includes/ \
     $(AM_CPPFLAGS)
 
+
+# Without the TCLSCI module
+libscitclsci_disable_la_CPPFLAGS = \
+    -I$(srcdir)/includes/ \
+    -I$(top_srcdir)/modules/ast/includes/ast/ \
+    -I$(top_srcdir)/modules/ast/includes/exps/ \
+    -I$(top_srcdir)/modules/ast/includes/operations/ \
+    -I$(top_srcdir)/modules/ast/includes/parse/ \
+    -I$(top_srcdir)/modules/ast/includes/symbol/ \
+    -I$(top_srcdir)/modules/ast/includes/system_env/ \
+    -I$(top_srcdir)/modules/ast/includes/types/ \
+    -I$(top_srcdir)/modules/ast/includes/analysis/ \
+    -I$(top_srcdir)/modules/api_scilab/includes/ \
+    -I$(top_srcdir)/modules/localization/includes/ \
+    -I$(top_srcdir)/modules/output_stream/includes/ \
+    $(AM_CPPFLAGS)
+
 libscitclsci_algo_la_SOURCES = $(TCLSCI_CPP_SOURCES) $(TCLSCI_C_SOURCES)
 libscitclsci_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 libscitclsci_algo_la_CPPFLAGS = $(libscitclsci_la_CPPFLAGS)
+TCLSCI_DISABLE_CPP_SOURCES = src/notclsci/notclsci.cpp
+libscitclsci_disable_la_SOURCES = $(TCLSCI_DISABLE_CPP_SOURCES)
+pkglib_LTLIBRARIES = libscitclsci-disable.la libscitclsci.la
+noinst_LTLIBRARIES = libscitclsci-algo.la
 
 # For the code check (splint)
 CHECK_SRC = $(libscitclsci_la_SOURCES)
 INCLUDE_FLAGS = $(libscitclsci_la_CPPFLAGS)
-libscitclsci_la_LIBADD = libscitclsci-algo.la $(TCLTK_LIBS)
+libscitclsci_la_LIBADD = libscitclsci-algo.la $(am__append_1)
+
 #### Target ######
 modulename = tclsci
 
@@ -777,7 +806,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
 #### the procedure will be the same with Microsoft Windows (C)
 #### and Linux/Unix
 #######################################################################
-TARGETS_ALL = $(am__append_1)
+TARGETS_ALL = $(am__append_2)
 
 ################ MACROS ######################
 # Rule to build a macro
@@ -962,6 +991,12 @@ src/c/libscitclsci_algo_la-LoadUnloadTclsci.lo: src/c/$(am__dirstamp) \
 
 libscitclsci-algo.la: $(libscitclsci_algo_la_OBJECTS) $(libscitclsci_algo_la_DEPENDENCIES) $(EXTRA_libscitclsci_algo_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK)  $(libscitclsci_algo_la_OBJECTS) $(libscitclsci_algo_la_LIBADD) $(LIBS)
+src/notclsci/libscitclsci_disable_la-notclsci.lo:  \
+       src/notclsci/$(am__dirstamp) \
+       src/notclsci/$(DEPDIR)/$(am__dirstamp)
+
+libscitclsci-disable.la: $(libscitclsci_disable_la_OBJECTS) $(libscitclsci_disable_la_DEPENDENCIES) $(EXTRA_libscitclsci_disable_la_DEPENDENCIES) 
+       $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libscitclsci_disable_la_OBJECTS) $(libscitclsci_disable_la_LIBADD) $(LIBS)
 sci_gateway/c/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c
        @: > sci_gateway/c/$(am__dirstamp)
@@ -1066,6 +1101,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscitclsci_algo_la-setvar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscitclsci_algo_la-ScilabEval.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/notclsci/$(DEPDIR)/libscitclsci_algo_la-notclsci.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/notclsci/$(DEPDIR)/libscitclsci_disable_la-notclsci.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1318,6 +1354,13 @@ src/cpp/libscitclsci_algo_la-ScilabEval.lo: src/cpp/ScilabEval.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscitclsci_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscitclsci_algo_la-ScilabEval.lo `test -f 'src/cpp/ScilabEval.cpp' || echo '$(srcdir)/'`src/cpp/ScilabEval.cpp
 
+src/notclsci/libscitclsci_disable_la-notclsci.lo: src/notclsci/notclsci.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscitclsci_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/notclsci/libscitclsci_disable_la-notclsci.lo -MD -MP -MF src/notclsci/$(DEPDIR)/libscitclsci_disable_la-notclsci.Tpo -c -o src/notclsci/libscitclsci_disable_la-notclsci.lo `test -f 'src/notclsci/notclsci.cpp' || echo '$(srcdir)/'`src/notclsci/notclsci.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/notclsci/$(DEPDIR)/libscitclsci_disable_la-notclsci.Tpo src/notclsci/$(DEPDIR)/libscitclsci_disable_la-notclsci.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/notclsci/notclsci.cpp' object='src/notclsci/libscitclsci_disable_la-notclsci.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscitclsci_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/notclsci/libscitclsci_disable_la-notclsci.lo `test -f 'src/notclsci/notclsci.cpp' || echo '$(srcdir)/'`src/notclsci/notclsci.cpp
+
 sci_gateway/cpp/libscitclsci_la-tclsci_gw.lo: sci_gateway/cpp/tclsci_gw.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscitclsci_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscitclsci_la-tclsci_gw.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscitclsci_la-tclsci_gw.Tpo -c -o sci_gateway/cpp/libscitclsci_la-tclsci_gw.lo `test -f 'sci_gateway/cpp/tclsci_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/tclsci_gw.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscitclsci_la-tclsci_gw.Tpo sci_gateway/cpp/$(DEPDIR)/libscitclsci_la-tclsci_gw.Plo