Revert "libsciconsole must be, in any cases for the gui, loaded before the minimal... 76/14376/2
Vincent COUVERT [Tue, 8 Apr 2014 12:40:09 +0000 (14:40 +0200)]
This reverts commit 229655e8cf9beefc0ae20e1093b1e4228315460f.

Change-Id: I4abd7c01ddb2c6cbade1b512931bb808afa82e0a

scilab/Makefile.am
scilab/Makefile.in

index f9b0945..6831557 100644 (file)
@@ -68,8 +68,7 @@ scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS)
 scilab_bin_LDADD       = \
                        $(top_builddir)/modules/libscilab.la \
                        $(top_builddir)/modules/libscilab-cli.la \
-                        $(top_builddir)/modules/console/libsciconsole.la \
-                        $(top_builddir)/modules/console/libsciconsole-minimal.la \
+                       $(top_builddir)/modules/console/libsciconsole-minimal.la \
                        $(OPENMPI_LIBS) $(XML_LIBS) \
                        $(COMMON_LIBS) $(FLIBS)
 
index 83a0eb6..d1f054d 100644 (file)
@@ -269,7 +269,6 @@ am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 scilab_bin_DEPENDENCIES = $(top_builddir)/modules/libscilab.la \
        $(top_builddir)/modules/libscilab-cli.la \
-       $(top_builddir)/modules/console/libsciconsole.la \
        $(top_builddir)/modules/console/libsciconsole-minimal.la \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) $(am__append_3) \
@@ -820,7 +819,6 @@ scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS) \
 # libraries explicitly unless we link with -Wl,--copy-dt-needed-entries
 scilab_bin_LDADD = $(top_builddir)/modules/libscilab.la \
        $(top_builddir)/modules/libscilab-cli.la \
-       $(top_builddir)/modules/console/libsciconsole.la \
        $(top_builddir)/modules/console/libsciconsole-minimal.la \
        $(OPENMPI_LIBS) $(XML_LIBS) $(COMMON_LIBS) $(FLIBS) \
        $(am__append_3) $(am__append_10)