summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2009-10-14 11:20:31 +0200
committerAllan CORNET <allan.cornet@scilab.org>2009-10-14 11:20:31 +0200
commitf46a893051039f238a082d121243cac62dd44e56 (patch)
tree952865823f394240d0574101b41710ab925d09c0 /scilab/modules/Makefile.am
parent8d0b1876a878aa8ca2f6a68f22fb76aee3c59407 (diff)
parentcbcfbe5ea435f170357cf6653d290e5d2c2fdd7e (diff)
downloadscilab-f46a893051039f238a082d121243cac62dd44e56.zip
scilab-f46a893051039f238a082d121243cac62dd44e56.tar.gz
Merge commit 'refs/remotes/origin/master' into Xcos
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am41
1 files changed, 19 insertions, 22 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 94c5514..a341615 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -170,34 +170,31 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
170 $(top_builddir)/modules/completion/libscicompletion.la \ 170 $(top_builddir)/modules/completion/libscicompletion.la \
171 $(top_builddir)/modules/history_manager/libscihistory_manager.la \ 171 $(top_builddir)/modules/history_manager/libscihistory_manager.la \
172 $(top_builddir)/modules/action_binding/libsciaction_binding.la \ 172 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
173 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
174 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 173 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
175 $(top_builddir)/modules/sound/libscisound.la \
176 $(top_builddir)/modules/helptools/libscihelptools.la \
177 $(top_builddir)/modules/matio/libscimatio.la \
178 $(top_builddir)/modules/randlib/libscirandlib.la \
179 $(top_builddir)/modules/optimization/libscioptimization.la \
180 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
181 $(top_builddir)/modules/symbolic/libscisymbolic.la \
182 $(top_builddir)/modules/metanet/libscimetanet.la \
183 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
184 $(top_builddir)/modules/statistics/libscistatistics.la \
185 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
186 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
187 $(top_builddir)/modules/string/libscistring.la \ 174 $(top_builddir)/modules/string/libscistring.la \
175 $(top_builddir)/modules/fftw/libscifftw.la \
188 $(top_builddir)/modules/functions/libscifunctions.la \ 176 $(top_builddir)/modules/functions/libscifunctions.la \
189 $(top_builddir)/modules/hdf5/libscihdf5.la 177 $(top_builddir)/modules/hdf5/libscihdf5.la
190 178
191OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \
192$(top_builddir)/modules/umfpack/libsciumfpack.la \
193$(top_builddir)/modules/scicos/libsciscicos.la
194
195if SCICOS
196OTHER_LIBS += $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
197endif
198
199 179
200# Dev in progress 180# These libraries are loaded dynamically from Scilab.
181ENGINE_LIBS_DYNAMIC_LOAD = \
182 $(top_builddir)/modules/optimization/libscioptimization.la \
183 $(top_builddir)/modules/metanet/libscimetanet.la \
184 $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
185 $(top_builddir)/modules/interpolation/libsciinterpolation.la \
186 $(top_builddir)/modules/symbolic/libscisymbolic.la \
187 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
188 $(top_builddir)/modules/statistics/libscistatistics.la \
189 $(top_builddir)/modules/randlib/libscirandlib.la \
190 $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
191 $(top_builddir)/modules/scicos/libsciscicos.la \
192 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
193 $(top_builddir)/modules/sound/libscisound.la \
194 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
195 $(top_builddir)/modules/umfpack/libsciumfpack.la \
196 $(top_builddir)/modules/matio/libscimatio.la \
197 $(top_builddir)/modules/helptools/libscihelptools.la
201 198
202# Core modules 199# Core modules
203libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) 200libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)