summaryrefslogtreecommitdiffstats
path: root/scilab/modules/arnoldi
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-22 11:56:39 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-22 11:56:39 +0100
commit163a7906bea21a424f94b8643beb1ac6a20aeb60 (patch)
tree5088f0d5b19122fd3f5ee58813ea111e7a956275 /scilab/modules/arnoldi
parentc6ce5230290b5edaeca9aaa95bd866510df3b3c6 (diff)
parentb910e072ae7f53378f8c073d371df1d42ad533cf (diff)
downloadscilab-163a7906bea21a424f94b8643beb1ac6a20aeb60.zip
scilab-163a7906bea21a424f94b8643beb1ac6a20aeb60.tar.gz
Merge remote branch 'origin/5.2'
Conflicts: scilab/CHANGES_5.2.X scilab/configure scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/Category.java
Diffstat (limited to 'scilab/modules/arnoldi')
-rw-r--r--scilab/modules/arnoldi/Makefile.am2
-rw-r--r--scilab/modules/arnoldi/Makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/scilab/modules/arnoldi/Makefile.am b/scilab/modules/arnoldi/Makefile.am
index f98e682..bf34879 100644
--- a/scilab/modules/arnoldi/Makefile.am
+++ b/scilab/modules/arnoldi/Makefile.am
@@ -73,7 +73,7 @@ libsciarnoldi_la_FFLAGS= -I$(srcdir)/src/arpack/
73 73
74pkglib_LTLIBRARIES = libsciarnoldi.la 74pkglib_LTLIBRARIES = libsciarnoldi.la
75 75
76libsciarnoldi_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) 76libsciarnoldi_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LAPACK_LIBS)
77 77
78libsciarnoldi_la_SOURCES = $(ARNOLDI_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) 78libsciarnoldi_la_SOURCES = $(ARNOLDI_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
79 79
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index ea1d4f7..0b5b8ee 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -478,7 +478,7 @@ libsciarnoldi_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
478 478
479libsciarnoldi_la_FFLAGS = -I$(srcdir)/src/arpack/ 479libsciarnoldi_la_FFLAGS = -I$(srcdir)/src/arpack/
480pkglib_LTLIBRARIES = libsciarnoldi.la 480pkglib_LTLIBRARIES = libsciarnoldi.la
481libsciarnoldi_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) 481libsciarnoldi_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LAPACK_LIBS)
482libsciarnoldi_la_SOURCES = $(ARNOLDI_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) 482libsciarnoldi_la_SOURCES = $(ARNOLDI_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
483 483
484# For the code check (splint) 484# For the code check (splint)