Mercurial > hg > octave-lyh
annotate liboctave/link-deps.mk @ 15212:4bbd3bbb8912
reduce code duplication in too_large_for_float array functions
* lo-utils.h (any_all_test): New function.
* lo-utils.h, lo-utils.cc (xtoo_large_for_float (const Complex&)):
New function.
* Array.h (Array<T>::test): Call any_all_test.
* Sparse.h (Sparse<T>::test, Sparse<T>::test_any, Sparse<T>::test_all,
Sparse<T>::test_any, Sparse<T>::test_any, Sparse<T>::test_all,
Sparse<T>::test_all): New functions.
* CMatrix.cc (ComplexMatrix::too_large_for_float): Simplify with
test_any and xtoo_large_for_float.
* CNDArray.cc (ComplexNDArray::too_large_for_float): Likewise.
* CSparse.cc (SparseComplexMatrix::too_large_for_float): Likewise.
* dSparse.cc (SparseMatrix::too_large_for_float): Likewise.
* dMatrix.cc (Matrix::too_large_for_float): Use test_any, not test_all.
* dNDArray.cc (NDArray::too_large_for_float): Likewise.
* fCMatrix.cc (FloatComplexMatrix::too_large_for_float):
Unconditionlly return false.
* fCNDArray.cc (FloatComplexNDArray::too_large_for_float): Likewise.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 22 Aug 2012 16:16:31 -0400 |
parents | 2a36a5b89f98 |
children | 648dabbb4c6b |
rev | line source |
---|---|
15208
2a36a5b89f98
link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
13024
diff
changeset
|
1 include $(top_srcdir)/libcruft/link-deps.mk |
13011
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2 |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
3 LIBOCTAVE_LINK_DEPS = \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
4 $(SPARSE_XLIBS) \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
5 $(ARPACK_LIBS) \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
6 $(QRUPDATE_LIBS) \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
7 $(FFTW_XLIBS) \ |
13024
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13022
diff
changeset
|
8 $(LAPACK_LIBS) \ |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13022
diff
changeset
|
9 $(BLAS_LIBS) \ |
13011
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
10 $(READLINE_LIBS) \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
11 $(TERM_LIBS) \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
12 $(LIBGLOB) \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
13 $(REGEX_LIBS) \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
14 $(DL_LIBS) \ |
13024
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13022
diff
changeset
|
15 $(PTHREAD_LIBS) \ |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13022
diff
changeset
|
16 $(LIBS) |
13011
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
18 LIBOCTAVE_LINK_OPTS = \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 $(SPARSE_XLDFLAGS) \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
20 $(ARPACK_LDFLAGS) \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
21 $(QRUPDATE_LDFLAGS) \ |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
22 $(FFTW_XLDFLAGS) |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
24 if AMCOND_LINK_ALL_DEPS |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 LIBOCTAVE_LINK_DEPS += $(LIBCRUFT_LINK_DEPS) |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 LIBOCTAVE_LINK_OPTS += $(LIBCRUFT_LINK_OPTS) |
1609dd300c4d
maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 endif |