summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2009-03-04 15:44:32 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2009-03-04 15:44:32 +0100
commit2f283211898231aa491989a5458a874d4a824a1b (patch)
treeb0b0f9bfd640f723af6dc6dec726e3e28e8c7026 /scilab/modules
parentf53786e05979b0c0a3eaaf77066d9239b3cb694d (diff)
downloadscilab-2f283211898231aa491989a5458a874d4a824a1b.zip
scilab-2f283211898231aa491989a5458a874d4a824a1b.tar.gz
No longer include lapack & blas ... use the one available on the system
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/Makefile.am20
-rw-r--r--scilab/modules/Makefile.in28
-rw-r--r--scilab/modules/arnoldi/Makefile.am8
-rw-r--r--scilab/modules/arnoldi/Makefile.in12
-rw-r--r--scilab/modules/boolean/Makefile.am4
-rw-r--r--scilab/modules/boolean/Makefile.in14
-rw-r--r--scilab/modules/cacsd/Makefile.am9
-rw-r--r--scilab/modules/cacsd/Makefile.in20
-rw-r--r--scilab/modules/differential_equations/Makefile.am8
-rw-r--r--scilab/modules/differential_equations/Makefile.in18
-rw-r--r--scilab/modules/double/Makefile.am8
-rw-r--r--scilab/modules/double/Makefile.in19
-rw-r--r--scilab/modules/graphics/Makefile.am7
-rw-r--r--scilab/modules/graphics/Makefile.in27
-rw-r--r--scilab/modules/linear_algebra/Makefile.am8
-rw-r--r--scilab/modules/linear_algebra/Makefile.in16
-rw-r--r--scilab/modules/metanet/Makefile.am5
-rw-r--r--scilab/modules/metanet/Makefile.in17
-rw-r--r--scilab/modules/optimization/Makefile.am7
-rw-r--r--scilab/modules/optimization/Makefile.in18
-rw-r--r--scilab/modules/polynomials/Makefile.am9
-rw-r--r--scilab/modules/polynomials/Makefile.in18
-rw-r--r--scilab/modules/scicos/Makefile.am4
-rw-r--r--scilab/modules/scicos/Makefile.in26
-rw-r--r--scilab/modules/scicos_blocks/Makefile.am8
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in20
-rw-r--r--scilab/modules/signal_processing/Makefile.am9
-rw-r--r--scilab/modules/signal_processing/Makefile.in16
-rw-r--r--scilab/modules/sparse/Makefile.am7
-rw-r--r--scilab/modules/sparse/Makefile.in19
-rw-r--r--scilab/modules/special_functions/Makefile.am3
-rw-r--r--scilab/modules/special_functions/Makefile.in15
-rw-r--r--scilab/modules/statistics/Makefile.am5
-rw-r--r--scilab/modules/statistics/Makefile.in13
-rw-r--r--scilab/modules/umfpack/Makefile.am8
-rw-r--r--scilab/modules/umfpack/Makefile.in24
36 files changed, 86 insertions, 391 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 7b7565e..dba4559 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -102,15 +102,7 @@ libscilab_la_rootdir = $(mydatadir)
102pkglib_LTLIBRARIES = libscilab.la 102pkglib_LTLIBRARIES = libscilab.la
103libscilab_la_SOURCES = 103libscilab_la_SOURCES =
104 104
105libscilab_la_LDFLAGS = 105libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS)
106
107if ! USE_EMBEDDED_LAPACK
108libscilab_la_LDFLAGS += $(LAPACK_LIBS)
109endif
110
111if ! USE_EMBEDDED_BLAS
112libscilab_la_LDFLAGS += $(BLAS_LIBS)
113endif
114 106
115ALL_LIBS= $(top_builddir)/modules/fileio/libscifileio.la \ 107ALL_LIBS= $(top_builddir)/modules/fileio/libscifileio.la \
116$(top_builddir)/modules/mexlib/libmex.la \ 108$(top_builddir)/modules/mexlib/libmex.la \
@@ -192,13 +184,3 @@ $(top_builddir)/libs/hashtable/libscihashtable.la \
192$(top_builddir)/libs/MALLOC/libscimalloc.la \ 184$(top_builddir)/libs/MALLOC/libscimalloc.la \
193$(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \ 185$(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
194$(top_builddir)/libs/libst/libscilibst.la 186$(top_builddir)/libs/libst/libscilibst.la
195
196if USE_EMBEDDED_BLAS
197# Use the blas provided into the Scilab tarball
198libscilab_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
199endif
200
201if USE_EMBEDDED_LAPACK
202# Use the lapack provided into the Scilab tarball
203libscilab_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
204endif
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 00f294d..34e8a96 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -50,16 +50,8 @@ host_triplet = @host@
50# javasci should be compile at the end because it needs libscilab.la 50# javasci should be compile at the end because it needs libscilab.la
51# Don't forget that the order in subdirs does matter !!! 51# Don't forget that the order in subdirs does matter !!!
52@JAVASCI_TRUE@am__append_2 = javasci 52@JAVASCI_TRUE@am__append_2 = javasci
53@USE_EMBEDDED_LAPACK_FALSE@am__append_3 = $(LAPACK_LIBS) 53@ENABLE_STATIC_TRUE@am__append_3 = $(ALL_LIBS)
54@USE_EMBEDDED_BLAS_FALSE@am__append_4 = $(BLAS_LIBS) 54@SCICOS_TRUE@am__append_4 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
55@ENABLE_STATIC_TRUE@am__append_5 = $(ALL_LIBS)
56@SCICOS_TRUE@am__append_6 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
57
58# Use the blas provided into the Scilab tarball
59@USE_EMBEDDED_BLAS_TRUE@am__append_7 = $(top_builddir)/libs/blas/libsciblas.la
60
61# Use the lapack provided into the Scilab tarball
62@USE_EMBEDDED_LAPACK_TRUE@am__append_8 = $(top_builddir)/libs/lapack/libscilapack.la
63subdir = modules 55subdir = modules
64DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 56DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
65ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 57ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -89,17 +81,16 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
89am__installdirs = "$(DESTDIR)$(pkglibdir)" 81am__installdirs = "$(DESTDIR)$(pkglibdir)"
90pkglibLTLIBRARIES_INSTALL = $(INSTALL) 82pkglibLTLIBRARIES_INSTALL = $(INSTALL)
91LTLIBRARIES = $(pkglib_LTLIBRARIES) 83LTLIBRARIES = $(pkglib_LTLIBRARIES)
92libscilab_la_DEPENDENCIES = $(ALL_LIBS) $(am__append_5) \ 84libscilab_la_DEPENDENCIES = $(ALL_LIBS) $(am__append_3) \
93 $(top_builddir)/modules/string/libscistring.la \ 85 $(top_builddir)/modules/string/libscistring.la \
94 $(top_builddir)/modules/fftw/libscifftw.la \ 86 $(top_builddir)/modules/fftw/libscifftw.la \
95 $(top_builddir)/modules/umfpack/libsciumfpack.la \ 87 $(top_builddir)/modules/umfpack/libsciumfpack.la \
96 $(top_builddir)/modules/jvm/libscijvm.la \ 88 $(top_builddir)/modules/jvm/libscijvm.la \
97 $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_6) \ 89 $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_4) \
98 $(top_builddir)/libs/hashtable/libscihashtable.la \ 90 $(top_builddir)/libs/hashtable/libscihashtable.la \
99 $(top_builddir)/libs/MALLOC/libscimalloc.la \ 91 $(top_builddir)/libs/MALLOC/libscimalloc.la \
100 $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \ 92 $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
101 $(top_builddir)/libs/libst/libscilibst.la $(am__append_7) \ 93 $(top_builddir)/libs/libst/libscilibst.la
102 $(am__append_8)
103am_libscilab_la_OBJECTS = 94am_libscilab_la_OBJECTS =
104libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS) 95libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS)
105libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ 96libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -359,7 +350,7 @@ libscilab_la_rootdir = $(mydatadir)
359# 350#
360pkglib_LTLIBRARIES = libscilab.la 351pkglib_LTLIBRARIES = libscilab.la
361libscilab_la_SOURCES = 352libscilab_la_SOURCES =
362libscilab_la_LDFLAGS = $(am__append_3) $(am__append_4) 353libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS)
363ALL_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ 354ALL_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
364$(top_builddir)/modules/mexlib/libmex.la \ 355$(top_builddir)/modules/mexlib/libmex.la \
365 $(top_builddir)/modules/boolean/libsciboolean.la \ 356 $(top_builddir)/modules/boolean/libsciboolean.la \
@@ -417,17 +408,16 @@ $(top_builddir)/modules/mexlib/libmex.la \
417#if MPI 408#if MPI
418#libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la 409#libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la
419#endif 410#endif
420libscilab_la_LIBADD = $(ALL_LIBS) $(am__append_5) \ 411libscilab_la_LIBADD = $(ALL_LIBS) $(am__append_3) \
421 $(top_builddir)/modules/string/libscistring.la \ 412 $(top_builddir)/modules/string/libscistring.la \
422 $(top_builddir)/modules/fftw/libscifftw.la \ 413 $(top_builddir)/modules/fftw/libscifftw.la \
423 $(top_builddir)/modules/umfpack/libsciumfpack.la \ 414 $(top_builddir)/modules/umfpack/libsciumfpack.la \
424 $(top_builddir)/modules/jvm/libscijvm.la \ 415 $(top_builddir)/modules/jvm/libscijvm.la \
425 $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_6) \ 416 $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_4) \
426 $(top_builddir)/libs/hashtable/libscihashtable.la \ 417 $(top_builddir)/libs/hashtable/libscihashtable.la \
427 $(top_builddir)/libs/MALLOC/libscimalloc.la \ 418 $(top_builddir)/libs/MALLOC/libscimalloc.la \
428 $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \ 419 $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
429 $(top_builddir)/libs/libst/libscilibst.la $(am__append_7) \ 420 $(top_builddir)/libs/libst/libscilibst.la
430 $(am__append_8)
431all: all-recursive 421all: all-recursive
432 422
433.SUFFIXES: 423.SUFFIXES:
diff --git a/scilab/modules/arnoldi/Makefile.am b/scilab/modules/arnoldi/Makefile.am
index 3cabfcf..828b353 100644
--- a/scilab/modules/arnoldi/Makefile.am
+++ b/scilab/modules/arnoldi/Makefile.am
@@ -82,14 +82,6 @@ INCLUDE_FLAGS = $(libsciarnoldi_la_CFLAGS)
82 82
83libsciarnoldi_la_LIBADD = $(top_builddir)/modules/core/libscicore.la 83libsciarnoldi_la_LIBADD = $(top_builddir)/modules/core/libscicore.la
84 84
85if USE_EMBEDDED_LAPACK
86libsciarnoldi_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
87endif
88
89if USE_EMBEDDED_BLAS
90libsciarnoldi_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
91endif
92
93#### Target ###### 85#### Target ######
94modulename=arnoldi 86modulename=arnoldi
95 87
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 2697674..24d21a6 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -55,12 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
59@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
60DIST_COMMON = $(libsciarnoldi_la_include_HEADERS) \ 58DIST_COMMON = $(libsciarnoldi_la_include_HEADERS) \
61 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
63@NEED_JAVA_TRUE@am__append_3 = java 61@NEED_JAVA_TRUE@am__append_1 = java
64subdir = modules/arnoldi 62subdir = modules/arnoldi
65ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
66am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -94,8 +92,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
94pkglibLTLIBRARIES_INSTALL = $(INSTALL) 92pkglibLTLIBRARIES_INSTALL = $(INSTALL)
95LTLIBRARIES = $(pkglib_LTLIBRARIES) 93LTLIBRARIES = $(pkglib_LTLIBRARIES)
96libsciarnoldi_la_DEPENDENCIES = \ 94libsciarnoldi_la_DEPENDENCIES = \
97 $(top_builddir)/modules/core/libscicore.la $(am__append_1) \ 95 $(top_builddir)/modules/core/libscicore.la
98 $(am__append_2)
99am__objects_1 = libsciarnoldi_la-dsconv.lo libsciarnoldi_la-dsortc.lo \ 96am__objects_1 = libsciarnoldi_la-dsconv.lo libsciarnoldi_la-dsortc.lo \
100 libsciarnoldi_la-dsaup2.lo libsciarnoldi_la-dneigh.lo \ 97 libsciarnoldi_la-dsaup2.lo libsciarnoldi_la-dneigh.lo \
101 libsciarnoldi_la-znaupd.lo libsciarnoldi_la-dsesrt.lo \ 98 libsciarnoldi_la-znaupd.lo libsciarnoldi_la-dsesrt.lo \
@@ -427,8 +424,7 @@ libsciarnoldi_la_SOURCES = $(ARNOLDI_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
427# For the code check (splint) 424# For the code check (splint)
428CHECK_SRC = $(GATEWAY_C_SOURCES) 425CHECK_SRC = $(GATEWAY_C_SOURCES)
429INCLUDE_FLAGS = $(libsciarnoldi_la_CFLAGS) 426INCLUDE_FLAGS = $(libsciarnoldi_la_CFLAGS)
430libsciarnoldi_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \ 427libsciarnoldi_la_LIBADD = $(top_builddir)/modules/core/libscicore.la
431 $(am__append_1) $(am__append_2)
432 428
433#### Target ###### 429#### Target ######
434modulename = arnoldi 430modulename = arnoldi
@@ -460,7 +456,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
460#### the procedure will be the same with Microsoft Windows (C) 456#### the procedure will be the same with Microsoft Windows (C)
461#### and Linux/Unix 457#### and Linux/Unix
462####################################################################### 458#######################################################################
463TARGETS_ALL = $(am__append_3) 459TARGETS_ALL = $(am__append_1)
464 460
465################ MACROS ###################### 461################ MACROS ######################
466# Rule to build a macro 462# Rule to build a macro
diff --git a/scilab/modules/boolean/Makefile.am b/scilab/modules/boolean/Makefile.am
index 9f76f6b..c3483f5 100644
--- a/scilab/modules/boolean/Makefile.am
+++ b/scilab/modules/boolean/Makefile.am
@@ -37,10 +37,6 @@ libsciboolean_la_LIBADD = \
37 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 37 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
38 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la 38 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
39 39
40if USE_EMBEDDED_BLAS
41libsciboolean_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
42endif
43
44modulename=boolean 40modulename=boolean
45 41
46#### boolean : Conf files #### 42#### boolean : Conf files ####
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index dbde24b..847f3f4 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -55,11 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
59DIST_COMMON = $(libsciboolean_la_include_HEADERS) \ 58DIST_COMMON = $(libsciboolean_la_include_HEADERS) \
60 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
61 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
62@NEED_JAVA_TRUE@am__append_2 = java 61@NEED_JAVA_TRUE@am__append_1 = java
63subdir = modules/boolean 62subdir = modules/boolean
64ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -94,8 +93,7 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
94LTLIBRARIES = $(pkglib_LTLIBRARIES) 93LTLIBRARIES = $(pkglib_LTLIBRARIES)
95libsciboolean_la_DEPENDENCIES = \ 94libsciboolean_la_DEPENDENCIES = \
96 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 95 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
97 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 96 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
98 $(am__append_1)
99am__objects_1 = libsciboolean_la-matboolean.lo \ 97am__objects_1 = libsciboolean_la-matboolean.lo \
100 libsciboolean_la-vect_or.lo libsciboolean_la-vect_and.lo 98 libsciboolean_la-vect_or.lo libsciboolean_la-vect_and.lo
101am__objects_2 = logic.lo find.lo 99am__objects_2 = logic.lo find.lo
@@ -360,10 +358,10 @@ libsciboolean_la_SOURCES = $(BOOLEAN_C_SOURCES) $(BOOLEAN_FORTRAN_SOURCES) $(GAT
360# For the code check (splint) 358# For the code check (splint)
361CHECK_SRC = $(BOOLEAN_C_SOURCES) $(GATEWAY_C_SOURCES) 359CHECK_SRC = $(BOOLEAN_C_SOURCES) $(GATEWAY_C_SOURCES)
362INCLUDE_FLAGS = $(libsciboolean_la_CFLAGS) 360INCLUDE_FLAGS = $(libsciboolean_la_CFLAGS)
363libsciboolean_la_LIBADD = \ 361libsciboolean_la_LIBADD = \
364 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 362 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
365 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 363 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
366 $(am__append_1) 364
367modulename = boolean 365modulename = boolean
368 366
369#### boolean : Conf files #### 367#### boolean : Conf files ####
@@ -395,7 +393,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
395#### the procedure will be the same with Microsoft Windows (C) 393#### the procedure will be the same with Microsoft Windows (C)
396#### and Linux/Unix 394#### and Linux/Unix
397####################################################################### 395#######################################################################
398TARGETS_ALL = $(am__append_2) 396TARGETS_ALL = $(am__append_1)
399 397
400################ MACROS ###################### 398################ MACROS ######################
401# Rule to build a macro 399# Rule to build a macro
diff --git a/scilab/modules/cacsd/Makefile.am b/scilab/modules/cacsd/Makefile.am
index 8eed9d7..c5a5190 100644
--- a/scilab/modules/cacsd/Makefile.am
+++ b/scilab/modules/cacsd/Makefile.am
@@ -230,15 +230,6 @@ INCLUDE_FLAGS = $(libscicacsd_la_CFLAGS)
230libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 230libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
231 231
232 232
233if USE_EMBEDDED_LAPACK
234libscicacsd_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
235endif
236
237if USE_EMBEDDED_BLAS
238libscicacsd_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
239endif
240
241
242#### Target ###### 233#### Target ######
243modulename=cacsd 234modulename=cacsd
244 235
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index 0e7b9df..518eb0c 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -55,11 +55,9 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
59@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
60DIST_COMMON = $(libscicacsd_la_include_HEADERS) $(srcdir)/Makefile.am \ 58DIST_COMMON = $(libscicacsd_la_include_HEADERS) $(srcdir)/Makefile.am \
61 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am 59 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
62@NEED_JAVA_TRUE@am__append_3 = java 60@NEED_JAVA_TRUE@am__append_1 = java
63subdir = modules/cacsd 61subdir = modules/cacsd
64ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 62ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -100,8 +98,7 @@ libscicacsd_la_DEPENDENCIES = $(top_builddir)/modules/mexlib/libmx.la \
100 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \ 98 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
101 $(top_builddir)/modules/mexlib/libmex.la \ 99 $(top_builddir)/modules/mexlib/libmex.la \
102 $(top_builddir)/modules/core/libscicore.la \ 100 $(top_builddir)/modules/core/libscicore.la \
103 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 101 $(top_builddir)/modules/output_stream/libscioutput_stream.la
104 $(am__append_1) $(am__append_2)
105am__objects_1 = libscicacsd_la-jacl2.lo libscicacsd_la-onface.lo \ 102am__objects_1 = libscicacsd_la-jacl2.lo libscicacsd_la-onface.lo \
106 libscicacsd_la-hhdml.lo libscicacsd_la-tild.lo \ 103 libscicacsd_la-hhdml.lo libscicacsd_la-tild.lo \
107 libscicacsd_la-degl2.lo libscicacsd_la-dqrdc.lo \ 104 libscicacsd_la-degl2.lo libscicacsd_la-dqrdc.lo \
@@ -650,16 +647,7 @@ CHECK_SRC = $(GATEWAY_C_SOURCES)
650INCLUDE_FLAGS = $(libscicacsd_la_CFLAGS) 647INCLUDE_FLAGS = $(libscicacsd_la_CFLAGS)
651 648
652# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la 649# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la
653libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la \ 650libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
654 $(top_builddir)/modules/mexlib/libmat.la \
655 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
656 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
657 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
658 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
659 $(top_builddir)/modules/mexlib/libmex.la \
660 $(top_builddir)/modules/core/libscicore.la \
661 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
662 $(am__append_1) $(am__append_2)
663 651
664#### Target ###### 652#### Target ######
665modulename = cacsd 653modulename = cacsd
@@ -696,7 +684,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
696#### the procedure will be the same with Microsoft Windows (C) 684#### the procedure will be the same with Microsoft Windows (C)
697#### and Linux/Unix 685#### and Linux/Unix
698####################################################################### 686#######################################################################
699TARGETS_ALL = $(am__append_3) 687TARGETS_ALL = $(am__append_1)
700 688
701################ MACROS ###################### 689################ MACROS ######################
702# Rule to build a macro 690# Rule to build a macro
diff --git a/scilab/modules/differential_equations/Makefile.am b/scilab/modules/differential_equations/Makefile.am
index 80255aa..a791e78 100644
--- a/scilab/modules/differential_equations/Makefile.am
+++ b/scilab/modules/differential_equations/Makefile.am
@@ -144,14 +144,6 @@ INCLUDE_FLAGS = $(libscidifferential_equations_la_CFLAGS)
144libscidifferential_equations_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 144libscidifferential_equations_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
145 145
146 146
147if USE_EMBEDDED_LAPACK
148libscidifferential_equations_la_LIBADD +=$(top_builddir)/libs/lapack/libscilapack.la
149endif
150
151if USE_EMBEDDED_BLAS
152libscidifferential_equations_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
153endif
154
155#### Target ###### 147#### Target ######
156modulename=differential_equations 148modulename=differential_equations
157 149
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index e9e8b10..5fad326 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -55,12 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
59@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
60DIST_COMMON = $(libscidifferential_equations_la_include_HEADERS) \ 58DIST_COMMON = $(libscidifferential_equations_la_include_HEADERS) \
61 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
63@NEED_JAVA_TRUE@am__append_3 = java 61@NEED_JAVA_TRUE@am__append_1 = java
64subdir = modules/differential_equations 62subdir = modules/differential_equations
65ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
66am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -99,8 +97,7 @@ libscidifferential_equations_la_DEPENDENCIES = \
99 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \ 97 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
100 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 98 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
101 $(top_builddir)/modules/string/libscistring.la \ 99 $(top_builddir)/modules/string/libscistring.la \
102 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 100 $(top_builddir)/modules/output_stream/libscioutput_stream.la
103 $(am__append_1) $(am__append_2)
104am__objects_1 = libscidifferential_equations_la-dassl.lo \ 101am__objects_1 = libscidifferential_equations_la-dassl.lo \
105 libscidifferential_equations_la-feval.lo \ 102 libscidifferential_equations_la-feval.lo \
106 libscidifferential_equations_la-fevaltable.lo \ 103 libscidifferential_equations_la-fevaltable.lo \
@@ -510,14 +507,7 @@ libscidifferential_equations_la_SOURCES = $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(
510# For the code check (splint) 507# For the code check (splint)
511CHECK_SRC = $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(GATEWAY_C_SOURCES) 508CHECK_SRC = $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
512INCLUDE_FLAGS = $(libscidifferential_equations_la_CFLAGS) 509INCLUDE_FLAGS = $(libscidifferential_equations_la_CFLAGS)
513libscidifferential_equations_la_LIBADD = \ 510libscidifferential_equations_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
514 $(top_builddir)/modules/core/libscicore.la \
515 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
516 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
517 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
518 $(top_builddir)/modules/string/libscistring.la \
519 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
520 $(am__append_1) $(am__append_2)
521 511
522#### Target ###### 512#### Target ######
523modulename = differential_equations 513modulename = differential_equations
@@ -554,7 +544,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
554#### the procedure will be the same with Microsoft Windows (C) 544#### the procedure will be the same with Microsoft Windows (C)
555#### and Linux/Unix 545#### and Linux/Unix
556####################################################################### 546#######################################################################
557TARGETS_ALL = $(am__append_3) 547TARGETS_ALL = $(am__append_1)
558 548
559################ MACROS ###################### 549################ MACROS ######################
560# Rule to build a macro 550# Rule to build a macro
diff --git a/scilab/modules/double/Makefile.am b/scilab/modules/double/Makefile.am
index 1279050..bc4c054 100644
--- a/scilab/modules/double/Makefile.am
+++ b/scilab/modules/double/Makefile.am
@@ -42,14 +42,6 @@ INCLUDE_FLAGS = $(libscidouble_la_CFLAGS)
42libscidouble_la_LIBADD = $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 42libscidouble_la_LIBADD = $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
43 43
44 44
45if USE_EMBEDDED_LAPACK
46libscidouble_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
47endif
48
49if USE_EMBEDDED_BLAS
50libscidouble_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
51endif
52
53#### Target ###### 45#### Target ######
54modulename=double 46modulename=double
55 47
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index f01494b..eb94a4c 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -54,11 +54,9 @@ PRE_UNINSTALL = :
54POST_UNINSTALL = : 54POST_UNINSTALL = :
55build_triplet = @build@ 55build_triplet = @build@
56host_triplet = @host@ 56host_triplet = @host@
57@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
58@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
59DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 57DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
60 $(top_srcdir)/Makefile.incl.am 58 $(top_srcdir)/Makefile.incl.am
61@NEED_JAVA_TRUE@am__append_3 = java 59@NEED_JAVA_TRUE@am__append_1 = java
62subdir = modules/double 60subdir = modules/double
63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 61ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 62am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -96,8 +94,7 @@ libscidouble_la_DEPENDENCIES = \
96 $(top_builddir)/modules/polynomials/libscipolynomials.la \ 94 $(top_builddir)/modules/polynomials/libscipolynomials.la \
97 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \ 95 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
98 $(top_builddir)/modules/core/libscicore.la \ 96 $(top_builddir)/modules/core/libscicore.la \
99 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 97 $(top_builddir)/modules/output_stream/libscioutput_stream.la
100 $(am__append_1) $(am__append_2)
101am__objects_1 = libscidouble_la-gw_double.lo 98am__objects_1 = libscidouble_la-gw_double.lo
102am__objects_2 = vecldiv.lo vecmul.lo matxpow.lo vecimpl.lo matldiv.lo \ 99am__objects_2 = vecldiv.lo vecmul.lo matxpow.lo vecimpl.lo matldiv.lo \
103 matsubst.lo vecrdiv.lo matchsgn.lo matrdiv.lo matrc.lo \ 100 matsubst.lo vecrdiv.lo matchsgn.lo matrdiv.lo matrc.lo \
@@ -359,15 +356,7 @@ libscidouble_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
359# For the code check (splint) 356# For the code check (splint)
360CHECK_SRC = $(GATEWAY_C_SOURCES) 357CHECK_SRC = $(GATEWAY_C_SOURCES)
361INCLUDE_FLAGS = $(libscidouble_la_CFLAGS) 358INCLUDE_FLAGS = $(libscidouble_la_CFLAGS)
362libscidouble_la_LIBADD = \ 359libscidouble_la_LIBADD = $(top_builddir)/modules/boolean/libsciboolean.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
363 $(top_builddir)/modules/boolean/libsciboolean.la \
364 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
365 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
366 $(top_builddir)/modules/polynomials/libscipolynomials.la \
367 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
368 $(top_builddir)/modules/core/libscicore.la \
369 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
370 $(am__append_1) $(am__append_2)
371 360
372#### Target ###### 361#### Target ######
373modulename = double 362modulename = double
@@ -391,7 +380,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
391#### the procedure will be the same with Microsoft Windows (C) 380#### the procedure will be the same with Microsoft Windows (C)
392#### and Linux/Unix 381#### and Linux/Unix
393####################################################################### 382#######################################################################
394TARGETS_ALL = $(am__append_3) 383TARGETS_ALL = $(am__append_1)
395 384
396################ MACROS ###################### 385################ MACROS ######################
397# Rule to build a macro 386# Rule to build a macro
diff --git a/scilab/modules/graphics/Makefile.am b/scilab/modules/graphics/Makefile.am
index ca80005..a9b61b8 100644
--- a/scilab/modules/graphics/Makefile.am
+++ b/scilab/modules/graphics/Makefile.am
@@ -416,13 +416,6 @@ INCLUDE_FLAGS = $(libscigraphics_la_CFLAGS)
416libscigraphics_la_LIBADD = $(top_builddir)/libs/hashtable/libscihashtable.la $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/gui/libscigui.la $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la 416libscigraphics_la_LIBADD = $(top_builddir)/libs/hashtable/libscihashtable.la $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/gui/libscigui.la $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la
417 417
418 418
419if USE_EMBEDDED_LAPACK
420libscigraphics_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
421endif
422
423if USE_EMBEDDED_BLAS
424libscigraphics_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
425endif
426 419
427#### graphics : Conf files #### 420#### graphics : Conf files ####
428libscigraphics_la_rootdir = $(mydatadir) 421libscigraphics_la_rootdir = $(mydatadir)
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index 4bd98f1..312a525 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -67,13 +67,11 @@ host_triplet = @host@
67@GUI_TRUE@ -I$(top_srcdir)/modules/output_stream/includes \ 67@GUI_TRUE@ -I$(top_srcdir)/modules/output_stream/includes \
68@GUI_TRUE@ -I$(top_srcdir)/modules/graphic_export/includes/ 68@GUI_TRUE@ -I$(top_srcdir)/modules/graphic_export/includes/
69 69
70@GUI_TRUE@@USE_EMBEDDED_LAPACK_TRUE@am__append_2 = $(top_builddir)/libs/lapack/libscilapack.la 70@GUI_FALSE@am__append_2 = -I$(top_srcdir)/modules/output_stream/includes
71@GUI_TRUE@@USE_EMBEDDED_BLAS_TRUE@am__append_3 = $(top_builddir)/libs/blas/libsciblas.la
72@GUI_FALSE@am__append_4 = -I$(top_srcdir)/modules/output_stream/includes
73DIST_COMMON = $(am__libscigraphics_la_include_HEADERS_DIST) \ 71DIST_COMMON = $(am__libscigraphics_la_include_HEADERS_DIST) \
74 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 72 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
75 $(top_srcdir)/Makefile.incl.am 73 $(top_srcdir)/Makefile.incl.am
76@NEED_JAVA_TRUE@am__append_5 = java 74@NEED_JAVA_TRUE@am__append_3 = java
77subdir = modules/graphics 75subdir = modules/graphics
78ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 76ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
79am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 77am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -118,8 +116,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
118@GUI_TRUE@ $(top_builddir)/modules/core/libscicore.la \ 116@GUI_TRUE@ $(top_builddir)/modules/core/libscicore.la \
119@GUI_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \ 117@GUI_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \
120@GUI_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 118@GUI_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \
121@GUI_TRUE@ $(top_builddir)/modules/fileio/libscifileio.la \ 119@GUI_TRUE@ $(top_builddir)/modules/fileio/libscifileio.la
122@GUI_TRUE@ $(am__append_2) $(am__append_3)
123am__libscigraphics_la_SOURCES_DIST = src/nographics/nographics.c \ 120am__libscigraphics_la_SOURCES_DIST = src/nographics/nographics.c \
124 src/c/GetCommandArg.c src/c/WindowList.c \ 121 src/c/GetCommandArg.c src/c/WindowList.c \
125 src/c/getHandleProperty/get_figure_position_property.c \ 122 src/c/getHandleProperty/get_figure_position_property.c \
@@ -1101,7 +1098,7 @@ libscigraphics_la_CFLAGS = \
1101 -I$(top_srcdir)/modules/gui/includes/ \ 1098 -I$(top_srcdir)/modules/gui/includes/ \
1102 -I$(top_srcdir)/modules/fileio/includes/ \ 1099 -I$(top_srcdir)/modules/fileio/includes/ \
1103 -I$(top_srcdir)/modules/string/includes/ $(am__append_1) \ 1100 -I$(top_srcdir)/modules/string/includes/ $(am__append_1) \
1104 $(am__append_4) 1101 $(am__append_2)
1105@GUI_FALSE@GRAPHICS_C_SOURCES = src/nographics/nographics.c 1102@GUI_FALSE@GRAPHICS_C_SOURCES = src/nographics/nographics.c
1106@GUI_TRUE@GRAPHICS_C_SOURCES = src/c/GetCommandArg.c \ 1103@GUI_TRUE@GRAPHICS_C_SOURCES = src/c/GetCommandArg.c \
1107@GUI_TRUE@src/c/WindowList.c \ 1104@GUI_TRUE@src/c/WindowList.c \
@@ -1489,19 +1486,7 @@ libscigraphics_la_CFLAGS = \
1489# For the code check (splint) 1486# For the code check (splint)
1490@GUI_TRUE@CHECK_SRC = $(GRAPHICS_C_SOURCES) $(GATEWAY_C_SOURCES) 1487@GUI_TRUE@CHECK_SRC = $(GRAPHICS_C_SOURCES) $(GATEWAY_C_SOURCES)
1491@GUI_TRUE@INCLUDE_FLAGS = $(libscigraphics_la_CFLAGS) 1488@GUI_TRUE@INCLUDE_FLAGS = $(libscigraphics_la_CFLAGS)
1492@GUI_TRUE@libscigraphics_la_LIBADD = \ 1489@GUI_TRUE@libscigraphics_la_LIBADD = $(top_builddir)/libs/hashtable/libscihashtable.la $(top_builddir)/modules/action_binding/libsciaction_binding.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/tclsci/libscitclsci.la $(top_builddir)/modules/gui/libscigui.la $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la
1493@GUI_TRUE@ $(top_builddir)/libs/hashtable/libscihashtable.la \
1494@GUI_TRUE@ $(top_builddir)/modules/action_binding/libsciaction_binding.la \
1495@GUI_TRUE@ $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
1496@GUI_TRUE@ $(top_builddir)/modules/renderer/libscirenderer.la \
1497@GUI_TRUE@ $(top_builddir)/modules/tclsci/libscitclsci.la \
1498@GUI_TRUE@ $(top_builddir)/modules/gui/libscigui.la \
1499@GUI_TRUE@ $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
1500@GUI_TRUE@ $(top_builddir)/modules/core/libscicore.la \
1501@GUI_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \
1502@GUI_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \
1503@GUI_TRUE@ $(top_builddir)/modules/fileio/libscifileio.la \
1504@GUI_TRUE@ $(am__append_2) $(am__append_3)
1505 1490
1506#### graphics : Conf files #### 1491#### graphics : Conf files ####
1507@GUI_TRUE@libscigraphics_la_rootdir = $(mydatadir) 1492@GUI_TRUE@libscigraphics_la_rootdir = $(mydatadir)
@@ -1676,7 +1661,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
1676#### the procedure will be the same with Microsoft Windows (C) 1661#### the procedure will be the same with Microsoft Windows (C)
1677#### and Linux/Unix 1662#### and Linux/Unix
1678####################################################################### 1663#######################################################################
1679TARGETS_ALL = $(am__append_5) 1664TARGETS_ALL = $(am__append_3)
1680 1665
1681################ MACROS ###################### 1666################ MACROS ######################
1682# Rule to build a macro 1667# Rule to build a macro
diff --git a/scilab/modules/linear_algebra/Makefile.am b/scilab/modules/linear_algebra/Makefile.am
index 81c2253..817a10e 100644
--- a/scilab/modules/linear_algebra/Makefile.am
+++ b/scilab/modules/linear_algebra/Makefile.am
@@ -108,14 +108,6 @@ INCLUDE_FLAGS = $(libscilinear_algebra_la_CFLAGS)
108 108
109libscilinear_algebra_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 109libscilinear_algebra_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
110 110
111if USE_EMBEDDED_LAPACK
112libscilinear_algebra_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
113endif
114
115if USE_EMBEDDED_BLAS
116libscilinear_algebra_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
117endif
118
119#### Target ###### 111#### Target ######
120modulename=linear_algebra 112modulename=linear_algebra
121 113
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index 1a499ee..3bf8177 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -55,12 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
59@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
60DIST_COMMON = $(libscilinear_algebra_la_include_HEADERS) \ 58DIST_COMMON = $(libscilinear_algebra_la_include_HEADERS) \
61 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
63@NEED_JAVA_TRUE@am__append_3 = java 61@NEED_JAVA_TRUE@am__append_1 = java
64subdir = modules/linear_algebra 62subdir = modules/linear_algebra
65ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
66am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -97,8 +95,7 @@ libscilinear_algebra_la_DEPENDENCIES = $(top_builddir)/modules/elementary_functi
97 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \ 95 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
98 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 96 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
99 $(top_builddir)/modules/core/libscicore.la \ 97 $(top_builddir)/modules/core/libscicore.la \
100 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 98 $(top_builddir)/modules/output_stream/libscioutput_stream.la
101 $(am__append_1) $(am__append_2)
102am__objects_1 = intdggbal.lo intzgeqpf4.lo intzgehrd.lo intzgesvd1.lo \ 99am__objects_1 = intdggbal.lo intzgeqpf4.lo intzgehrd.lo intzgesvd1.lo \
103 intzfschur.lo intzgesvd2.lo intdgges.lo intgschur.lo \ 100 intzfschur.lo intzgesvd2.lo intdgges.lo intgschur.lo \
104 intdgesv3.lo intdgesv4.lo DGELSY1.lo intozgschur.lo \ 101 intdgesv3.lo intdgesv4.lo DGELSY1.lo intozgschur.lo \
@@ -470,12 +467,7 @@ libscilinear_algebra_la_SOURCES = $(LINEAR_ALGEBRA_FORTRAN_SOURCES) $(LINEAR_ALG
470# For the code check (splint) 467# For the code check (splint)
471CHECK_SRC = $(LINEAR_ALGEBRA_C_SOURCES) $(GATEWAY_C_SOURCES) 468CHECK_SRC = $(LINEAR_ALGEBRA_C_SOURCES) $(GATEWAY_C_SOURCES)
472INCLUDE_FLAGS = $(libscilinear_algebra_la_CFLAGS) 469INCLUDE_FLAGS = $(libscilinear_algebra_la_CFLAGS)
473libscilinear_algebra_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 470libscilinear_algebra_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
474 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
475 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
476 $(top_builddir)/modules/core/libscicore.la \
477 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
478 $(am__append_1) $(am__append_2)
479 471
480#### Target ###### 472#### Target ######
481modulename = linear_algebra 473modulename = linear_algebra
@@ -509,7 +501,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
509#### the procedure will be the same with Microsoft Windows (C) 501#### the procedure will be the same with Microsoft Windows (C)
510#### and Linux/Unix 502#### and Linux/Unix
511####################################################################### 503#######################################################################
512TARGETS_ALL = $(am__append_3) 504TARGETS_ALL = $(am__append_1)
513 505
514################ MACROS ###################### 506################ MACROS ######################
515# Rule to build a macro 507# Rule to build a macro
diff --git a/scilab/modules/metanet/Makefile.am b/scilab/modules/metanet/Makefile.am
index 3f1236f..5267648 100644
--- a/scilab/modules/metanet/Makefile.am
+++ b/scilab/modules/metanet/Makefile.am
@@ -133,11 +133,6 @@ INCLUDE_FLAGS = $(libscimetanet_la_CFLAGS)
133 133
134libscimetanet_la_LIBADD = $(top_builddir)/libs/hashtable/libscihashtable.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 134libscimetanet_la_LIBADD = $(top_builddir)/libs/hashtable/libscihashtable.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
135 135
136if USE_EMBEDDED_BLAS
137libscimetanet_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
138endif
139
140
141#### Target ###### 136#### Target ######
142modulename=metanet 137modulename=metanet
143 138
diff --git a/scilab/modules/metanet/Makefile.in b/scilab/modules/metanet/Makefile.in
index a35b667..6ea1fd2 100644
--- a/scilab/modules/metanet/Makefile.in
+++ b/scilab/modules/metanet/Makefile.in
@@ -55,11 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
59DIST_COMMON = $(libscimetanet_la_include_HEADERS) \ 58DIST_COMMON = $(libscimetanet_la_include_HEADERS) \
60 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
61 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
62@NEED_JAVA_TRUE@am__append_2 = java 61@NEED_JAVA_TRUE@am__append_1 = java
63subdir = modules/metanet 62subdir = modules/metanet
64ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -98,8 +97,7 @@ libscimetanet_la_DEPENDENCIES = \
98 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 97 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
99 $(top_builddir)/modules/core/libscicore.la \ 98 $(top_builddir)/modules/core/libscicore.la \
100 $(top_builddir)/libs/MALLOC/libscimalloc.la \ 99 $(top_builddir)/libs/MALLOC/libscimalloc.la \
101 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 100 $(top_builddir)/modules/output_stream/libscioutput_stream.la
102 $(am__append_1)
103am__objects_1 = libscimetanet_la-paths.lo libscimetanet_la-dmtree.lo \ 101am__objects_1 = libscimetanet_la-paths.lo libscimetanet_la-dmtree.lo \
104 libscimetanet_la-files.lo \ 102 libscimetanet_la-files.lo \
105 libscimetanet_la-hashtable_metanet.lo \ 103 libscimetanet_la-hashtable_metanet.lo \
@@ -484,14 +482,7 @@ libscimetanet_la_SOURCES = $(METANET_C_SOURCES) $(METANET_FORTRAN_SOURCES) $(GAT
484# For the code check (splint) 482# For the code check (splint)
485CHECK_SRC = $(METANET_C_SOURCES) $(GATEWAY_C_SOURCES) 483CHECK_SRC = $(METANET_C_SOURCES) $(GATEWAY_C_SOURCES)
486INCLUDE_FLAGS = $(libscimetanet_la_CFLAGS) 484INCLUDE_FLAGS = $(libscimetanet_la_CFLAGS)
487libscimetanet_la_LIBADD = \ 485libscimetanet_la_LIBADD = $(top_builddir)/libs/hashtable/libscihashtable.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
488 $(top_builddir)/libs/hashtable/libscihashtable.la \
489 $(top_builddir)/modules/intersci/libsciintersci.la \
490 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
491 $(top_builddir)/modules/core/libscicore.la \
492 $(top_builddir)/libs/MALLOC/libscimalloc.la \
493 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
494 $(am__append_1)
495 486
496#### Target ###### 487#### Target ######
497modulename = metanet 488modulename = metanet
@@ -526,7 +517,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
526#### the procedure will be the same with Microsoft Windows (C) 517#### the procedure will be the same with Microsoft Windows (C)
527#### and Linux/Unix 518#### and Linux/Unix
528####################################################################### 519#######################################################################
529TARGETS_ALL = $(am__append_2) 520TARGETS_ALL = $(am__append_1)
530 521
531################ MACROS ###################### 522################ MACROS ######################
532# Rule to build a macro 523# Rule to build a macro
diff --git a/scilab/modules/optimization/Makefile.am b/scilab/modules/optimization/Makefile.am
index a36b92e..6de7eca 100644
--- a/scilab/modules/optimization/Makefile.am
+++ b/scilab/modules/optimization/Makefile.am
@@ -130,13 +130,6 @@ libscioptimization_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_FORTRAN
130 130
131libscioptimization_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 131libscioptimization_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
132 132
133if USE_EMBEDDED_LAPACK
134libscioptimization_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
135endif
136
137if USE_EMBEDDED_BLAS
138libscioptimization_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
139endif
140 133
141#### Target ###### 134#### Target ######
142modulename=optimization 135modulename=optimization
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index 3810e4d..574865c 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -55,12 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
59@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
60DIST_COMMON = $(libscioptimization_la_include_HEADERS) \ 58DIST_COMMON = $(libscioptimization_la_include_HEADERS) \
61 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
63@NEED_JAVA_TRUE@am__append_3 = java 61@NEED_JAVA_TRUE@am__append_1 = java
64subdir = modules/optimization 62subdir = modules/optimization
65ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
66am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -99,8 +97,7 @@ libscioptimization_la_DEPENDENCIES = \
99 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \ 97 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
100 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 98 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
101 $(top_builddir)/modules/string/libscistring.la \ 99 $(top_builddir)/modules/string/libscistring.la \
102 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 100 $(top_builddir)/modules/output_stream/libscioutput_stream.la
103 $(am__append_1) $(am__append_2)
104am__objects_1 = libscioptimization_la-sp.lo \ 101am__objects_1 = libscioptimization_la-sp.lo \
105 libscioptimization_la-fsolvetable.lo \ 102 libscioptimization_la-fsolvetable.lo \
106 libscioptimization_la-lsqrsolvtable.lo \ 103 libscioptimization_la-lsqrsolvtable.lo \
@@ -482,14 +479,7 @@ libscioptimization_la_CFLAGS = -I$(srcdir)/includes/ \
482pkglib_LTLIBRARIES = libscioptimization.la 479pkglib_LTLIBRARIES = libscioptimization.la
483libscioptimization_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) 480libscioptimization_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
484libscioptimization_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(MINPACK_SOURCES) 481libscioptimization_la_SOURCES = $(OPTIMIZATION_C_SOURCES) $(OPTIMIZATION_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(MINPACK_SOURCES)
485libscioptimization_la_LIBADD = \ 482libscioptimization_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
486 $(top_builddir)/modules/core/libscicore.la \
487 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
488 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
489 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
490 $(top_builddir)/modules/string/libscistring.la \
491 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
492 $(am__append_1) $(am__append_2)
493 483
494#### Target ###### 484#### Target ######
495modulename = optimization 485modulename = optimization
@@ -522,7 +512,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
522#### the procedure will be the same with Microsoft Windows (C) 512#### the procedure will be the same with Microsoft Windows (C)
523#### and Linux/Unix 513#### and Linux/Unix
524####################################################################### 514#######################################################################
525TARGETS_ALL = $(am__append_3) 515TARGETS_ALL = $(am__append_1)
526 516
527################ MACROS ###################### 517################ MACROS ######################
528# Rule to build a macro 518# Rule to build a macro
diff --git a/scilab/modules/polynomials/Makefile.am b/scilab/modules/polynomials/Makefile.am
index 26e4a55..11602a7 100644
--- a/scilab/modules/polynomials/Makefile.am
+++ b/scilab/modules/polynomials/Makefile.am
@@ -123,15 +123,6 @@ INCLUDE_FLAGS = $(libscipolynomials_la_CFLAGS)
123 123
124libscipolynomials_la_LIBADD = $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 124libscipolynomials_la_LIBADD = $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
125 125
126
127if USE_EMBEDDED_LAPACK
128libscipolynomials_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
129endif
130
131if USE_EMBEDDED_BLAS
132libscipolynomials_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
133endif
134
135#### Target ###### 126#### Target ######
136modulename=polynomials 127modulename=polynomials
137 128
diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index 50d5fef..7313ed6 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -55,12 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
59@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
60DIST_COMMON = $(libscipolynomials_la_include_HEADERS) \ 58DIST_COMMON = $(libscipolynomials_la_include_HEADERS) \
61 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
63@NEED_JAVA_TRUE@am__append_3 = java 61@NEED_JAVA_TRUE@am__append_1 = java
64subdir = modules/polynomials 62subdir = modules/polynomials
65ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
66am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -99,8 +97,7 @@ libscipolynomials_la_DEPENDENCIES = \
99 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 97 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
100 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \ 98 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
101 $(top_builddir)/modules/core/libscicore.la \ 99 $(top_builddir)/modules/core/libscicore.la \
102 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 100 $(top_builddir)/modules/output_stream/libscioutput_stream.la
103 $(am__append_1) $(am__append_2)
104am__objects_1 = residu.lo imptra.lo dmpadj.lo impins.lo dpmul1.lo \ 101am__objects_1 = residu.lo imptra.lo dmpadj.lo impins.lo dpmul1.lo \
105 wprxc.lo dmpcnc.lo wmpmu.lo mpinsp.lo impext.lo bezout.lo \ 102 wprxc.lo dmpcnc.lo wmpmu.lo mpinsp.lo impext.lo bezout.lo \
106 recbez.lo sfact1.lo dmptld.lo dpodiv.lo dmptra.lo dmpins.lo \ 103 recbez.lo sfact1.lo dmptld.lo dpodiv.lo dmptra.lo dmpins.lo \
@@ -476,14 +473,7 @@ libscipolynomials_la_SOURCES = $(POLYNOMIALS_FORTRAN_SOURCES) $(GATEWAY_FORTRAN_
476# For the code check (splint) 473# For the code check (splint)
477CHECK_SRC = ) $(GATEWAY_C_SOURCES) 474CHECK_SRC = ) $(GATEWAY_C_SOURCES)
478INCLUDE_FLAGS = $(libscipolynomials_la_CFLAGS) 475INCLUDE_FLAGS = $(libscipolynomials_la_CFLAGS)
479libscipolynomials_la_LIBADD = \ 476libscipolynomials_la_LIBADD = $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
480 $(top_builddir)/modules/cacsd/libscicacsd.la \
481 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
482 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
483 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
484 $(top_builddir)/modules/core/libscicore.la \
485 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
486 $(am__append_1) $(am__append_2)
487 477
488#### Target ###### 478#### Target ######
489modulename = polynomials 479modulename = polynomials
@@ -515,7 +505,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
515#### the procedure will be the same with Microsoft Windows (C) 505#### the procedure will be the same with Microsoft Windows (C)
516#### and Linux/Unix 506#### and Linux/Unix
517####################################################################### 507#######################################################################
518TARGETS_ALL = $(am__append_3) 508TARGETS_ALL = $(am__append_1)
519 509
520################ MACROS ###################### 510################ MACROS ######################
521# Rule to build a macro 511# Rule to build a macro
diff --git a/scilab/modules/scicos/Makefile.am b/scilab/modules/scicos/Makefile.am
index b150469..1f57372 100644
--- a/scilab/modules/scicos/Makefile.am
+++ b/scilab/modules/scicos/Makefile.am
@@ -114,10 +114,6 @@ INCLUDE_FLAGS = $(libsciscicos_la_CFLAGS)
114 114
115libsciscicos_la_LIBADD = $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/scicos/libscisundials.la $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la 115libsciscicos_la_LIBADD = $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/scicos/libscisundials.la $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la
116 116
117if USE_EMBEDDED_BLAS
118libsciscicos_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
119endif
120
121#### scicos : Conf files #### 117#### scicos : Conf files ####
122libsciscicos_la_rootdir = $(mydatadir) 118libsciscicos_la_rootdir = $(mydatadir)
123libsciscicos_la_root_DATA = changelog.txt license.txt readme.txt version.xml 119libsciscicos_la_root_DATA = changelog.txt license.txt readme.txt version.xml
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 7164228..dc0fbe5 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -66,9 +66,8 @@ DIST_COMMON = $(am__libsciscicos_la_include_HEADERS_DIST) \
66 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 66 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
67 $(top_srcdir)/Makefile.incl.am 67 $(top_srcdir)/Makefile.incl.am
68@NEED_JAVA_TRUE@am__append_1 = java 68@NEED_JAVA_TRUE@am__append_1 = java
69@SCICOS_TRUE@@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
70@OCAML_TRUE@@SCICOS_TRUE@bin_PROGRAMS = $(am__EXEEXT_1) 69@OCAML_TRUE@@SCICOS_TRUE@bin_PROGRAMS = $(am__EXEEXT_1)
71@OCAML_TRUE@@SCICOS_TRUE@am__append_3 = .ml .mli .mll .mly .cmo .cmi .cmx 70@OCAML_TRUE@@SCICOS_TRUE@am__append_2 = .ml .mli .mll .mly .cmo .cmi .cmx
72subdir = modules/scicos 71subdir = modules/scicos
73ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 72ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
74am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 73am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -119,8 +118,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
119@SCICOS_TRUE@ $(top_builddir)/modules/core/libscicore.la \ 118@SCICOS_TRUE@ $(top_builddir)/modules/core/libscicore.la \
120@SCICOS_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \ 119@SCICOS_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \
121@SCICOS_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 120@SCICOS_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \
122@SCICOS_TRUE@ $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 121@SCICOS_TRUE@ $(top_builddir)/modules/arnoldi/libsciarnoldi.la
123@SCICOS_TRUE@ $(am__append_2)
124am__libsciscicos_la_SOURCES_DIST = src/c/noscicos/noscicos.c \ 122am__libsciscicos_la_SOURCES_DIST = src/c/noscicos/noscicos.c \
125 src/c/tree.c src/c/sciblk2i.c src/c/scicos_malloc.c \ 123 src/c/tree.c src/c/sciblk2i.c src/c/scicos_malloc.c \
126 src/c/import.c src/c/slider.c src/c/scicos.c \ 124 src/c/import.c src/c/slider.c src/c/scicos.c \
@@ -519,7 +517,7 @@ TARGETS_ALL = $(am__append_1)
519################ MACROS ###################### 517################ MACROS ######################
520# Rule to build a macro 518# Rule to build a macro
521# NOT USED AT THE MOMENT 519# NOT USED AT THE MOMENT
522SUFFIXES = .sci $(am__append_3) 520SUFFIXES = .sci $(am__append_2)
523 521
524########### INSTALL DOCUMENTATION ################### 522########### INSTALL DOCUMENTATION ###################
525 523
@@ -655,23 +653,7 @@ HELP_CHAPTERFILE = addchapter.sce
655# For the code check (splint) 653# For the code check (splint)
656@SCICOS_TRUE@CHECK_SRC = $(SCICOS_C_SOURCES) $(GATEWAY_C_SOURCES) 654@SCICOS_TRUE@CHECK_SRC = $(SCICOS_C_SOURCES) $(GATEWAY_C_SOURCES)
657@SCICOS_TRUE@INCLUDE_FLAGS = $(libsciscicos_la_CFLAGS) 655@SCICOS_TRUE@INCLUDE_FLAGS = $(libsciscicos_la_CFLAGS)
658@SCICOS_TRUE@libsciscicos_la_LIBADD = \ 656@SCICOS_TRUE@libsciscicos_la_LIBADD = $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/intersci/libsciintersci.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/time/libscitime.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/scicos/libscisundials.la $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la
659@SCICOS_TRUE@ $(top_builddir)/modules/string/libscistring.la \
660@SCICOS_TRUE@ $(top_builddir)/modules/mexlib/libmat.la \
661@SCICOS_TRUE@ $(top_builddir)/modules/mexlib/libmx.la \
662@SCICOS_TRUE@ $(top_builddir)/modules/intersci/libsciintersci.la \
663@SCICOS_TRUE@ $(top_builddir)/modules/graphics/libscigraphics.la \
664@SCICOS_TRUE@ $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
665@SCICOS_TRUE@ $(top_builddir)/modules/time/libscitime.la \
666@SCICOS_TRUE@ $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
667@SCICOS_TRUE@ $(top_builddir)/modules/scicos/libscisundials.la \
668@SCICOS_TRUE@ $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
669@SCICOS_TRUE@ $(top_builddir)/modules/mexlib/libmex.la \
670@SCICOS_TRUE@ $(top_builddir)/modules/core/libscicore.la \
671@SCICOS_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \
672@SCICOS_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \
673@SCICOS_TRUE@ $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
674@SCICOS_TRUE@ $(am__append_2)
675 657
676#### scicos : Conf files #### 658#### scicos : Conf files ####
677@SCICOS_TRUE@libsciscicos_la_rootdir = $(mydatadir) 659@SCICOS_TRUE@libsciscicos_la_rootdir = $(mydatadir)
diff --git a/scilab/modules/scicos_blocks/Makefile.am b/scilab/modules/scicos_blocks/Makefile.am
index 3d60350..20dc2e7 100644
--- a/scilab/modules/scicos_blocks/Makefile.am
+++ b/scilab/modules/scicos_blocks/Makefile.am
@@ -454,14 +454,6 @@ CLEANFILES=$(top_srcdir)/modules/scicos_blocks/includes/blocks.h \
454libsciscicos_blocks_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 454libsciscicos_blocks_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
455 455
456 456
457if USE_EMBEDDED_LAPACK
458libsciscicos_blocks_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
459endif
460
461if USE_EMBEDDED_BLAS
462libsciscicos_blocks_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
463endif
464
465#### scicos_blocks : Conf files #### 457#### scicos_blocks : Conf files ####
466libsciscicos_blocks_la_rootdir = $(mydatadir) 458libsciscicos_blocks_la_rootdir = $(mydatadir)
467libsciscicos_blocks_la_root_DATA = changelog.txt license.txt readme.txt version.xml 459libsciscicos_blocks_la_root_DATA = changelog.txt license.txt readme.txt version.xml
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index ea91e5f..03ee3b2 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -63,8 +63,6 @@ DIST_COMMON = $(am__libsciscicos_blocks_la_include_HEADERS_DIST) \
63 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 63 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
64 $(top_srcdir)/Makefile.incl.am 64 $(top_srcdir)/Makefile.incl.am
65@NEED_JAVA_TRUE@am__append_1 = java 65@NEED_JAVA_TRUE@am__append_1 = java
66@SCICOS_TRUE@@USE_EMBEDDED_LAPACK_TRUE@am__append_2 = $(top_builddir)/libs/lapack/libscilapack.la
67@SCICOS_TRUE@@USE_EMBEDDED_BLAS_TRUE@am__append_3 = $(top_builddir)/libs/blas/libsciblas.la
68subdir = modules/scicos_blocks 66subdir = modules/scicos_blocks
69ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 67ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
70am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -108,8 +106,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
108@SCICOS_TRUE@ $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 106@SCICOS_TRUE@ $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
109@SCICOS_TRUE@ $(top_builddir)/modules/string/libscistring.la \ 107@SCICOS_TRUE@ $(top_builddir)/modules/string/libscistring.la \
110@SCICOS_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \ 108@SCICOS_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \
111@SCICOS_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 109@SCICOS_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la
112@SCICOS_TRUE@ $(am__append_2) $(am__append_3)
113am__libsciscicos_blocks_la_SOURCES_DIST = src/c/absolute_value.c \ 110am__libsciscicos_blocks_la_SOURCES_DIST = src/c/absolute_value.c \
114 src/c/absblk.c src/c/andlog.c src/c/gain.c src/c/dband.c \ 111 src/c/absblk.c src/c/andlog.c src/c/gain.c src/c/dband.c \
115 src/c/cosblk.c src/c/acos_blk.c src/c/acosh_blk.c \ 112 src/c/cosblk.c src/c/acos_blk.c src/c/acosh_blk.c \
@@ -1269,20 +1266,7 @@ HELP_CHAPTERFILE = addchapter.sce
1269 1266
1270 1267
1271# cyclic deps $(top_builddir)/modules/scicos/libsciscicos.la 1268# cyclic deps $(top_builddir)/modules/scicos/libsciscicos.la
1272@SCICOS_TRUE@libsciscicos_blocks_la_LIBADD = \ 1269@SCICOS_TRUE@libsciscicos_blocks_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/cacsd/libscicacsd.la $(top_builddir)/modules/graphics/libscigraphics.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/renderer/libscirenderer.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
1273@SCICOS_TRUE@ $(top_builddir)/modules/core/libscicore.la \
1274@SCICOS_TRUE@ $(top_builddir)/modules/cacsd/libscicacsd.la \
1275@SCICOS_TRUE@ $(top_builddir)/modules/graphics/libscigraphics.la \
1276@SCICOS_TRUE@ $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
1277@SCICOS_TRUE@ $(top_builddir)/modules/renderer/libscirenderer.la \
1278@SCICOS_TRUE@ $(top_builddir)/modules/polynomials/libscipolynomials.la \
1279@SCICOS_TRUE@ $(top_builddir)/modules/fileio/libscifileio.la \
1280@SCICOS_TRUE@ $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
1281@SCICOS_TRUE@ $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
1282@SCICOS_TRUE@ $(top_builddir)/modules/string/libscistring.la \
1283@SCICOS_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \
1284@SCICOS_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \
1285@SCICOS_TRUE@ $(am__append_2) $(am__append_3)
1286 1270
1287#### scicos_blocks : Conf files #### 1271#### scicos_blocks : Conf files ####
1288@SCICOS_TRUE@libsciscicos_blocks_la_rootdir = $(mydatadir) 1272@SCICOS_TRUE@libsciscicos_blocks_la_rootdir = $(mydatadir)
diff --git a/scilab/modules/signal_processing/Makefile.am b/scilab/modules/signal_processing/Makefile.am
index 97d9c0d..5d57466 100644
--- a/scilab/modules/signal_processing/Makefile.am
+++ b/scilab/modules/signal_processing/Makefile.am
@@ -108,15 +108,6 @@ INCLUDE_FLAGS = $(libscisignal_processing_la_CFLAGS)
108 108
109libscisignal_processing_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 109libscisignal_processing_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
110 110
111
112if USE_EMBEDDED_LAPACK
113libscisignal_processing_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
114endif
115
116if USE_EMBEDDED_BLAS
117libscisignal_processing_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
118endif
119
120#### Target ###### 111#### Target ######
121modulename=signal_processing 112modulename=signal_processing
122 113
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index b109dca..aaf811c 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -55,12 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
59@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
60DIST_COMMON = $(libscisignal_processing_la_include_HEADERS) \ 58DIST_COMMON = $(libscisignal_processing_la_include_HEADERS) \
61 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
63@NEED_JAVA_TRUE@am__append_3 = java 61@NEED_JAVA_TRUE@am__append_1 = java
64subdir = modules/signal_processing 62subdir = modules/signal_processing
65ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
66am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -97,8 +95,7 @@ libscisignal_processing_la_DEPENDENCIES = $(top_builddir)/modules/elementary_fun
97 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \ 95 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
98 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 96 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
99 $(top_builddir)/modules/core/libscicore.la \ 97 $(top_builddir)/modules/core/libscicore.la \
100 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 98 $(top_builddir)/modules/output_stream/libscioutput_stream.la
101 $(am__append_1) $(am__append_2)
102am__objects_1 = sci_ffir.lo degree.lo parcha.lo ouch.lo dfftbi.lo \ 99am__objects_1 = sci_ffir.lo degree.lo parcha.lo ouch.lo dfftbi.lo \
103 dsqrtc.lo tranze.lo chebc.lo tscccf.lo dsn2.lo hammin.lo \ 100 dsqrtc.lo tranze.lo chebc.lo tscccf.lo dsn2.lo hammin.lo \
104 bounn.lo nstabl.lo ino.lo desia.lo desi11.lo cmpse3.lo \ 101 bounn.lo nstabl.lo ino.lo desia.lo desi11.lo cmpse3.lo \
@@ -456,12 +453,7 @@ libscisignal_processing_la_SOURCES = $(SIGNAL_PROCESSING_FORTRAN_SOURCES) $(SIGN
456# For the code check (splint) 453# For the code check (splint)
457CHECK_SRC = $(SIGNAL_PROCESSING_C_SOURCES) $(GATEWAY_C_SOURCES) 454CHECK_SRC = $(SIGNAL_PROCESSING_C_SOURCES) $(GATEWAY_C_SOURCES)
458INCLUDE_FLAGS = $(libscisignal_processing_la_CFLAGS) 455INCLUDE_FLAGS = $(libscisignal_processing_la_CFLAGS)
459libscisignal_processing_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 456libscisignal_processing_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/dynamic_link/libscidynamic_link.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
460 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
461 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
462 $(top_builddir)/modules/core/libscicore.la \
463 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
464 $(am__append_1) $(am__append_2)
465 457
466#### Target ###### 458#### Target ######
467modulename = signal_processing 459modulename = signal_processing
@@ -493,7 +485,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
493#### the procedure will be the same with Microsoft Windows (C) 485#### the procedure will be the same with Microsoft Windows (C)
494#### and Linux/Unix 486#### and Linux/Unix
495####################################################################### 487#######################################################################
496TARGETS_ALL = $(am__append_3) 488TARGETS_ALL = $(am__append_1)
497 489
498################ MACROS ###################### 490################ MACROS ######################
499# Rule to build a macro 491# Rule to build a macro
diff --git a/scilab/modules/sparse/Makefile.am b/scilab/modules/sparse/Makefile.am
index 5d50a1b..cddcf11 100644
--- a/scilab/modules/sparse/Makefile.am
+++ b/scilab/modules/sparse/Makefile.am
@@ -176,13 +176,6 @@ INCLUDE_FLAGS = $(libscisparse_la_CFLAGS)
176 176
177libscisparse_la_LIBADD = $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 177libscisparse_la_LIBADD = $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
178 178
179if USE_EMBEDDED_LAPACK
180libscisparse_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
181endif
182
183if USE_EMBEDDED_BLAS
184libscisparse_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
185endif
186 179
187#### Target ###### 180#### Target ######
188modulename=sparse 181modulename=sparse
diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index e98f3cf..c8e99a3 100644
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -55,11 +55,9 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
59@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
60DIST_COMMON = $(libscisparse_la_include_HEADERS) $(srcdir)/Makefile.am \ 58DIST_COMMON = $(libscisparse_la_include_HEADERS) $(srcdir)/Makefile.am \
61 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am 59 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
62@NEED_JAVA_TRUE@am__append_3 = java 60@NEED_JAVA_TRUE@am__append_1 = java
63subdir = modules/sparse 61subdir = modules/sparse
64ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 62ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -99,8 +97,7 @@ libscisparse_la_DEPENDENCIES = $(top_builddir)/modules/io/libsciio.la \
99 $(top_builddir)/modules/polynomials/libscipolynomials.la \ 97 $(top_builddir)/modules/polynomials/libscipolynomials.la \
100 $(top_builddir)/modules/string/libscistring.la \ 98 $(top_builddir)/modules/string/libscistring.la \
101 $(top_builddir)/libs/MALLOC/libscimalloc.la \ 99 $(top_builddir)/libs/MALLOC/libscimalloc.la \
102 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 100 $(top_builddir)/modules/output_stream/libscioutput_stream.la
103 $(am__append_1) $(am__append_2)
104am__objects_1 = libscisparse_la-spUtils.lo libscisparse_la-mspelm.lo \ 101am__objects_1 = libscisparse_la-spUtils.lo libscisparse_la-mspelm.lo \
105 libscisparse_la-lu.lo libscisparse_la-spFactor.lo \ 102 libscisparse_la-lu.lo libscisparse_la-spFactor.lo \
106 libscisparse_la-spBuild.lo libscisparse_la-spOutput.lo \ 103 libscisparse_la-spBuild.lo libscisparse_la-spOutput.lo \
@@ -540,15 +537,7 @@ libscisparse_la_SOURCES = $(SPARSE_C_SOURCES) $(SPARSE_FORTRAN_SOURCES) $(GATEWA
540# For the code check (splint) 537# For the code check (splint)
541CHECK_SRC = $(SPARSE_C_SOURCES) $(GATEWAY_C_SOURCES) 538CHECK_SRC = $(SPARSE_C_SOURCES) $(GATEWAY_C_SOURCES)
542INCLUDE_FLAGS = $(libscisparse_la_CFLAGS) 539INCLUDE_FLAGS = $(libscisparse_la_CFLAGS)
543libscisparse_la_LIBADD = $(top_builddir)/modules/io/libsciio.la \ 540libscisparse_la_LIBADD = $(top_builddir)/modules/io/libsciio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
544 $(top_builddir)/modules/core/libscicore.la \
545 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
546 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
547 $(top_builddir)/modules/polynomials/libscipolynomials.la \
548 $(top_builddir)/modules/string/libscistring.la \
549 $(top_builddir)/libs/MALLOC/libscimalloc.la \
550 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
551 $(am__append_1) $(am__append_2)
552 541
553#### Target ###### 542#### Target ######
554modulename = sparse 543modulename = sparse
@@ -586,7 +575,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
586#### the procedure will be the same with Microsoft Windows (C) 575#### the procedure will be the same with Microsoft Windows (C)
587#### and Linux/Unix 576#### and Linux/Unix
588####################################################################### 577#######################################################################
589TARGETS_ALL = $(am__append_3) 578TARGETS_ALL = $(am__append_1)
590 579
591################ MACROS ###################### 580################ MACROS ######################
592# Rule to build a macro 581# Rule to build a macro
diff --git a/scilab/modules/special_functions/Makefile.am b/scilab/modules/special_functions/Makefile.am
index 0d78e10..5fd516d 100644
--- a/scilab/modules/special_functions/Makefile.am
+++ b/scilab/modules/special_functions/Makefile.am
@@ -52,9 +52,6 @@ INCLUDE_FLAGS = $(libscispecial_functions_la_CFLAGS)
52 52
53libscispecial_functions_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/statistics/libscistatistics.la 53libscispecial_functions_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/statistics/libscistatistics.la
54 54
55if USE_EMBEDDED_BLAS
56libscispecial_functions_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
57endif
58 55
59#### Target ###### 56#### Target ######
60modulename=special_functions 57modulename=special_functions
diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index fbbe684..de8f3d1 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -55,11 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
59DIST_COMMON = $(libscispecial_functions_la_include_HEADERS) \ 58DIST_COMMON = $(libscispecial_functions_la_include_HEADERS) \
60 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
61 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
62@NEED_JAVA_TRUE@am__append_2 = java 61@NEED_JAVA_TRUE@am__append_1 = java
63subdir = modules/special_functions 62subdir = modules/special_functions
64ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -96,8 +95,7 @@ libscispecial_functions_la_DEPENDENCIES = \
96 $(top_builddir)/modules/core/libscicore.la \ 95 $(top_builddir)/modules/core/libscicore.la \
97 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 96 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
98 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 97 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
99 $(top_builddir)/modules/statistics/libscistatistics.la \ 98 $(top_builddir)/modules/statistics/libscistatistics.la
100 $(am__append_1)
101am__objects_1 = libscispecial_functions_la-sci_dlgamma.lo \ 99am__objects_1 = libscispecial_functions_la-sci_dlgamma.lo \
102 libscispecial_functions_la-sci_oldbessely.lo \ 100 libscispecial_functions_la-sci_oldbessely.lo \
103 libscispecial_functions_la-sci_bessely.lo \ 101 libscispecial_functions_la-sci_bessely.lo \
@@ -393,12 +391,7 @@ libscispecial_functions_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOUR
393# For the code check (splint) 391# For the code check (splint)
394CHECK_SRC = $(GATEWAY_C_SOURCES) 392CHECK_SRC = $(GATEWAY_C_SOURCES)
395INCLUDE_FLAGS = $(libscispecial_functions_la_CFLAGS) 393INCLUDE_FLAGS = $(libscispecial_functions_la_CFLAGS)
396libscispecial_functions_la_LIBADD = \ 394libscispecial_functions_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/statistics/libscistatistics.la
397 $(top_builddir)/modules/core/libscicore.la \
398 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
399 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
400 $(top_builddir)/modules/statistics/libscistatistics.la \
401 $(am__append_1)
402 395
403#### Target ###### 396#### Target ######
404modulename = special_functions 397modulename = special_functions
@@ -426,7 +419,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
426#### the procedure will be the same with Microsoft Windows (C) 419#### the procedure will be the same with Microsoft Windows (C)
427#### and Linux/Unix 420#### and Linux/Unix
428####################################################################### 421#######################################################################
429TARGETS_ALL = $(am__append_2) 422TARGETS_ALL = $(am__append_1)
430 423
431################ MACROS ###################### 424################ MACROS ######################
432# Rule to build a macro 425# Rule to build a macro
diff --git a/scilab/modules/statistics/Makefile.am b/scilab/modules/statistics/Makefile.am
index 4edceea..df82f29 100644
--- a/scilab/modules/statistics/Makefile.am
+++ b/scilab/modules/statistics/Makefile.am
@@ -98,11 +98,6 @@ INCLUDE_FLAGS = $(libscistatistics_la_CFLAGS)
98 98
99libscistatistics_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 99libscistatistics_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
100 100
101if USE_EMBEDDED_LAPACK
102libscistatistics_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
103endif
104
105
106#### Target ###### 101#### Target ######
107modulename=statistics 102modulename=statistics
108 103
diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index abe0c07..d624606 100644
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -55,11 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
59DIST_COMMON = $(libscistatistics_la_include_HEADERS) \ 58DIST_COMMON = $(libscistatistics_la_include_HEADERS) \
60 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
61 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
62@NEED_JAVA_TRUE@am__append_2 = java 61@NEED_JAVA_TRUE@am__append_1 = java
63subdir = modules/statistics 62subdir = modules/statistics
64ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -94,8 +93,7 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
94LTLIBRARIES = $(pkglib_LTLIBRARIES) 93LTLIBRARIES = $(pkglib_LTLIBRARIES)
95libscistatistics_la_DEPENDENCIES = \ 94libscistatistics_la_DEPENDENCIES = \
96 $(top_builddir)/modules/core/libscicore.la \ 95 $(top_builddir)/modules/core/libscicore.la \
97 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 96 $(top_builddir)/modules/output_stream/libscioutput_stream.la
98 $(am__append_1)
99am__objects_1 = libscistatistics_la-CdfBase.lo \ 97am__objects_1 = libscistatistics_la-CdfBase.lo \
100 libscistatistics_la-ipmpar1.lo 98 libscistatistics_la-ipmpar1.lo
101am__objects_2 = psi.lo alngam.lo erfc1.lo cdff.lo spmpar.lo cumnor.lo \ 99am__objects_2 = psi.lo alngam.lo erfc1.lo cdff.lo spmpar.lo cumnor.lo \
@@ -443,10 +441,7 @@ libscistatistics_la_SOURCES = $(STATISTICS_C_SOURCES) $(STATISTICS_FORTRAN_SOURC
443# For the code check (splint) 441# For the code check (splint)
444CHECK_SRC = $(STATISTICS_C_SOURCES) $(GATEWAY_C_SOURCES) 442CHECK_SRC = $(STATISTICS_C_SOURCES) $(GATEWAY_C_SOURCES)
445INCLUDE_FLAGS = $(libscistatistics_la_CFLAGS) 443INCLUDE_FLAGS = $(libscistatistics_la_CFLAGS)
446libscistatistics_la_LIBADD = \ 444libscistatistics_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
447 $(top_builddir)/modules/core/libscicore.la \
448 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
449 $(am__append_1)
450 445
451#### Target ###### 446#### Target ######
452modulename = statistics 447modulename = statistics
@@ -478,7 +473,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
478#### the procedure will be the same with Microsoft Windows (C) 473#### the procedure will be the same with Microsoft Windows (C)
479#### and Linux/Unix 474#### and Linux/Unix
480####################################################################### 475#######################################################################
481TARGETS_ALL = $(am__append_2) 476TARGETS_ALL = $(am__append_1)
482 477
483################ MACROS ###################### 478################ MACROS ######################
484# Rule to build a macro 479# Rule to build a macro
diff --git a/scilab/modules/umfpack/Makefile.am b/scilab/modules/umfpack/Makefile.am
index 2604f47..225d379 100644
--- a/scilab/modules/umfpack/Makefile.am
+++ b/scilab/modules/umfpack/Makefile.am
@@ -66,14 +66,6 @@ $(top_builddir)/modules/core/libscicore.la \
66$(top_builddir)/modules/output_stream/libscioutput_stream.la 66$(top_builddir)/modules/output_stream/libscioutput_stream.la
67 67
68 68
69if USE_EMBEDDED_LAPACK
70libsciumfpack_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
71endif
72
73if USE_EMBEDDED_BLAS
74libsciumfpack_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
75endif
76
77libsciumfpack_la_CFLAGS= -I$(srcdir)/includes/ \ 69libsciumfpack_la_CFLAGS= -I$(srcdir)/includes/ \
78 -I$(srcdir)/src/c/ \ 70 -I$(srcdir)/src/c/ \
79 -I$(top_srcdir)/libs/dynamiclibrary/includes/ \ 71 -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
diff --git a/scilab/modules/umfpack/Makefile.in b/scilab/modules/umfpack/Makefile.in
index d262865..6168182 100644
--- a/scilab/modules/umfpack/Makefile.in
+++ b/scilab/modules/umfpack/Makefile.in
@@ -61,12 +61,10 @@ POST_UNINSTALL = :
61build_triplet = @build@ 61build_triplet = @build@
62host_triplet = @host@ 62host_triplet = @host@
63@UMFPACK_TRUE@am__append_1 = $(UMFPACK_LIB) 63@UMFPACK_TRUE@am__append_1 = $(UMFPACK_LIB)
64@UMFPACK_TRUE@@USE_EMBEDDED_LAPACK_TRUE@am__append_2 = $(top_builddir)/libs/lapack/libscilapack.la
65@UMFPACK_TRUE@@USE_EMBEDDED_BLAS_TRUE@am__append_3 = $(top_builddir)/libs/blas/libsciblas.la
66DIST_COMMON = $(am__libsciumfpack_la_include_HEADERS_DIST) \ 64DIST_COMMON = $(am__libsciumfpack_la_include_HEADERS_DIST) \
67 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 65 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
68 $(top_srcdir)/Makefile.incl.am 66 $(top_srcdir)/Makefile.incl.am
69@NEED_JAVA_TRUE@am__append_4 = java 67@NEED_JAVA_TRUE@am__append_2 = java
70subdir = modules/umfpack 68subdir = modules/umfpack
71ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 69ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
72am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 70am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -105,8 +103,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
105@UMFPACK_TRUE@ $(top_builddir)/modules/sparse/libscisparse.la \ 103@UMFPACK_TRUE@ $(top_builddir)/modules/sparse/libscisparse.la \
106@UMFPACK_TRUE@ $(top_builddir)/modules/mexlib/libmex.la \ 104@UMFPACK_TRUE@ $(top_builddir)/modules/mexlib/libmex.la \
107@UMFPACK_TRUE@ $(top_builddir)/modules/core/libscicore.la \ 105@UMFPACK_TRUE@ $(top_builddir)/modules/core/libscicore.la \
108@UMFPACK_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 106@UMFPACK_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la
109@UMFPACK_TRUE@ $(am__append_2) $(am__append_3)
110am__libsciumfpack_la_SOURCES_DIST = src/noumfpack/noumfpack.c \ 107am__libsciumfpack_la_SOURCES_DIST = src/noumfpack/noumfpack.c \
111 src/c/taucs_scilab.c src/c/common_umfpack.c \ 108 src/c/taucs_scilab.c src/c/common_umfpack.c \
112 src/c/with_umfpack.c sci_gateway/c/gw_umfpack.c \ 109 src/c/with_umfpack.c sci_gateway/c/gw_umfpack.c \
@@ -409,14 +406,13 @@ libsciumfpack_la_etc_DATA = etc/umfpack.quit etc/umfpack.start
409# For the code check (splint) 406# For the code check (splint)
410@UMFPACK_TRUE@CHECK_SRC = $(libsciumfpack_la_SOURCES) 407@UMFPACK_TRUE@CHECK_SRC = $(libsciumfpack_la_SOURCES)
411@UMFPACK_TRUE@INCLUDE_FLAGS = $(libsciumfpack_la_CFLAGS) 408@UMFPACK_TRUE@INCLUDE_FLAGS = $(libsciumfpack_la_CFLAGS)
412@UMFPACK_TRUE@libsciumfpack_la_LIBADD = \ 409@UMFPACK_TRUE@libsciumfpack_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la \
413@UMFPACK_TRUE@ $(top_builddir)/modules/mexlib/libmx.la \ 410@UMFPACK_TRUE@$(top_builddir)/modules/mexlib/libmat.la \
414@UMFPACK_TRUE@ $(top_builddir)/modules/mexlib/libmat.la \ 411@UMFPACK_TRUE@$(top_builddir)/modules/sparse/libscisparse.la \
415@UMFPACK_TRUE@ $(top_builddir)/modules/sparse/libscisparse.la \ 412@UMFPACK_TRUE@$(top_builddir)/modules/mexlib/libmex.la \
416@UMFPACK_TRUE@ $(top_builddir)/modules/mexlib/libmex.la \ 413@UMFPACK_TRUE@$(top_builddir)/modules/core/libscicore.la \
417@UMFPACK_TRUE@ $(top_builddir)/modules/core/libscicore.la \ 414@UMFPACK_TRUE@$(top_builddir)/modules/output_stream/libscioutput_stream.la
418@UMFPACK_TRUE@ $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 415
419@UMFPACK_TRUE@ $(am__append_2) $(am__append_3)
420@UMFPACK_FALSE@libsciumfpack_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes 416@UMFPACK_FALSE@libsciumfpack_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes
421@UMFPACK_TRUE@libsciumfpack_la_CFLAGS = -I$(srcdir)/includes/ \ 417@UMFPACK_TRUE@libsciumfpack_la_CFLAGS = -I$(srcdir)/includes/ \
422@UMFPACK_TRUE@ -I$(srcdir)/src/c/ \ 418@UMFPACK_TRUE@ -I$(srcdir)/src/c/ \
@@ -442,7 +438,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
442#### the procedure will be the same with Microsoft Windows (C) 438#### the procedure will be the same with Microsoft Windows (C)
443#### and Linux/Unix 439#### and Linux/Unix
444####################################################################### 440#######################################################################
445TARGETS_ALL = $(am__append_4) 441TARGETS_ALL = $(am__append_2)
446 442
447################ MACROS ###################### 443################ MACROS ######################
448# Rule to build a macro 444# Rule to build a macro