summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Jofret <bruno.jofret@scilab.org>2008-09-10 13:39:26 +0000
committerBruno Jofret <bruno.jofret@scilab.org>2008-09-10 13:39:26 +0000
commite789cf7adfd819ffa9a04d1641ece1ed7499162a (patch)
tree261cd36dc0c1d4532196b787fefda6d72773dd1a
parent42787bf999018fbad9f7801117cc3420f73999e9 (diff)
downloadscilab-e789cf7adfd819ffa9a04d1641ece1ed7499162a.zip
scilab-e789cf7adfd819ffa9a04d1641ece1ed7499162a.tar.gz
Magical Bug FIX
-rw-r--r--scilab/modules/Makefile.am17
-rw-r--r--scilab/modules/Makefile.in13
2 files changed, 16 insertions, 14 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 2f2c6f8..069fda9 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -5,7 +5,7 @@
5 5
6# The order DOES matter !!! 6# The order DOES matter !!!
7 7
8# core is the main module of Scilab. All the compilation deps has been removed 8# core is the main module of Scilab. All the compilation deps has been removed
9# since it already linked almost the whole world 9# since it already linked almost the whole world
10SUBDIRS = core 10SUBDIRS = core
11 11
@@ -82,7 +82,7 @@ matio
82 82
83if SCICOS 83if SCICOS
84SUBDIRS += scicos_blocks 84SUBDIRS += scicos_blocks
85endif 85endif
86 86
87SUBDIRS += scicos 87SUBDIRS += scicos
88 88
@@ -119,6 +119,7 @@ $(top_builddir)/modules/mexlib/libmex.la \
119 $(top_builddir)/modules/data_structures/libscidata_structures.la \ 119 $(top_builddir)/modules/data_structures/libscidata_structures.la \
120 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \ 120 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
121 $(top_builddir)/modules/double/libscidouble.la \ 121 $(top_builddir)/modules/double/libscidouble.la \
122 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
122 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 123 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
123 $(top_builddir)/modules/fileio/libscifileio.la \ 124 $(top_builddir)/modules/fileio/libscifileio.la \
124 $(top_builddir)/modules/graphics/libscigraphics.la \ 125 $(top_builddir)/modules/graphics/libscigraphics.la \
@@ -152,12 +153,12 @@ $(top_builddir)/modules/mexlib/libmex.la \
152 153
153# These libs are loaded dynamical by Scilab 154# These libs are loaded dynamical by Scilab
154# $(top_builddir)/modules/matio/libscimatio.la 155# $(top_builddir)/modules/matio/libscimatio.la
155# $(top_builddir)/modules/randlib/libscirandlib.la 156# $(top_builddir)/modules/randlib/libscirandlib.la
156# $(top_builddir)/modules/optimization/libscioptimization.la 157# $(top_builddir)/modules/optimization/libscioptimization.la
157# $(top_builddir)/modules/arnoldi/libsciarnoldi.la 158# $(top_builddir)/modules/arnoldi/libsciarnoldi.la
158# $(top_builddir)/modules/symbolic/libscisymbolic.la 159# $(top_builddir)/modules/symbolic/libscisymbolic.la
159# $(top_builddir)/modules/metanet/libscimetanet.la 160# $(top_builddir)/modules/metanet/libscimetanet.la
160# $(top_builddir)/modules/spreadsheet/libscispreadsheet.la 161# $(top_builddir)/modules/spreadsheet/libscispreadsheet.la
161 162
162# Dev in progress 163# Dev in progress
163 164
@@ -200,4 +201,4 @@ endif
200if USE_EMBEDDED_LAPACK 201if USE_EMBEDDED_LAPACK
201libscilab_la_LIBADD += \ 202libscilab_la_LIBADD += \
202$(top_builddir)/libs/lapack/libscilapack.la 203$(top_builddir)/libs/lapack/libscilapack.la
203endif 204endif
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 023e42e..1cfa490 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -332,7 +332,7 @@ target_alias = @target_alias@
332top_builddir = @top_builddir@ 332top_builddir = @top_builddir@
333top_srcdir = @top_srcdir@ 333top_srcdir = @top_srcdir@
334 334
335# core is the main module of Scilab. All the compilation deps has been removed 335# core is the main module of Scilab. All the compilation deps has been removed
336# since it already linked almost the whole world 336# since it already linked almost the whole world
337SUBDIRS = core output_stream action_binding arnoldi \ 337SUBDIRS = core output_stream action_binding arnoldi \
338 elementary_functions string dynamic_link history_manager \ 338 elementary_functions string dynamic_link history_manager \
@@ -363,6 +363,7 @@ $(top_builddir)/modules/mexlib/libmex.la \
363 $(top_builddir)/modules/data_structures/libscidata_structures.la \ 363 $(top_builddir)/modules/data_structures/libscidata_structures.la \
364 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \ 364 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
365 $(top_builddir)/modules/double/libscidouble.la \ 365 $(top_builddir)/modules/double/libscidouble.la \
366 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
366 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 367 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
367 $(top_builddir)/modules/fileio/libscifileio.la \ 368 $(top_builddir)/modules/fileio/libscifileio.la \
368 $(top_builddir)/modules/graphics/libscigraphics.la \ 369 $(top_builddir)/modules/graphics/libscigraphics.la \
@@ -397,12 +398,12 @@ $(top_builddir)/modules/mexlib/libmex.la \
397 398
398# These libs are loaded dynamical by Scilab 399# These libs are loaded dynamical by Scilab
399# $(top_builddir)/modules/matio/libscimatio.la 400# $(top_builddir)/modules/matio/libscimatio.la
400# $(top_builddir)/modules/randlib/libscirandlib.la 401# $(top_builddir)/modules/randlib/libscirandlib.la
401# $(top_builddir)/modules/optimization/libscioptimization.la 402# $(top_builddir)/modules/optimization/libscioptimization.la
402# $(top_builddir)/modules/arnoldi/libsciarnoldi.la 403# $(top_builddir)/modules/arnoldi/libsciarnoldi.la
403# $(top_builddir)/modules/symbolic/libscisymbolic.la 404# $(top_builddir)/modules/symbolic/libscisymbolic.la
404# $(top_builddir)/modules/metanet/libscimetanet.la 405# $(top_builddir)/modules/metanet/libscimetanet.la
405# $(top_builddir)/modules/spreadsheet/libscispreadsheet.la 406# $(top_builddir)/modules/spreadsheet/libscispreadsheet.la
406 407
407# Dev in progress 408# Dev in progress
408 409