Revert "* Bug 15452 fixed: libsciconsole-minimal.la is now linked" 66/20566/1
Clément DAVID [Fri, 19 Oct 2018 13:47:22 +0000 (15:47 +0200)]
This reverts commit f4c4fe7bb09cb1974ad7a5f6ab9b1c4562396eae as it break
the CI.

Change-Id: I85392ff5c74e368d88c5a54288e67b2c16e598e8

scilab/CHANGES.md
scilab/Makefile.am
scilab/Makefile.in
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in

index 9c07077..7a90852 100644 (file)
@@ -505,7 +505,6 @@ Known issues
 * [#15448](http://bugzilla.scilab.org/show_bug.cgi?id=15448): The Linux desktop files needed to be refreshed.
 * [#15449](http://bugzilla.scilab.org/show_bug.cgi?id=15449): Some small changes were required to ease the compilation with gcc >= 7.
 * [#15450](http://bugzilla.scilab.org/show_bug.cgi?id=15450): Scilab's compilation did not support the ppc64le architecture.
-* [#15452](http://bugzilla.scilab.org/show_bug.cgi?id=15452): The libsciconsole-minimal.la library was not linked.
 * [#15453](http://bugzilla.scilab.org/show_bug.cgi?id=15453): Scilab's compilation needed HOME to be writable.
 * [#15454](http://bugzilla.scilab.org/show_bug.cgi?id=15454): Hundreds of typos fixed all over the code: occured => occured, formated => formatted, an other => another, setted => set, retrived => retrieved ..
 * [#15455](http://bugzilla.scilab.org/show_bug.cgi?id=15455): OCaml build sometimes failed with Linenum being an unbound module.
index 88d9b62..558e735 100644 (file)
@@ -109,7 +109,6 @@ scilab_bin_LDADD    = \
 if NEED_JAVA
 scilab_bin_LDADD += \
                        $(top_builddir)/modules/console/libsciconsole.la \
-                       $(top_builddir)/modules/console/libsciconsole-minimal.la \
                        $(top_builddir)/modules/jvm/libscijvm.la \
                        $(top_builddir)/modules/commons/libscicommons.la
 else
index 7b67346..fe31034 100644 (file)
@@ -125,7 +125,6 @@ bin_PROGRAMS = scilab-bin$(EXEEXT) scilab-cli-bin$(EXEEXT)
 @IS_MACOSX_TRUE@am__append_6 = -framework Cocoa
 @NEED_JAVA_TRUE@am__append_7 = \
 @NEED_JAVA_TRUE@                       $(top_builddir)/modules/console/libsciconsole.la \
-@NEED_JAVA_TRUE@                       $(top_builddir)/modules/console/libsciconsole-minimal.la \
 @NEED_JAVA_TRUE@                       $(top_builddir)/modules/jvm/libscijvm.la \
 @NEED_JAVA_TRUE@                       $(top_builddir)/modules/commons/libscicommons.la
 
index fa3ba67..efc6f4f 100644 (file)
@@ -178,6 +178,8 @@ if GUI
 pkglib_LTLIBRARIES += libsciconsole.la
 endif
 
+libsciconsole_la_LIBADD = libsciconsole-minimal.la
+
 # All the sources needed by libsciconsole.la
 libsciconsole_la_SOURCES = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) $(CONSOLE_CPP_JNI_SOURCES) $(CONSOLE_CPP_SOURCES) $(CONSOLE_GATEWAY_C_SOURCES) $(CONSOLE_GATEWAY_CPP_SOURCES)
 
index 934b062..74a4a47 100644 (file)
@@ -224,6 +224,7 @@ 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 = 
+libsciconsole_la_DEPENDENCIES = libsciconsole-minimal.la
 am__libsciconsole_la_SOURCES_DIST = src/jni/GuiManagement_wrap.c \
        src/jni/DropFiles_wrap.c src/c/GuiManagement.c \
        src/c/dropFiles.c src/c/others/initMacOSXEnv.c \
@@ -1094,7 +1095,7 @@ src/cpp/libsciconsole_la-ScilabLinesUpdate.lo:  \
 src/cpp/libsciconsole_la-SetConsolePrompt.lo: src/cpp/$(am__dirstamp) \
        src/cpp/$(DEPDIR)/$(am__dirstamp)
 
-libsciconsole.la: $(libsciconsole_la_OBJECTS) $(EXTRA_libsciconsole_la_DEPENDENCIES) 
+libsciconsole.la: $(libsciconsole_la_OBJECTS) $(libsciconsole_la_DEPENDENCIES) $(EXTRA_libsciconsole_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK) $(am_libsciconsole_la_rpath) $(libsciconsole_la_OBJECTS) $(libsciconsole_la_LIBADD) $(LIBS)
 
 mostlyclean-compile: