summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-04-02 15:48:48 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-04-02 15:48:48 +0200
commita992c8622915fc4e42bf95c1e2d862a96a1e7ab6 (patch)
treec679f69e26087f713bec0706d1cd18cc9d93f2a5 /scilab/modules/Makefile.am
parent090177d8b21ad648691932f5e0fcfa9fe2217eef (diff)
parent34963c1d5c78b6a32620d0c2c64e38f5dfafcf0b (diff)
downloadscilab-a992c8622915fc4e42bf95c1e2d862a96a1e7ab6.zip
scilab-a992c8622915fc4e42bf95c1e2d862a96a1e7ab6.tar.gz
Merge commit 'refs/remotes/origin/master' into atoms
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am88
1 files changed, 53 insertions, 35 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 5fe9ec3..c114354 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -1,7 +1,14 @@
1########## 1#
2### Sylvestre Ledru <sylvestre.ledru@inria.fr> 2# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3### INRIA - Scilab 2006/2007 3# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
4########## 4# Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
5#
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
8# you should have received as part of this distribution. The terms
9# are also available at
10# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11#
5 12
6# The order DOES matter !!! 13# The order DOES matter !!!
7 14
@@ -99,14 +106,37 @@ endif
99#### Basic files #### 106#### Basic files ####
100libscilab_la_rootdir = $(mydatadir) 107libscilab_la_rootdir = $(mydatadir)
101 108
102# 109# libscilab is the full library with the GUI
103pkglib_LTLIBRARIES = libscilab.la 110# libscilab-cli is for scilab-cli (without GUI)
111pkglib_LTLIBRARIES = libscilab.la libscilab-cli.la
104libscilab_la_SOURCES = 112libscilab_la_SOURCES =
113libscilab_cli_la_SOURCES =
105 114
106libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) 115libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS)
116libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS)
117
118EXTERNAL_LIBS = $(top_builddir)/libs/hashtable/libscihashtable.la \
119$(top_builddir)/libs/MALLOC/libscimalloc.la \
120$(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
121$(top_builddir)/libs/libst/libscilibst.la
122
123
124GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
125 $(top_builddir)/modules/renderer/libscirenderer.la \
126 $(top_builddir)/modules/graphics/libscigraphics.la \
127 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
128 $(top_builddir)/modules/console/libsciconsole.la \
129 $(top_builddir)/modules/jvm/libscijvm.la
130
131NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
132 $(top_builddir)/modules/renderer/libscirenderer-disable.la \
133 $(top_builddir)/modules/graphics/libscigraphics-disable.la \
134 $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
135 $(top_builddir)/modules/console/libsciconsole-disable.la \
136 $(top_builddir)/modules/jvm/libscijvm-disable.la
107 137
108ALL_LIBS= $(top_builddir)/modules/fileio/libscifileio.la \ 138ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
109$(top_builddir)/modules/mexlib/libmex.la \ 139 $(top_builddir)/modules/mexlib/libmex.la \
110 $(top_builddir)/modules/boolean/libsciboolean.la \ 140 $(top_builddir)/modules/boolean/libsciboolean.la \
111 $(top_builddir)/modules/cacsd/libscicacsd.la \ 141 $(top_builddir)/modules/cacsd/libscicacsd.la \
112 $(top_builddir)/modules/core/libscicore.la \ 142 $(top_builddir)/modules/core/libscicore.la \
@@ -116,10 +146,6 @@ $(top_builddir)/modules/mexlib/libmex.la \
116 $(top_builddir)/modules/double/libscidouble.la \ 146 $(top_builddir)/modules/double/libscidouble.la \
117 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 147 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
118 $(top_builddir)/modules/fileio/libscifileio.la \ 148 $(top_builddir)/modules/fileio/libscifileio.la \
119 $(top_builddir)/modules/graphics/libscigraphics.la \
120 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
121 $(top_builddir)/modules/renderer/libscirenderer.la \
122 $(top_builddir)/modules/gui/libscigui.la \
123 $(top_builddir)/modules/integer/libsciinteger.la \ 149 $(top_builddir)/modules/integer/libsciinteger.la \
124 $(top_builddir)/modules/intersci/libsciintersci.la \ 150 $(top_builddir)/modules/intersci/libsciintersci.la \
125 $(top_builddir)/modules/io/libsciio.la \ 151 $(top_builddir)/modules/io/libsciio.la \
@@ -133,7 +159,6 @@ $(top_builddir)/modules/mexlib/libmex.la \
133 $(top_builddir)/modules/pvm/libscipvm.la \ 159 $(top_builddir)/modules/pvm/libscipvm.la \
134 $(top_builddir)/modules/sparse/libscisparse.la \ 160 $(top_builddir)/modules/sparse/libscisparse.la \
135 $(top_builddir)/modules/shell/libscishell.la \ 161 $(top_builddir)/modules/shell/libscishell.la \
136 $(top_builddir)/modules/console/libsciconsole.la \
137 $(top_builddir)/modules/completion/libscicompletion.la \ 162 $(top_builddir)/modules/completion/libscicompletion.la \
138 $(top_builddir)/modules/history_manager/libscihistory_manager.la \ 163 $(top_builddir)/modules/history_manager/libscihistory_manager.la \
139 $(top_builddir)/modules/action_binding/libsciaction_binding.la \ 164 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
@@ -150,38 +175,31 @@ $(top_builddir)/modules/mexlib/libmex.la \
150 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \ 175 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
151 $(top_builddir)/modules/statistics/libscistatistics.la \ 176 $(top_builddir)/modules/statistics/libscistatistics.la \
152 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \ 177 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
153 $(top_builddir)/modules/interpolation/libsciinterpolation.la 178 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
179 $(top_builddir)/modules/string/libscistring.la
180
181OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \
182$(top_builddir)/modules/umfpack/libsciumfpack.la \
183$(top_builddir)/modules/scicos/libsciscicos.la
184
185if SCICOS
186OTHER_LIBS += $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
187endif
188
154 189
155# Dev in progress 190# Dev in progress
156 191
157# Core modules 192# Core modules
158libscilab_la_LIBADD = $(ALL_LIBS) 193libscilab_la_LIBADD = $(ENGINE_LIBS) $(GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
194
195# Core modules
196libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
159 197
160if ENABLE_STATIC 198if ENABLE_STATIC
161libscilab_la_LIBADD += $(ALL_LIBS) 199libscilab_la_LIBADD += $(ALL_LIBS)
162 200
163endif 201endif
164# Temp stuff
165libscilab_la_LIBADD += $(top_builddir)/modules/string/libscistring.la
166 202
167#if MPI 203#if MPI
168#libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la 204#libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la
169#endif 205#endif
170
171libscilab_la_LIBADD += $(top_builddir)/modules/fftw/libscifftw.la
172
173libscilab_la_LIBADD += $(top_builddir)/modules/umfpack/libsciumfpack.la
174
175libscilab_la_LIBADD += $(top_builddir)/modules/jvm/libscijvm.la
176
177libscilab_la_LIBADD += $(top_builddir)/modules/scicos/libsciscicos.la
178if SCICOS
179libscilab_la_LIBADD += $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
180endif
181
182## Libs
183libscilab_la_LIBADD += \
184$(top_builddir)/libs/hashtable/libscihashtable.la \
185$(top_builddir)/libs/MALLOC/libscimalloc.la \
186$(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
187$(top_builddir)/libs/libst/libscilibst.la