summaryrefslogtreecommitdiffstats
path: root/scilab/modules/Makefile.am
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/Makefile.am
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/Makefile.am')
-rw-r--r--scilab/modules/Makefile.am20
1 files changed, 1 insertions, 19 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