summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
diff options
context:
space:
mode:
authorBernard HUGUENEY <bernard.hugueney@scilab.org>2010-09-30 17:17:04 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-10-08 16:18:39 +0200
commit53f3c4f27bed806f567db2060dc75dd274ad8ded (patch)
tree2e575ae5775e48d3ca4088d1ccbfcf852894f723 /scilab/modules/Makefile.am
parenteefa4bb179fe73eaa1d030dfe07108223e476ec9 (diff)
downloadscilab-53f3c4f27bed806f567db2060dc75dd274ad8ded.zip
scilab-53f3c4f27bed806f567db2060dc75dd274ad8ded.tar.gz
partial fix bug 7970
Change-Id: I94bc44814b39d5d2885746c668ac26a7cd732625
Diffstat (limited to 'scilab/modules/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am15
1 files changed, 8 insertions, 7 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index c5c0f37..b4b47e8 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -185,19 +185,18 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
185 $(top_builddir)/modules/special_functions/libscispecial_functions.la \ 185 $(top_builddir)/modules/special_functions/libscispecial_functions.la \
186 $(top_builddir)/modules/time/libscitime.la \ 186 $(top_builddir)/modules/time/libscitime.la \
187 $(top_builddir)/modules/windows_tools/libsciwindows_tools.la \ 187 $(top_builddir)/modules/windows_tools/libsciwindows_tools.la \
188 $(top_builddir)/modules/tclsci/libscitclsci.la \
189 $(top_builddir)/modules/pvm/libscipvm.la \
190 $(top_builddir)/modules/sparse/libscisparse.la \ 188 $(top_builddir)/modules/sparse/libscisparse.la \
191 $(top_builddir)/modules/shell/libscishell.la \ 189 $(top_builddir)/modules/shell/libscishell.la \
192 $(top_builddir)/modules/completion/libscicompletion.la \ 190 $(top_builddir)/modules/completion/libscicompletion.la \
193 $(top_builddir)/modules/history_manager/libscihistory_manager.la \ 191 $(top_builddir)/modules/history_manager/libscihistory_manager.la \
194 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 192 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
195 $(top_builddir)/modules/string/libscistring.la \ 193 $(top_builddir)/modules/string/libscistring.la \
196 $(top_builddir)/modules/fftw/libscifftw.la \
197 $(top_builddir)/modules/hdf5/libscihdf5.la \
198 $(top_builddir)/modules/functions/libscifunctions.la \ 194 $(top_builddir)/modules/functions/libscifunctions.la \
199 $(top_builddir)/modules/parallel/libsciparallel.la 195 $(top_builddir)/modules/hdf5/libscihdf5.la \
200 196 $(top_builddir)/modules/tclsci/libscitclsci.la \
197 $(top_builddir)/modules/pvm/libscipvm.la \
198 $(top_builddir)/modules/fftw/libscifftw.la
199
201 200
202# These libraries are loaded dynamically from Scilab. 201# These libraries are loaded dynamically from Scilab.
203ENGINE_LIBS_DYNAMIC_LOAD = \ 202ENGINE_LIBS_DYNAMIC_LOAD = \
@@ -215,7 +214,9 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
215 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \ 214 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
216 $(top_builddir)/modules/umfpack/libsciumfpack.la \ 215 $(top_builddir)/modules/umfpack/libsciumfpack.la \
217 $(top_builddir)/modules/matio/libscimatio.la \ 216 $(top_builddir)/modules/matio/libscimatio.la \
218 $(top_builddir)/modules/helptools/libscihelptools.la 217 $(top_builddir)/modules/helptools/libscihelptools.la \
218 $(top_builddir)/modules/parallel/libsciparallel.la
219
219 220
220# Core modules 221# Core modules
221libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) 222libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)