summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorBruno JOFRET <bruno.jofret@scilab.org>2010-06-18 10:44:27 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-06-18 11:07:21 +0200
commit35778572a5d38d65c10c1405534d28930e65d3ff (patch)
tree3fc36cf6e511c5ecbae9fdd5d1e9041bcd42fdf4 /scilab/modules/Makefile.am
parent7bb45f904e4cd815e6751b3129264bd15925e2e6 (diff)
parenta96e3186f023ad97e7bf11e924275778588a21d4 (diff)
downloadscilab-35778572a5d38d65c10c1405534d28930e65d3ff.zip
scilab-35778572a5d38d65c10c1405534d28930e65d3ff.tar.gz
Merge remote branch 'origin/master' into editvar
Conflicts: scilab/Scilab.sln scilab/Scilab_f2c.sln scilab/configure scilab/modules/Makefile.am scilab/modules/Makefile.in scilab/modules/core/includes/callinterf.h scilab/modules/core/src/c/callinterf.c scilab/modules/core/src/c/dynamic_gateways.c Change-Id: I208bc38669d1b3111be8e373ed32209019bcd75e
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am12
1 files changed, 8 insertions, 4 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index b4d1578..5a62517 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -2,11 +2,11 @@
2# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru 3# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
4# Copyright (C) DIGITEO - 2009 - Sylvestre Ledru 4# Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
5# 5#
6# This file must be used under the terms of the CeCILL. 6# This file must be used under the terms of the CeCILL.
7# This source file is licensed as described in the file COPYING, which 7# This source file is licensed as described in the file COPYING, which
8# you should have received as part of this distribution. The terms 8# you should have received as part of this distribution. The terms
9# are also available at 9# are also available at
10# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11# 11#
12 12
@@ -18,7 +18,6 @@ SUBDIRS = core
18 18
19SUBDIRS += \ 19SUBDIRS += \
20output_stream \ 20output_stream \
21action_binding \
22arnoldi \ 21arnoldi \
23elementary_functions \ 22elementary_functions \
24string \ 23string \
@@ -29,6 +28,7 @@ history_manager \
29spreadsheet \ 28spreadsheet \
30tclsci \ 29tclsci \
31localization \ 30localization \
31action_binding \
32renderer \ 32renderer \
33shell \ 33shell \
34completion \ 34completion \
@@ -85,6 +85,8 @@ hdf5 \
85graph\ 85graph\
86xcos \ 86xcos \
87xpad \ 87xpad \
88parallel \
89modules_manager \
88ui_data 90ui_data
89 91
90 92
@@ -146,6 +148,7 @@ NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
146 $(top_builddir)/modules/graphics/libscigraphics-disable.la \ 148 $(top_builddir)/modules/graphics/libscigraphics-disable.la \
147 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \ 149 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
148 $(top_builddir)/modules/console/libsciconsole-disable.la \ 150 $(top_builddir)/modules/console/libsciconsole-disable.la \
151 $(top_builddir)/modules/action_binding/libsciaction_binding-disable.la \
149 $(top_builddir)/modules/jvm/libscijvm-disable.la \ 152 $(top_builddir)/modules/jvm/libscijvm-disable.la \
150 $(top_builddir)/modules/xcos/libscixcos-disable.la \ 153 $(top_builddir)/modules/xcos/libscixcos-disable.la \
151 $(top_builddir)/modules/xpad/libscixpad-disable.la \ 154 $(top_builddir)/modules/xpad/libscixpad-disable.la \
@@ -187,7 +190,8 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
187 $(top_builddir)/modules/string/libscistring.la \ 190 $(top_builddir)/modules/string/libscistring.la \
188 $(top_builddir)/modules/fftw/libscifftw.la \ 191 $(top_builddir)/modules/fftw/libscifftw.la \
189 $(top_builddir)/modules/hdf5/libscihdf5.la \ 192 $(top_builddir)/modules/hdf5/libscihdf5.la \
190 $(top_builddir)/modules/functions/libscifunctions.la 193 $(top_builddir)/modules/functions/libscifunctions.la \
194 $(top_builddir)/modules/parallel/libsciparallel.la
191 195
192 196
193# These libraries are loaded dynamically from Scilab. 197# These libraries are loaded dynamically from Scilab.