summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-04-13 17:21:43 +0200
committerVincent COUVERT <vincent.couvert@scilab.org>2010-04-13 17:29:25 +0200
commit4eee0238ce653fc136ed93c3ac177c9904df5368 (patch)
tree74a245ba2fc168d1beb1fe3faa9a072ce3a8d2e2
parent701e29c47d91d14bed86d28257ad7a315c8f1da6 (diff)
downloadscilab-4eee0238ce653fc136ed93c3ac177c9904df5368.zip
scilab-4eee0238ce653fc136ed93c3ac177c9904df5368.tar.gz
Switch the build order between gui and jvm. The GUI module needs now the JVM module to the class org.scilab.modules.jvm.LoadClassPath
Change-Id: Ie955202d9c6668c6ded198aabb1c279de5a0dadb
-rw-r--r--scilab/modules/Makefile.am2
-rw-r--r--scilab/modules/Makefile.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index b03d823..0fe92de 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -34,8 +34,8 @@ shell \
34completion \ 34completion \
35console \ 35console \
36graphic_export \ 36graphic_export \
37gui \
38jvm \ 37jvm \
38gui \
39graphics \ 39graphics \
40optimization \ 40optimization \
41symbolic \ 41symbolic \
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 301c1c8..001b206 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -154,7 +154,7 @@ CTAGS = ctags
154DIST_SUBDIRS = core output_stream action_binding arnoldi \ 154DIST_SUBDIRS = core output_stream action_binding arnoldi \
155 elementary_functions string api_scilab dynamic_link fileio \ 155 elementary_functions string api_scilab dynamic_link fileio \
156 history_manager spreadsheet tclsci localization renderer shell \ 156 history_manager spreadsheet tclsci localization renderer shell \
157 completion console graphic_export gui jvm graphics \ 157 completion console graphic_export jvm gui graphics \
158 optimization symbolic randlib statistics special_functions \ 158 optimization symbolic randlib statistics special_functions \
159 interpolation linear_algebra integer data_structures mexlib \ 159 interpolation linear_algebra integer data_structures mexlib \
160 differential_equations cacsd polynomials boolean double pvm io \ 160 differential_equations cacsd polynomials boolean double pvm io \
@@ -431,7 +431,7 @@ top_srcdir = @top_srcdir@
431SUBDIRS = core output_stream action_binding arnoldi \ 431SUBDIRS = core output_stream action_binding arnoldi \
432 elementary_functions string api_scilab dynamic_link fileio \ 432 elementary_functions string api_scilab dynamic_link fileio \
433 history_manager spreadsheet tclsci localization renderer shell \ 433 history_manager spreadsheet tclsci localization renderer shell \
434 completion console graphic_export gui jvm graphics \ 434 completion console graphic_export jvm gui graphics \
435 optimization symbolic randlib statistics special_functions \ 435 optimization symbolic randlib statistics special_functions \
436 interpolation linear_algebra integer data_structures mexlib \ 436 interpolation linear_algebra integer data_structures mexlib \
437 differential_equations cacsd polynomials boolean double pvm io \ 437 differential_equations cacsd polynomials boolean double pvm io \