Mercurial > octave

annotate liboctave/numeric/module.mk @ 31249:de6fc38c78c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make Jacobian types offered by dlsode.f accessible by lsode (bug #31626). * liboctave/numeric/LSODE-opts.in: Add options "jacobian type", "lower jacobian subdiagonals", and "upper jacobian subdiagonals". * liboctave/numeric/LSODE.cc (file scope, lsode_j, LSODE::do_integrate (double)): Handle new configurable Jacobian types. * build-aux/mk-opts.pl: Don't implicitly convert to integer in condition.
author Olaf Till <olaf.till@uni-jena.de>
date Fri, 12 Nov 2010 08:53:05 +0100
parents 11bda5cb45b5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19792
diff changeset
1 LIBOCTAVE_OPT_INC = \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
2 %reldir%/DASPK-opts.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
3 %reldir%/DASRT-opts.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
4 %reldir%/DASSL-opts.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
5 %reldir%/LSODE-opts.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
6 %reldir%/Quad-opts.h
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
7
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19792
diff changeset
8 LIBOCTAVE_OPT_IN = $(LIBOCTAVE_OPT_INC:.h=.in)
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
9
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
10 NUMERIC_INC = \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
11 %reldir%/CollocWt.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
12 %reldir%/DAE.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
13 %reldir%/DAEFunc.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
14 %reldir%/DAERT.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
15 %reldir%/DAERTFunc.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
16 %reldir%/DASPK.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
17 %reldir%/DASRT.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
18 %reldir%/DASSL.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
19 %reldir%/DET.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
20 %reldir%/EIG.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
21 %reldir%/gsvd.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
22 %reldir%/LSODE.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
23 %reldir%/ODE.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
24 %reldir%/ODEFunc.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
25 %reldir%/ODES.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
26 %reldir%/ODESFunc.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
27 %reldir%/Quad.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
28 %reldir%/aepbalance.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
29 %reldir%/base-dae.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
30 %reldir%/base-de.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
31 %reldir%/bsxfun-decl.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
32 %reldir%/bsxfun.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
33 %reldir%/chol.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
34 %reldir%/eigs-base.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
35 %reldir%/fEIG.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
36 %reldir%/gepbalance.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
37 %reldir%/hess.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
38 %reldir%/lo-amos-proto.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
39 %reldir%/lo-arpack-proto.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
40 %reldir%/lo-blas-proto.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
41 %reldir%/lo-lapack-proto.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
42 %reldir%/lo-mappers.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
43 %reldir%/lo-qrupdate-proto.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
44 %reldir%/lo-ranlib-proto.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
45 %reldir%/lo-slatec-proto.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
46 %reldir%/lo-specfun.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
47 %reldir%/lu.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
48 %reldir%/oct-convn.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
49 %reldir%/oct-fftw.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
50 %reldir%/oct-norm.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
51 %reldir%/oct-rand.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
52 %reldir%/oct-spparms.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
53 %reldir%/qr.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
54 %reldir%/qrp.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
55 %reldir%/randgamma.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
56 %reldir%/randmtzig.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
57 %reldir%/randpoisson.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
58 %reldir%/schur.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
59 %reldir%/sparse-chol.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
60 %reldir%/sparse-dmsolve.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
61 %reldir%/sparse-lu.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
62 %reldir%/sparse-qr.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
63 %reldir%/svd.h
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
64
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
65 NUMERIC_SRC = \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
66 %reldir%/CollocWt.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
67 %reldir%/DASPK.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
68 %reldir%/DASRT.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
69 %reldir%/DASSL.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
70 %reldir%/EIG.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
71 %reldir%/gsvd.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
72 %reldir%/LSODE.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
73 %reldir%/ODES.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
74 %reldir%/Quad.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
75 %reldir%/aepbalance.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
76 %reldir%/chol.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
77 %reldir%/eigs-base.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
78 %reldir%/fEIG.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
79 %reldir%/gepbalance.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
80 %reldir%/hess.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
81 %reldir%/lo-mappers.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
82 %reldir%/lo-specfun.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
83 %reldir%/lu.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
84 %reldir%/oct-convn.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
85 %reldir%/oct-fftw.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
86 %reldir%/oct-norm.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
87 %reldir%/oct-rand.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
88 %reldir%/oct-spparms.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
89 %reldir%/qr.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
90 %reldir%/qrp.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
91 %reldir%/randgamma.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
92 %reldir%/randmtzig.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
93 %reldir%/randpoisson.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
94 %reldir%/schur.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
95 %reldir%/sparse-chol.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
96 %reldir%/sparse-dmsolve.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
97 %reldir%/sparse-lu.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
98 %reldir%/sparse-qr.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
99 %reldir%/svd.cc
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
100
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19792
diff changeset
101 LIBOCTAVE_TEMPLATE_SRC += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
102 %reldir%/bsxfun-defs.cc
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
103
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
104 ## Special rules for sources which must be built before rest of compilation.
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19792
diff changeset
105 $(LIBOCTAVE_OPT_INC) : %.h : %.in
19792
4f6ae6b94abe make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents: 19596
diff changeset
106 $(AM_V_GEN)rm -f $@-t $@ && \
21290
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21280
diff changeset
107 $(PERL) $(srcdir)/build-aux/mk-opts.pl --opt-class-header $< > $@-t && \
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
108 mv $@-t $@
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
109
21290
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21280
diff changeset
110 $(LIBOCTAVE_OPT_INC) : $(srcdir)/build-aux/mk-opts.pl
17513
fedcd3717ebc doc: grammarcheck of documentation before 3.8 release.
Rik <rik@octave.org>
parents: 15696
diff changeset
111
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
112 noinst_LTLIBRARIES += %reldir%/libnumeric.la
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
113
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
114 %canon_reldir%_libnumeric_la_SOURCES = $(NUMERIC_SRC)
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19792
diff changeset
115
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
116 %canon_reldir%_libnumeric_la_CPPFLAGS = \
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19792
diff changeset
117 $(liboctave_liboctave_la_CPPFLAGS) \
23434
f4d4d83f15c5 maint: rename cruft/ directory to external/
Rik <rik@octave.org>
parents: 22586
diff changeset
118 -I$(srcdir)/liboctave/external/Faddeeva \
15416
a0fb36acbd0d build: Only use extra CPPFLAGS in the convenience libraries that need them.
Rik <rik@octave.org>
parents: 15271
diff changeset
119 $(FFTW_XCPPFLAGS) \
a0fb36acbd0d build: Only use extra CPPFLAGS in the convenience libraries that need them.
Rik <rik@octave.org>
parents: 15271
diff changeset
120 $(SPARSE_XCPPFLAGS)
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
121
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23434
diff changeset
122 liboctave_liboctave_la_LIBADD += %reldir%/libnumeric.la
20366
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20327
diff changeset
123
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20327
diff changeset
124 liboctave_EXTRA_DIST += $(LIBOCTAVE_OPT_IN)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20327
diff changeset
125
22024
659731a4563f build: delete generated files, keep distributed files on clean and distclean (bug #45646)
Mike Miller <mtmiller@octave.org>
parents: 21720
diff changeset
126 liboctave_CLEANFILES += \
659731a4563f build: delete generated files, keep distributed files on clean and distclean (bug #45646)
Mike Miller <mtmiller@octave.org>
parents: 21720
diff changeset
127 $(LIBOCTAVE_OPT_INC)