summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2008-10-11 10:50:09 +0000
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2008-10-11 10:50:09 +0000
commit715a1c40974581c719cedad6b709a9c549877ac0 (patch)
tree86f7e3e6fb093ccae95680a4532c38de683e4f5c
parent385cddc23100aec39caba633ce4007a34545db0f (diff)
downloadscilab-715a1c40974581c719cedad6b709a9c549877ac0.zip
scilab-715a1c40974581c719cedad6b709a9c549877ac0.tar.gz
Comments
-rw-r--r--scilab/modules/Makefile.am5
-rw-r--r--scilab/modules/Makefile.in6
2 files changed, 7 insertions, 4 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index b45fb5e..9e02b69 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -192,10 +192,11 @@ $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
192$(top_builddir)/libs/libst/libscilibst.la 192$(top_builddir)/libs/libst/libscilibst.la
193 193
194if USE_EMBEDDED_BLAS 194if USE_EMBEDDED_BLAS
195# Use the blas provided into the Scilab tarball
195libscilab_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la 196libscilab_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
196endif 197endif
197 198
198if USE_EMBEDDED_LAPACK 199if USE_EMBEDDED_LAPACK
199libscilab_la_LIBADD += \ 200# Use the lapack provided into the Scilab tarball
200$(top_builddir)/libs/lapack/libscilapack.la 201libscilab_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
201endif 202endif
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index f64a00d..79e9dd0 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -54,10 +54,12 @@ host_triplet = @host@
54@USE_EMBEDDED_BLAS_FALSE@am__append_4 = $(BLAS_LIBS) 54@USE_EMBEDDED_BLAS_FALSE@am__append_4 = $(BLAS_LIBS)
55@ENABLE_STATIC_TRUE@am__append_5 = $(ALL_LIBS) 55@ENABLE_STATIC_TRUE@am__append_5 = $(ALL_LIBS)
56@SCICOS_TRUE@am__append_6 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la 56@SCICOS_TRUE@am__append_6 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
57
58# Use the blas provided into the Scilab tarball
57@USE_EMBEDDED_BLAS_TRUE@am__append_7 = $(top_builddir)/libs/blas/libsciblas.la 59@USE_EMBEDDED_BLAS_TRUE@am__append_7 = $(top_builddir)/libs/blas/libsciblas.la
58@USE_EMBEDDED_LAPACK_TRUE@am__append_8 = \
59@USE_EMBEDDED_LAPACK_TRUE@$(top_builddir)/libs/lapack/libscilapack.la
60 60
61# Use the lapack provided into the Scilab tarball
62@USE_EMBEDDED_LAPACK_TRUE@am__append_8 = $(top_builddir)/libs/lapack/libscilapack.la
61subdir = modules 63subdir = modules
62DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 64DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 65ACLOCAL_M4 = $(top_srcdir)/aclocal.m4