* Bug 15452 fixed: libsciconsole-minimal.la is now linked 17/20017/4
Sylvestre LEDRU [Fri, 4 May 2018 21:44:51 +0000 (23:44 +0200)]
  http://bugzilla.scilab.org/15452

  Patch pushed.

Change-Id: I8baac9aa1a1f91c107e91f71fd1510a7c2cfa602

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

index fce8e31..134902d 100644 (file)
@@ -505,6 +505,7 @@ 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 558e735..88d9b62 100644 (file)
@@ -109,6 +109,7 @@ 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 fe31034..7b67346 100644 (file)
@@ -125,6 +125,7 @@ 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 efc6f4f..fa3ba67 100644 (file)
@@ -178,8 +178,6 @@ 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 74a4a47..934b062 100644 (file)
@@ -224,7 +224,6 @@ 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 \
@@ -1095,7 +1094,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) $(libsciconsole_la_DEPENDENCIES) $(EXTRA_libsciconsole_la_DEPENDENCIES) 
+libsciconsole.la: $(libsciconsole_la_OBJECTS) $(EXTRA_libsciconsole_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK) $(am_libsciconsole_la_rpath) $(libsciconsole_la_OBJECTS) $(libsciconsole_la_LIBADD) $(LIBS)
 
 mostlyclean-compile: