summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-09-02 17:47:37 +0200
committerBruno JOFRET <bruno.jofret@scilab.org>2010-09-03 11:15:22 +0200
commit8c4feb0f935b56cc9491406a2c16f7281fdd23b9 (patch)
treecf374b392dd4dbc0ba5cbb53e36747462c96e541 /scilab/modules/Makefile.am
parenta6fc9f1eb73622ca0b3346d452e2614aec7a9476 (diff)
downloadscilab-8c4feb0f935b56cc9491406a2c16f7281fdd23b9.zip
scilab-8c4feb0f935b56cc9491406a2c16f7281fdd23b9.tar.gz
* Create a java core library with the main scilab java class
org.scilab.modules.core.Scilab * Change the build order. JVM is built earlier and core is built only once * GuiManagement.getSCIHOME moved from the console module to the commons one (with the JNI code) + update of the usage of it Change-Id: I738f05ebba000da2671d29c1ec96672478eb4553
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am5
1 files changed, 2 insertions, 3 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index f2ed570..62affce 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -14,9 +14,8 @@
14 14
15# core is the main module of Scilab. All the compilation deps has been removed 15# core is the main module of Scilab. All the compilation deps has been removed
16# since it already linked almost the whole world 16# since it already linked almost the whole world
17SUBDIRS = core
18 17
19SUBDIRS += \ 18SUBDIRS = \
20output_stream \ 19output_stream \
21arnoldi \ 20arnoldi \
22elementary_functions \ 21elementary_functions \
@@ -29,6 +28,7 @@ spreadsheet \
29tclsci \ 28tclsci \
30localization \ 29localization \
31commons \ 30commons \
31jvm \
32action_binding \ 32action_binding \
33renderer \ 33renderer \
34shell \ 34shell \
@@ -36,7 +36,6 @@ completion \
36console \ 36console \
37graphic_export \ 37graphic_export \
38gui \ 38gui \
39jvm \
40graphics \ 39graphics \
41optimization \ 40optimization \
42symbolic \ 41symbolic \