summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-10-05 17:24:30 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-11-04 14:11:55 +0100
commitd7593012a9afad2ad18ff1108d78a57f4d6cef64 (patch)
treeaf6684142e2075504339d470408b0ce724ceaac5 /scilab
parent8c8a355c7f0c50c3dd26093f5fb7937a958a1492 (diff)
downloadscilab-d7593012a9afad2ad18ff1108d78a57f4d6cef64.zip
scilab-d7593012a9afad2ad18ff1108d78a57f4d6cef64.tar.gz
Bug 6942 removed: Drop the dependency on tcl/tk in the io module which
was adding a dependency on X11 Change-Id: Ifc6212aff57f512c22e57bc541d1be4f2b779f73
Diffstat (limited to 'scilab')
-rw-r--r--scilab/CHANGES_5.3.X2
-rw-r--r--scilab/modules/Makefile.am4
-rw-r--r--scilab/modules/Makefile.in3
-rw-r--r--scilab/modules/io/Makefile.am2
-rw-r--r--scilab/modules/io/Makefile.in3
5 files changed, 7 insertions, 7 deletions
diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index df3e9e2..73f644b 100644
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -107,6 +107,8 @@ Bug Fixes:
107* bug 4827 fixed - The test_run function did not work properly with modules begining 107* bug 4827 fixed - The test_run function did not work properly with modules begining
108 with a "n". 108 with a "n".
109 109
110* bug 6942 fixed - Explicit dependency on the libX11 on scilab-cli was existing.
111
110* bug 7364 fixed - The "Checked" property misworked for uimenus and they could 112* bug 7364 fixed - The "Checked" property misworked for uimenus and they could
111 not have a callback. 113 not have a callback.
112 114
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index b4b47e8..afd59ad 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -140,7 +140,8 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
140 $(top_builddir)/modules/scinotes/libsciscinotes.la \ 140 $(top_builddir)/modules/scinotes/libsciscinotes.la \
141 $(top_builddir)/modules/ui_data/libsciui_data.la \ 141 $(top_builddir)/modules/ui_data/libsciui_data.la \
142 $(top_builddir)/modules/history_browser/libscihistory_browser.la \ 142 $(top_builddir)/modules/history_browser/libscihistory_browser.la \
143 $(top_builddir)/modules/commons/libscicommons.la 143 $(top_builddir)/modules/commons/libscicommons.la \
144 $(top_builddir)/modules/tclsci/libscitclsci.la
144 145
145if HDF5 146if HDF5
146GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload.la 147GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload.la
@@ -193,7 +194,6 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
193 $(top_builddir)/modules/string/libscistring.la \ 194 $(top_builddir)/modules/string/libscistring.la \
194 $(top_builddir)/modules/functions/libscifunctions.la \ 195 $(top_builddir)/modules/functions/libscifunctions.la \
195 $(top_builddir)/modules/hdf5/libscihdf5.la \ 196 $(top_builddir)/modules/hdf5/libscihdf5.la \
196 $(top_builddir)/modules/tclsci/libscitclsci.la \
197 $(top_builddir)/modules/pvm/libscipvm.la \ 197 $(top_builddir)/modules/pvm/libscipvm.la \
198 $(top_builddir)/modules/fftw/libscifftw.la 198 $(top_builddir)/modules/fftw/libscifftw.la
199 199
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 6253a30..6fc5d69 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -481,7 +481,7 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
481 $(top_builddir)/modules/ui_data/libsciui_data.la \ 481 $(top_builddir)/modules/ui_data/libsciui_data.la \
482 $(top_builddir)/modules/history_browser/libscihistory_browser.la \ 482 $(top_builddir)/modules/history_browser/libscihistory_browser.la \
483 $(top_builddir)/modules/commons/libscicommons.la \ 483 $(top_builddir)/modules/commons/libscicommons.la \
484 $(am__append_3) 484 $(top_builddir)/modules/tclsci/libscitclsci.la $(am__append_3)
485# HDF5 is here because it needs the JVM (see bug #5481) 485# HDF5 is here because it needs the JVM (see bug #5481)
486NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \ 486NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
487 $(top_builddir)/modules/graphics/libscigraphics-disable.la \ 487 $(top_builddir)/modules/graphics/libscigraphics-disable.la \
@@ -526,7 +526,6 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
526 $(top_builddir)/modules/string/libscistring.la \ 526 $(top_builddir)/modules/string/libscistring.la \
527 $(top_builddir)/modules/functions/libscifunctions.la \ 527 $(top_builddir)/modules/functions/libscifunctions.la \
528 $(top_builddir)/modules/hdf5/libscihdf5.la \ 528 $(top_builddir)/modules/hdf5/libscihdf5.la \
529 $(top_builddir)/modules/tclsci/libscitclsci.la \
530 $(top_builddir)/modules/pvm/libscipvm.la \ 529 $(top_builddir)/modules/pvm/libscipvm.la \
531 $(top_builddir)/modules/fftw/libscifftw.la 530 $(top_builddir)/modules/fftw/libscifftw.la
532 531
diff --git a/scilab/modules/io/Makefile.am b/scilab/modules/io/Makefile.am
index 7501fb5..74824eb 100644
--- a/scilab/modules/io/Makefile.am
+++ b/scilab/modules/io/Makefile.am
@@ -63,7 +63,7 @@ libsciio_la_SOURCES = $(IO_C_SOURCES) $(IO_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
63CHECK_SRC= $(IO_C_SOURCES) $(GATEWAY_C_SOURCES) 63CHECK_SRC= $(IO_C_SOURCES) $(GATEWAY_C_SOURCES)
64INCLUDE_FLAGS = $(libsciio_la_CFLAGS) 64INCLUDE_FLAGS = $(libsciio_la_CFLAGS)
65 65
66libsciio_la_LIBADD = $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 66libsciio_la_LIBADD = $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
67 67
68 68
69#### Target ###### 69#### Target ######
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 8cb4bda..9a9d4cd 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -113,7 +113,6 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
113libsciio_la_DEPENDENCIES = \ 113libsciio_la_DEPENDENCIES = \
114 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 114 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
115 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 115 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
116 $(top_builddir)/modules/tclsci/libscitclsci.la \
117 $(top_builddir)/modules/fileio/libscifileio.la \ 116 $(top_builddir)/modules/fileio/libscifileio.la \
118 $(top_builddir)/modules/integer/libsciinteger.la \ 117 $(top_builddir)/modules/integer/libsciinteger.la \
119 $(top_builddir)/modules/string/libscistring.la \ 118 $(top_builddir)/modules/string/libscistring.la \
@@ -465,7 +464,7 @@ libsciio_la_SOURCES = $(IO_C_SOURCES) $(IO_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
465# For the code check (splint) 464# For the code check (splint)
466CHECK_SRC = $(IO_C_SOURCES) $(GATEWAY_C_SOURCES) 465CHECK_SRC = $(IO_C_SOURCES) $(GATEWAY_C_SOURCES)
467INCLUDE_FLAGS = $(libsciio_la_CFLAGS) 466INCLUDE_FLAGS = $(libsciio_la_CFLAGS)
468libsciio_la_LIBADD = $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 467libsciio_la_LIBADD = $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
469 468
470#### Target ###### 469#### Target ######
471modulename = io 470modulename = io