This value determines whether the editor should be started in async mode
(editor is started in the background and Octave continues) or sync mode
-(Octave waits until the editor exits). Set it to "async" to start the editor
-in async mode. The default is "sync" (see also "system").
+(Octave waits until the editor exits). Set it to "sync" to start the editor
+in sync mode. The default is "async" (see also "system").
‘editinplace’
Determines whether files should be edited in place, without regard to
whether they are modifiable or not. The default is false.
Binary files octave-3.6.1/doc/interpreter/octave.html/gplot.png and octave-3.6.2/doc/interpreter/octave.html/gplot.png differ
Binary files octave-3.6.1/doc/interpreter/octave.html/griddata.png and octave-3.6.2/doc/interpreter/octave.html/griddata.png differ
Binary files octave-3.6.1/doc/interpreter/octave.html/grid.png and octave-3.6.2/doc/interpreter/octave.html/grid.png differ
Binary files octave-3.6.1/doc/interpreter/octave.html/hist.png and octave-3.6.2/doc/interpreter/octave.html/hist.png differ
diff -uNr octave-3.6.1/doc/interpreter/octave.html/index.html octave-3.6.2/doc/interpreter/octave.html/index.html
--- octave-3.6.1/doc/interpreter/octave.html/index.html 2012-02-22 15:02:29.000000000 -0500
+++ octave-3.6.2/doc/interpreter/octave.html/index.html 2012-05-31 11:41:35.000000000 -0400
@@ -666,7 +666,7 @@
This manual documents how to run, install and port GNU Octave, as well
as its new features and incompatibilities, and how to report bugs.
-It corresponds to GNU Octave version 3.6.1.
+It corresponds to GNU Octave version 3.6.2.
On some systems you can obtain many of Octave's build dependencies
+automatically. The commands for doing this vary by system. Similarly,
+the names of pre-compiled packages vary by system and do not always
+match exactly the names listed in Build Tools and External Packages.
+
+
You will usually need the development version of an external dependency
+so that you get the libraries and header files for building software,
+not just for running already compiled programs. These packages
+typically have names that end with the suffix -dev or -devel.
+
+
On systems with apt-get (Debian, Ubuntu, etc.), you may be able
+to install most of the tools and external packages using a command
+similar to
+
+
apt-get build-dep octave
+
+
The specific package name may be octave3.2 or octave3.4.
+The set of required tools and external dependencies does not change
+frequently, so it is not important that the version match exactly, but
+you should use the most recent one available.
+
+
On systems with yum (Fedora, Red Hat, etc.), you may be able to
+install most of the tools and external packages using a command similar to
+
+
yum-builddep octave
+
+
The yum-builddep utility is part of the yum-utils package.
+
+
For either type of system, the package name may include a version
+number. The set of required tools and external dependencies does not
+change frequently, so it is not important that the version exactly match
+the version you are installing, but you should use the most recent one
+available.
+
+
+
Binary files octave-3.6.1/doc/interpreter/octave.html/plot3.png and octave-3.6.2/doc/interpreter/octave.html/plot3.png differ
Binary files octave-3.6.1/doc/interpreter/octave.html/plot.png and octave-3.6.2/doc/interpreter/octave.html/plot.png differ
Binary files octave-3.6.1/doc/interpreter/octave.html/polar.png and octave-3.6.2/doc/interpreter/octave.html/polar.png differ
Binary files octave-3.6.1/doc/interpreter/octave.html/spcholperm.png and octave-3.6.2/doc/interpreter/octave.html/spcholperm.png differ
Binary files octave-3.6.1/doc/interpreter/octave.html/spchol.png and octave-3.6.2/doc/interpreter/octave.html/spchol.png differ
diff -uNr octave-3.6.1/doc/interpreter/octave.html/Special-Utility-Matrices.html octave-3.6.2/doc/interpreter/octave.html/Special-Utility-Matrices.html
--- octave-3.6.1/doc/interpreter/octave.html/Special-Utility-Matrices.html 2012-02-22 15:02:27.000000000 -0500
+++ octave-3.6.2/doc/interpreter/octave.html/Special-Utility-Matrices.html 2012-05-31 11:41:34.000000000 -0400
@@ -211,7 +211,7 @@
— Function File: logspace (a, b)
-— Function File: logspace (b, b, n)
+— Function File: logspace (a, b, n)
— Function File: logspace (a, pi, n)
Return a row vector with n elements logarithmically spaced from
10^a to 10^b.
Binary files octave-3.6.1/doc/interpreter/octave.html/spmatrix.png and octave-3.6.2/doc/interpreter/octave.html/spmatrix.png differ
diff -uNr octave-3.6.1/doc/interpreter/octave.html/String-Conversions.html octave-3.6.2/doc/interpreter/octave.html/String-Conversions.html
--- octave-3.6.1/doc/interpreter/octave.html/String-Conversions.html 2012-02-22 15:02:26.000000000 -0500
+++ octave-3.6.2/doc/interpreter/octave.html/String-Conversions.html 2012-05-31 11:41:33.000000000 -0400
@@ -52,6 +52,12 @@
bin2dec ("1110")
⇒ 14
+
Spaces are ignored during conversion and may be used to make the binary
+number more readable.
+
+
bin2dec ("1000 0001")
+ ⇒ 129
+
If s is a string matrix, return a column vector with one converted
number per row of s; Invalid rows evaluate to NaN.
diff -uNr octave-3.6.1/doc/interpreter/octave.html/Timing-Utilities.html octave-3.6.2/doc/interpreter/octave.html/Timing-Utilities.html
--- octave-3.6.1/doc/interpreter/octave.html/Timing-Utilities.html 2012-02-22 15:02:28.000000000 -0500
+++ octave-3.6.2/doc/interpreter/octave.html/Timing-Utilities.html 2012-05-31 11:41:34.000000000 -0400
@@ -40,7 +40,7 @@
usec
Microseconds after the second (0-999999).
-
sec
Seconds after the minute (0-61). This number can be 61 to account
+
sec
Seconds after the minute (0-60). This number can be 60 to account
for leap seconds.
min
Minutes after the hour (0-59).
diff -uNr octave-3.6.1/doc/interpreter/octave.html/Tips-for-Specific-Systems.html octave-3.6.2/doc/interpreter/octave.html/Tips-for-Specific-Systems.html
--- octave-3.6.1/doc/interpreter/octave.html/Tips-for-Specific-Systems.html 2012-02-22 15:02:29.000000000 -0500
+++ octave-3.6.2/doc/interpreter/octave.html/Tips-for-Specific-Systems.html 1969-12-31 19:00:00.000000000 -0500
@@ -1,68 +0,0 @@
-
-
-Tips for Specific Systems - GNU Octave
-
-
-
-
-
-
-
-
-
-
-
-
The names of pre-compiled packages vary by system and do not always
-match exactly the names listed above.
-
-
You will usually need the development version of an external dependency
-so that you get the libraries and header files for building software,
-not just for running already compiled programs. These packages
-typically have names that end with the suffix -dev or -devel.
-
-
On systems with apt-get (Debian, Ubuntu, etc.), you may be able
-to install most of the tools and external packages using a command
-similar to
-
-
apt-get build-dep octave
-
-
The specific package name may be octave3.2 or octave3.4.
-The set of required tools and external dependencies does not change
-frequently, so it is not important that the version match exactly, but
-you should use the most recent one available.
-
-
On systems with yum (Fedora, Red Hat, etc.), you may be able to
-install most of the tools and external packages using a command similar to
-
-
yum-builddep octave
-
-
The yum-builddep utility is part of the yum-utils package.
-
-
This manual documents how to use, install and port Octave's C++ class
library, and how to report bugs. It corresponds to Octave version
-3.6.1.
+3.6.2.
diff -uNr octave-3.6.1/doc/liboctave/liboctave.info octave-3.6.2/doc/liboctave/liboctave.info
--- octave-3.6.1/doc/liboctave/liboctave.info 2012-02-22 15:03:07.000000000 -0500
+++ octave-3.6.2/doc/liboctave/liboctave.info 2012-05-31 11:42:04.000000000 -0400
@@ -27,7 +27,7 @@
This manual documents how to use, install and port Octave's C++ class
library, and how to report bugs. It corresponds to Octave version
-3.6.1.
+3.6.2.
* Menu:
Binary files octave-3.6.1/doc/liboctave/liboctave.pdf and octave-3.6.2/doc/liboctave/liboctave.pdf differ
diff -uNr octave-3.6.1/doc/liboctave/liboctave.ps octave-3.6.2/doc/liboctave/liboctave.ps
--- octave-3.6.1/doc/liboctave/liboctave.ps 2012-02-22 15:03:10.000000000 -0500
+++ octave-3.6.2/doc/liboctave/liboctave.ps 2012-05-31 11:42:07.000000000 -0400
@@ -1,7 +1,7 @@
%!PS-Adobe-2.0
-%%Creator: dvips(k) 5.98 Copyright 2009 Radical Eye Software
+%%Creator: dvips(k) 5.991 Copyright 2011 Radical Eye Software
%%Title: liboctave.dvi
-%%CreationDate: Wed Feb 22 15:03:10 2012
+%%CreationDate: Thu May 31 11:42:07 2012
%%Pages: 56
%%PageOrder: Ascend
%%BoundingBox: 0 0 612 792
@@ -12,7 +12,7 @@
%DVIPSWebPage: (www.radicaleye.com)
%DVIPSCommandLine: dvips -o liboctave.ps liboctave.dvi
%DVIPSParameters: dpi=600
-%DVIPSSource: TeX output 2012.02.22:1503
+%DVIPSSource: TeX output 2012.05.31:1142
%%BeginProcSet: tex.pro 0 0
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -44,19 +44,21 @@
userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X
1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4
index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N
-/p{show}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 N/Ry 0 N/V{}B/RV/v{
-/Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT)
-(LaserWriter 16/600)]{A length product length le{A length product exch 0
-exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse
-end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask
-grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot}
-imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round
-exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto
-fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p
-delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M}
-B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p -3 w}B/n{
-p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S
-rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
+/dir 0 def/dyy{/dir 0 def}B/dyt{/dir 1 def}B/dty{/dir 2 def}B/dtt{/dir 3
+def}B/p{dir 2 eq{-90 rotate show 90 rotate}{dir 3 eq{-90 rotate show 90
+rotate}{show}ifelse}ifelse}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0
+N/Ry 0 N/V{}B/RV/v{/Ry X/Rx X V}B statusdict begin/product where{pop
+false[(Display)(NeXT)(LaserWriter 16/600)]{A length product length le{A
+length product exch 0 exch getinterval eq{pop true exit}if}{pop}ifelse}
+forall}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{
+BDot}imagemask grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat
+{BDot}imagemask grestore}}ifelse B/QV{gsave newpath transform round exch
+round exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0
+rlineto fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B
+/M{S p delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}
+B/g{0 M}B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p
+-3 w}B/n{p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{
+0 S rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
%%EndProcSet
%%BeginProcSet: texps.pro 0 0
@@ -6060,7 +6062,7 @@
%%Page: 1 1
TeXDict begin 1 0 bop 150 1318 a Fr(Octa)-5 b(v)g(e)65
b(C)p Fq(++)f Fr(Classes)p 150 1385 3600 34 v 2339 1481
-a Fp(Edition)30 b(1.0)i(for)e(Octa)m(v)m(e)i(v)m(ersion)f(3.6.1)3118
+a Fp(Edition)30 b(1.0)i(for)e(Octa)m(v)m(e)i(v)m(ersion)f(3.6.2)3118
1589 y(Septem)m(b)s(er)f(1993)150 5091 y Fo(John)45 b(W.)g(Eaton)p
150 5141 3600 17 v eop end
%%Page: 2 2
@@ -6069,7 +6071,7 @@
150 4296 y(This)37 b(is)g(the)h(\014rst)e(edition)i(of)g(the)f(do)s
(cumen)m(tation)i(for)e(Octa)m(v)m(e's)j(C)p Fm(++)c
Fp(classes,)k(and)d(is)h(consisten)m(t)150 4406 y(with)30
-b(v)m(ersion)h(3.6.1)h(of)f(Octa)m(v)m(e.)150 4565 y(P)m(ermission)h
+b(v)m(ersion)h(3.6.2)h(of)f(Octa)m(v)m(e.)150 4565 y(P)m(ermission)h
(is)h(gran)m(ted)g(to)f(mak)m(e)i(and)d(distribute)h(v)m(erbatim)h
(copies)g(of)f(this)g(man)m(ual)h(pro)m(vided)f(the)150
4675 y(cop)m(yrigh)m(t)g(notice)f(and)f(this)g(p)s(ermission)g(notice)h
diff -uNr octave-3.6.1/doc/liboctave/Makefile.in octave-3.6.2/doc/liboctave/Makefile.in
--- octave-3.6.1/doc/liboctave/Makefile.in 2012-02-22 14:46:08.000000000 -0500
+++ octave-3.6.2/doc/liboctave/Makefile.in 2012-05-31 11:24:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -197,6 +197,12 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
@@ -1601,6 +1607,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build-aux/common.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1841,10 +1848,15 @@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -1903,13 +1915,14 @@
for p in $$list; do \
if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
$(am__strip_dir) \
- if test -d "$$d$$p"; then \
+ d2=$$d$$p; \
+ if test -d "$$d2"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
$(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
- echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
+ echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
else \
- list2="$$list2 $$d$$p"; \
+ list2="$$list2 $$d2"; \
fi; \
done; \
test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
@@ -1941,8 +1954,13 @@
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
@$(POST_INSTALL)
- @if (install-info --version && \
- install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+ @am__run_installinfo=yes; \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) am__run_installinfo=no;; \
+ *) (install-info --version) >/dev/null 2>&1 \
+ || am__run_installinfo=no;; \
+ esac; \
+ if test $$am__run_installinfo = yes; then \
list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
diff -uNr octave-3.6.1/doc/liboctave/stamp-vti octave-3.6.2/doc/liboctave/stamp-vti
--- octave-3.6.1/doc/liboctave/stamp-vti 2012-02-22 15:03:07.000000000 -0500
+++ octave-3.6.2/doc/liboctave/stamp-vti 2012-05-31 11:42:04.000000000 -0400
@@ -1,4 +1,4 @@
-@set UPDATED 22 February 2012
-@set UPDATED-MONTH February 2012
-@set EDITION 3.6.1
-@set VERSION 3.6.1
+@set UPDATED 30 May 2012
+@set UPDATED-MONTH May 2012
+@set EDITION 3.6.2
+@set VERSION 3.6.2
diff -uNr octave-3.6.1/doc/liboctave/version.texi octave-3.6.2/doc/liboctave/version.texi
--- octave-3.6.1/doc/liboctave/version.texi 2012-02-22 15:03:07.000000000 -0500
+++ octave-3.6.2/doc/liboctave/version.texi 2012-05-31 11:42:04.000000000 -0400
@@ -1,4 +1,4 @@
-@set UPDATED 22 February 2012
-@set UPDATED-MONTH February 2012
-@set EDITION 3.6.1
-@set VERSION 3.6.1
+@set UPDATED 30 May 2012
+@set UPDATED-MONTH May 2012
+@set EDITION 3.6.2
+@set VERSION 3.6.2
diff -uNr octave-3.6.1/doc/Makefile.in octave-3.6.2/doc/Makefile.in
--- octave-3.6.1/doc/Makefile.in 2012-02-22 14:46:07.000000000 -0500
+++ octave-3.6.2/doc/Makefile.in 2012-05-31 11:24:26.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -1588,6 +1588,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build-aux/common.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1812,10 +1813,15 @@
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff -uNr octave-3.6.1/doc/refcard/Makefile.in octave-3.6.2/doc/refcard/Makefile.in
--- octave-3.6.1/doc/refcard/Makefile.in 2012-02-22 14:46:08.000000000 -0500
+++ octave-3.6.2/doc/refcard/Makefile.in 2012-05-31 11:24:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -1565,6 +1565,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build-aux/common.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1631,10 +1632,15 @@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
Binary files octave-3.6.1/doc/refcard/refcard-a4.dvi and octave-3.6.2/doc/refcard/refcard-a4.dvi differ
Binary files octave-3.6.1/doc/refcard/refcard-a4.pdf and octave-3.6.2/doc/refcard/refcard-a4.pdf differ
diff -uNr octave-3.6.1/doc/refcard/refcard-a4.ps octave-3.6.2/doc/refcard/refcard-a4.ps
--- octave-3.6.1/doc/refcard/refcard-a4.ps 2012-02-22 15:03:10.000000000 -0500
+++ octave-3.6.2/doc/refcard/refcard-a4.ps 2012-05-31 11:42:07.000000000 -0400
@@ -1,7 +1,7 @@
%!PS-Adobe-2.0
-%%Creator: dvips(k) 5.98 Copyright 2009 Radical Eye Software
+%%Creator: dvips(k) 5.991 Copyright 2011 Radical Eye Software
%%Title: refcard-a4.dvi
-%%CreationDate: Wed Feb 22 15:03:10 2012
+%%CreationDate: Thu May 31 11:42:07 2012
%%Pages: 3
%%PageOrder: Ascend
%%Orientation: Landscape
@@ -12,7 +12,7 @@
%DVIPSWebPage: (www.radicaleye.com)
%DVIPSCommandLine: dvips -T 297mm,210mm -o refcard-a4.ps refcard-a4.dvi
%DVIPSParameters: dpi=600
-%DVIPSSource: TeX output 2012.02.22:1503
+%DVIPSSource: TeX output 2012.05.31:1142
%%BeginProcSet: tex.pro 0 0
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -44,19 +44,21 @@
userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X
1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4
index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N
-/p{show}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 N/Ry 0 N/V{}B/RV/v{
-/Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT)
-(LaserWriter 16/600)]{A length product length le{A length product exch 0
-exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse
-end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask
-grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot}
-imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round
-exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto
-fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p
-delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M}
-B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p -3 w}B/n{
-p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S
-rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
+/dir 0 def/dyy{/dir 0 def}B/dyt{/dir 1 def}B/dty{/dir 2 def}B/dtt{/dir 3
+def}B/p{dir 2 eq{-90 rotate show 90 rotate}{dir 3 eq{-90 rotate show 90
+rotate}{show}ifelse}ifelse}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0
+N/Ry 0 N/V{}B/RV/v{/Ry X/Rx X V}B statusdict begin/product where{pop
+false[(Display)(NeXT)(LaserWriter 16/600)]{A length product length le{A
+length product exch 0 exch getinterval eq{pop true exit}if}{pop}ifelse}
+forall}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{
+BDot}imagemask grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat
+{BDot}imagemask grestore}}ifelse B/QV{gsave newpath transform round exch
+round exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0
+rlineto fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B
+/M{S p delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}
+B/g{0 M}B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p
+-3 w}B/n{p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{
+0 S rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
%%EndProcSet
%%BeginProcSet: texps.pro 0 0
Binary files octave-3.6.1/doc/refcard/refcard-legal.dvi and octave-3.6.2/doc/refcard/refcard-legal.dvi differ
Binary files octave-3.6.1/doc/refcard/refcard-legal.pdf and octave-3.6.2/doc/refcard/refcard-legal.pdf differ
diff -uNr octave-3.6.1/doc/refcard/refcard-legal.ps octave-3.6.2/doc/refcard/refcard-legal.ps
--- octave-3.6.1/doc/refcard/refcard-legal.ps 2012-02-22 15:03:10.000000000 -0500
+++ octave-3.6.2/doc/refcard/refcard-legal.ps 2012-05-31 11:42:07.000000000 -0400
@@ -1,7 +1,7 @@
%!PS-Adobe-2.0
-%%Creator: dvips(k) 5.98 Copyright 2009 Radical Eye Software
+%%Creator: dvips(k) 5.991 Copyright 2011 Radical Eye Software
%%Title: refcard-legal.dvi
-%%CreationDate: Wed Feb 22 15:03:10 2012
+%%CreationDate: Thu May 31 11:42:07 2012
%%Pages: 3
%%PageOrder: Ascend
%%Orientation: Landscape
@@ -13,7 +13,7 @@
%DVIPSCommandLine: dvips -T 14in,8.5in -o refcard-legal.ps
%+ refcard-legal.dvi
%DVIPSParameters: dpi=600
-%DVIPSSource: TeX output 2012.02.22:1503
+%DVIPSSource: TeX output 2012.05.31:1142
%%BeginProcSet: tex.pro 0 0
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -45,19 +45,21 @@
userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X
1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4
index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N
-/p{show}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 N/Ry 0 N/V{}B/RV/v{
-/Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT)
-(LaserWriter 16/600)]{A length product length le{A length product exch 0
-exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse
-end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask
-grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot}
-imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round
-exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto
-fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p
-delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M}
-B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p -3 w}B/n{
-p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S
-rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
+/dir 0 def/dyy{/dir 0 def}B/dyt{/dir 1 def}B/dty{/dir 2 def}B/dtt{/dir 3
+def}B/p{dir 2 eq{-90 rotate show 90 rotate}{dir 3 eq{-90 rotate show 90
+rotate}{show}ifelse}ifelse}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0
+N/Ry 0 N/V{}B/RV/v{/Ry X/Rx X V}B statusdict begin/product where{pop
+false[(Display)(NeXT)(LaserWriter 16/600)]{A length product length le{A
+length product exch 0 exch getinterval eq{pop true exit}if}{pop}ifelse}
+forall}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{
+BDot}imagemask grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat
+{BDot}imagemask grestore}}ifelse B/QV{gsave newpath transform round exch
+round exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0
+rlineto fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B
+/M{S p delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}
+B/g{0 M}B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p
+-3 w}B/n{p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{
+0 S rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
%%EndProcSet
%%BeginProcSet: texps.pro 0 0
Binary files octave-3.6.1/doc/refcard/refcard-letter.dvi and octave-3.6.2/doc/refcard/refcard-letter.dvi differ
Binary files octave-3.6.1/doc/refcard/refcard-letter.pdf and octave-3.6.2/doc/refcard/refcard-letter.pdf differ
diff -uNr octave-3.6.1/doc/refcard/refcard-letter.ps octave-3.6.2/doc/refcard/refcard-letter.ps
--- octave-3.6.1/doc/refcard/refcard-letter.ps 2012-02-22 15:03:10.000000000 -0500
+++ octave-3.6.2/doc/refcard/refcard-letter.ps 2012-05-31 11:42:07.000000000 -0400
@@ -1,7 +1,7 @@
%!PS-Adobe-2.0
-%%Creator: dvips(k) 5.98 Copyright 2009 Radical Eye Software
+%%Creator: dvips(k) 5.991 Copyright 2011 Radical Eye Software
%%Title: refcard-letter.dvi
-%%CreationDate: Wed Feb 22 15:03:10 2012
+%%CreationDate: Thu May 31 11:42:07 2012
%%Pages: 3
%%PageOrder: Ascend
%%Orientation: Landscape
@@ -13,7 +13,7 @@
%DVIPSCommandLine: dvips -T 11in,8.5in -o refcard-letter.ps
%+ refcard-letter.dvi
%DVIPSParameters: dpi=600
-%DVIPSSource: TeX output 2012.02.22:1503
+%DVIPSSource: TeX output 2012.05.31:1142
%%BeginProcSet: tex.pro 0 0
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -45,19 +45,21 @@
userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X
1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4
index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N
-/p{show}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 N/Ry 0 N/V{}B/RV/v{
-/Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT)
-(LaserWriter 16/600)]{A length product length le{A length product exch 0
-exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse
-end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask
-grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot}
-imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round
-exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto
-fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p
-delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M}
-B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p -3 w}B/n{
-p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S
-rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
+/dir 0 def/dyy{/dir 0 def}B/dyt{/dir 1 def}B/dty{/dir 2 def}B/dtt{/dir 3
+def}B/p{dir 2 eq{-90 rotate show 90 rotate}{dir 3 eq{-90 rotate show 90
+rotate}{show}ifelse}ifelse}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0
+N/Ry 0 N/V{}B/RV/v{/Ry X/Rx X V}B statusdict begin/product where{pop
+false[(Display)(NeXT)(LaserWriter 16/600)]{A length product length le{A
+length product exch 0 exch getinterval eq{pop true exit}if}{pop}ifelse}
+forall}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{
+BDot}imagemask grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat
+{BDot}imagemask grestore}}ifelse B/QV{gsave newpath transform round exch
+round exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0
+rlineto fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B
+/M{S p delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}
+B/g{0 M}B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p
+-3 w}B/n{p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{
+0 S rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
%%EndProcSet
%%BeginProcSet: texps.pro 0 0
diff -uNr octave-3.6.1/examples/Makefile.in octave-3.6.2/examples/Makefile.in
--- octave-3.6.1/examples/Makefile.in 2012-02-22 14:46:08.000000000 -0500
+++ octave-3.6.2/examples/Makefile.in 2012-05-31 11:24:27.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -1576,6 +1576,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build-aux/common.mk $(srcdir)/@polynomial/module.mk $(srcdir)/@FIRfilter/module.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1642,10 +1643,15 @@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff -uNr octave-3.6.1/INSTALL.OCTAVE octave-3.6.2/INSTALL.OCTAVE
--- octave-3.6.1/INSTALL.OCTAVE 2012-02-22 15:03:10.000000000 -0500
+++ octave-3.6.2/INSTALL.OCTAVE 2012-05-31 11:42:08.000000000 -0400
@@ -27,11 +27,14 @@
part of your system, or you may have to build some or all of them
yourself.
-1.1.1 Tips for Specific Systems
--------------------------------
+1.1.1 Obtaining the Depencies Automatically
+-------------------------------------------
-The names of pre-compiled packages vary by system and do not always
-match exactly the names listed above.
+On some systems you can obtain many of Octave's build dependencies
+automatically. The commands for doing this vary by system. Similarly,
+the names of pre-compiled packages vary by system and do not always
+match exactly the names listed in *note Build Tools:: and *note
+External Packages::.
You will usually need the development version of an external
dependency so that you get the libraries and header files for building
diff -uNr octave-3.6.1/libcruft/blas-xtra/cconv2.f octave-3.6.2/libcruft/blas-xtra/cconv2.f
--- octave-3.6.1/libcruft/blas-xtra/cconv2.f 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/libcruft/blas-xtra/cconv2.f 2012-05-30 21:43:28.000000000 -0400
@@ -70,7 +70,7 @@
do k = 1,na-nb+1
do j = 1,nb
do i = 1,mb
- call caxpy(ma-mb+1,b(i,j),a(mb+1-i,k+j-1),1,c(1,k),1)
+ call caxpy(ma-mb+1,b(i,j),a(mb+1-i,k+nb-j),1,c(1,k),1)
end do
end do
end do
diff -uNr octave-3.6.1/libcruft/blas-xtra/csconv2.f octave-3.6.2/libcruft/blas-xtra/csconv2.f
--- octave-3.6.1/libcruft/blas-xtra/csconv2.f 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/libcruft/blas-xtra/csconv2.f 2012-05-30 21:43:28.000000000 -0400
@@ -76,7 +76,7 @@
do j = 1,nb
do i = 1,mb
btmp = b(i,j)
- call caxpy(ma-mb+1,btmp,a(mb+1-i,k+j-1),1,c(1,k),1)
+ call caxpy(ma-mb+1,btmp,a(mb+1-i,k+nb-j),1,c(1,k),1)
end do
end do
end do
diff -uNr octave-3.6.1/libcruft/blas-xtra/dconv2.f octave-3.6.2/libcruft/blas-xtra/dconv2.f
--- octave-3.6.1/libcruft/blas-xtra/dconv2.f 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/libcruft/blas-xtra/dconv2.f 2012-05-30 21:43:28.000000000 -0400
@@ -70,7 +70,7 @@
do k = 1,na-nb+1
do j = 1,nb
do i = 1,mb
- call daxpy(ma-mb+1,b(i,j),a(mb+1-i,k+j-1),1,c(1,k),1)
+ call daxpy(ma-mb+1,b(i,j),a(mb+1-i,k+nb-j),1,c(1,k),1)
end do
end do
end do
diff -uNr octave-3.6.1/libcruft/blas-xtra/sconv2.f octave-3.6.2/libcruft/blas-xtra/sconv2.f
--- octave-3.6.1/libcruft/blas-xtra/sconv2.f 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/libcruft/blas-xtra/sconv2.f 2012-05-30 21:43:28.000000000 -0400
@@ -70,7 +70,7 @@
do k = 1,na-nb+1
do j = 1,nb
do i = 1,mb
- call saxpy(ma-mb+1,b(i,j),a(mb+1-i,k+j-1),1,c(1,k),1)
+ call saxpy(ma-mb+1,b(i,j),a(mb+1-i,k+nb-j),1,c(1,k),1)
end do
end do
end do
diff -uNr octave-3.6.1/libcruft/blas-xtra/zconv2.f octave-3.6.2/libcruft/blas-xtra/zconv2.f
--- octave-3.6.1/libcruft/blas-xtra/zconv2.f 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/libcruft/blas-xtra/zconv2.f 2012-05-30 21:43:28.000000000 -0400
@@ -70,7 +70,7 @@
do k = 1,na-nb+1
do j = 1,nb
do i = 1,mb
- call zaxpy(ma-mb+1,b(i,j),a(mb+1-i,k+j-1),1,c(1,k),1)
+ call zaxpy(ma-mb+1,b(i,j),a(mb+1-i,k+nb-j),1,c(1,k),1)
end do
end do
end do
diff -uNr octave-3.6.1/libcruft/blas-xtra/zdconv2.f octave-3.6.2/libcruft/blas-xtra/zdconv2.f
--- octave-3.6.1/libcruft/blas-xtra/zdconv2.f 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/libcruft/blas-xtra/zdconv2.f 2012-05-30 21:43:28.000000000 -0400
@@ -76,7 +76,7 @@
do j = 1,nb
do i = 1,mb
btmp = b(i,j)
- call zaxpy(ma-mb+1,btmp,a(mb+1-i,k+j-1),1,c(1,k),1)
+ call zaxpy(ma-mb+1,btmp,a(mb+1-i,k+nb-j),1,c(1,k),1)
end do
end do
end do
diff -uNr octave-3.6.1/libcruft/lapack-xtra/crsf2csf.f octave-3.6.2/libcruft/lapack-xtra/crsf2csf.f
--- octave-3.6.1/libcruft/lapack-xtra/crsf2csf.f 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/libcruft/lapack-xtra/crsf2csf.f 2012-05-30 21:43:28.000000000 -0400
@@ -25,6 +25,9 @@
real c(n-1),s(n-1)
real x,y,z
integer j
+ do j = 1,n-1
+ c(j) = 1
+ end do
j = 1
do while (j < n)
c apply previous rotations to rows
@@ -33,10 +36,9 @@
y = t(j+1,j)
if (y /= 0) then
c 2x2 block, form Givens rotation [c, i*s; i*s, c]
- x = t(j,j)
z = t(j,j+1)
c(j) = sqrt(z/(z-y))
- s(j) = sign(sqrt(-y/(z-y)),z)
+ s(j) = sqrt(y/(y-z))
c apply new rotation to t(j:j+1,j)
call crcrot1(2,t(j,j),c(j),s(j))
c apply all rotations to t(1:j+1,j+1)
@@ -45,10 +47,8 @@
call crcrot2(j+1,t(1,j),t(1,j+1),c(j),s(j))
c zero subdiagonal entry, skip next row
t(j+1,j) = 0
- c(j+1) = 1
j = j + 2
else
- c(j) = 1
j = j + 1
end if
end do
diff -uNr octave-3.6.1/libcruft/lapack-xtra/zrsf2csf.f octave-3.6.2/libcruft/lapack-xtra/zrsf2csf.f
--- octave-3.6.1/libcruft/lapack-xtra/zrsf2csf.f 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/libcruft/lapack-xtra/zrsf2csf.f 2012-05-30 21:43:28.000000000 -0400
@@ -25,6 +25,9 @@
double precision c(n-1),s(n-1)
double precision x,y,z
integer j
+ do j = 1,n-1
+ c(j) = 1
+ end do
j = 1
do while (j < n)
c apply previous rotations to rows
@@ -33,10 +36,9 @@
y = t(j+1,j)
if (y /= 0) then
c 2x2 block, form Givens rotation [c, i*s; i*s, c]
- x = t(j,j)
z = t(j,j+1)
c(j) = sqrt(z/(z-y))
- s(j) = sign(sqrt(-y/(z-y)),z)
+ s(j) = sqrt(y/(y-z))
c apply new rotation to t(j:j+1,j)
call zrcrot1(2,t(j,j),c(j),s(j))
c apply all rotations to t(1:j+1,j+1)
@@ -45,10 +47,8 @@
call zrcrot2(j+1,t(1,j),t(1,j+1),c(j),s(j))
c zero subdiagonal entry, skip next row
t(j+1,j) = 0
- c(j+1) = 1
j = j + 2
else
- c(j) = 1
j = j + 1
end if
end do
diff -uNr octave-3.6.1/libcruft/Makefile.am octave-3.6.2/libcruft/Makefile.am
--- octave-3.6.1/libcruft/Makefile.am 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/libcruft/Makefile.am 2012-05-30 21:43:28.000000000 -0400
@@ -20,7 +20,10 @@
include $(top_srcdir)/build-aux/common.mk
-AM_CPPFLAGS = @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu
+## Search local directories before those specified by the user.
+AM_CPPFLAGS = \
+ -I../libgnu -I$(top_srcdir)/libgnu \
+ @CPPFLAGS@
AUTOMAKE_OPTIONS = subdir-objects
@@ -44,7 +47,7 @@
# Increment these as needed and according to the rules in the libtool
# manual:
libcruft_current = 1
-libcruft_revision = 0
+libcruft_revision = 1
libcruft_age = 0
libcruft_version_info = $(libcruft_current):$(libcruft_revision):$(libcruft_age)
diff -uNr octave-3.6.1/libcruft/Makefile.in octave-3.6.2/libcruft/Makefile.in
--- octave-3.6.1/libcruft/Makefile.in 2012-02-22 14:46:09.000000000 -0500
+++ octave-3.6.2/libcruft/Makefile.in 2012-05-31 11:24:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -195,6 +195,12 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(octlibdir)" \
"$(DESTDIR)$(octincludedir)"
LTLIBRARIES = $(noinst_LTLIBRARIES) $(octlib_LTLIBRARIES)
@@ -1893,7 +1899,10 @@
# The separator used for elements of the LD_PRELOAD variable (might be
# a space, so protect with $(null))
null =
-AM_CPPFLAGS = @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu
+AM_CPPFLAGS = \
+ -I../libgnu -I$(top_srcdir)/libgnu \
+ @CPPFLAGS@
+
AUTOMAKE_OPTIONS = subdir-objects
octlib_LTLIBRARIES = libcruft.la
libcruft_la_SOURCES = amos/cacai.f amos/cacon.f amos/cbesh.f \
@@ -2007,7 +2016,7 @@
# Increment these as needed and according to the rules in the libtool
# manual:
libcruft_current = 1
-libcruft_revision = 0
+libcruft_revision = 1
libcruft_age = 0
libcruft_version_info = $(libcruft_current):$(libcruft_revision):$(libcruft_age)
libcruft_la_LDFLAGS = \
@@ -2100,6 +2109,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build-aux/common.mk $(srcdir)/link-deps.mk $(srcdir)/amos/module.mk $(srcdir)/blas-xtra/module.mk $(srcdir)/daspk/module.mk $(srcdir)/dasrt/module.mk $(srcdir)/dassl/module.mk $(srcdir)/fftpack/module.mk $(srcdir)/lapack-xtra/module.mk $(srcdir)/misc/module.mk $(srcdir)/odepack/module.mk $(srcdir)/ordered-qz/module.mk $(srcdir)/quadpack/module.mk $(srcdir)/ranlib/module.mk $(srcdir)/slatec-err/module.mk $(srcdir)/slatec-fn/module.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2819,7 +2829,7 @@
slatec-fn/$(DEPDIR)/$(am__dirstamp)
slatec-fn/libcruft_la-xbetai.lo: slatec-fn/$(am__dirstamp) \
slatec-fn/$(DEPDIR)/$(am__dirstamp)
-libcruft.la: $(libcruft_la_OBJECTS) $(libcruft_la_DEPENDENCIES)
+libcruft.la: $(libcruft_la_OBJECTS) $(libcruft_la_DEPENDENCIES) $(EXTRA_libcruft_la_DEPENDENCIES)
$(libcruft_la_LINK) -rpath $(octlibdir) $(libcruft_la_OBJECTS) $(libcruft_la_LIBADD) $(LIBS)
ranlib/$(am__dirstamp):
@$(MKDIR_P) ranlib
@@ -2897,7 +2907,7 @@
ranlib/$(DEPDIR)/$(am__dirstamp)
ranlib/wrap.lo: ranlib/$(am__dirstamp) \
ranlib/$(DEPDIR)/$(am__dirstamp)
-libranlib.la: $(libranlib_la_OBJECTS) $(libranlib_la_DEPENDENCIES)
+libranlib.la: $(libranlib_la_OBJECTS) $(libranlib_la_DEPENDENCIES) $(EXTRA_libranlib_la_DEPENDENCIES)
$(F77LINK) $(libranlib_la_OBJECTS) $(libranlib_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -4575,9 +4585,7 @@
@$(NORMAL_UNINSTALL)
@list='$(octinclude_HEADERS)'; test -n "$(octincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(octincludedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(octincludedir)" && rm -f $$files
+ dir='$(DESTDIR)$(octincludedir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -4678,10 +4686,15 @@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff -uNr octave-3.6.1/libgnu/Makefile.in octave-3.6.2/libgnu/Makefile.in
--- octave-3.6.1/libgnu/Makefile.in 2012-02-22 14:46:09.000000000 -0500
+++ octave-3.6.2/libgnu/Makefile.in 2012-05-31 11:24:28.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -1627,6 +1627,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(srcdir)/gnulib.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1648,7 +1649,7 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES)
+libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES) $(EXTRA_libgnu_la_DEPENDENCIES)
$(libgnu_la_LINK) $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -2026,10 +2027,15 @@
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
diff -uNr octave-3.6.1/liboctave/Array.cc octave-3.6.2/liboctave/Array.cc
--- octave-3.6.1/liboctave/Array.cc 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/liboctave/Array.cc 2012-05-30 21:43:28.000000000 -0400
@@ -1164,16 +1164,21 @@
Array::assign (const idx_vector& i, const idx_vector& j,
const Array& rhs, const T& rfv)
{
+ bool initial_dims_all_zero = dimensions.all_zero ();
+
// Get RHS extents, discarding singletons.
dim_vector rhdv = rhs.dims ();
+
// Get LHS extents, allowing Fortran indexing in the second dim.
dim_vector dv = dimensions.redim (2);
+
// Check for out-of-bounds and form resizing dimensions.
dim_vector rdv;
+
// In the special when all dimensions are zero, colons are allowed
// to inquire the shape of RHS. The rules are more obscure, so we
// solve that elsewhere.
- if (dv.all_zero ())
+ if (initial_dims_all_zero)
rdv = zero_dims_inquire (i, j, rhdv);
else
{
@@ -1267,6 +1272,8 @@
assign (ia(0), ia(1), rhs, rfv);
else if (ial > 0)
{
+ bool initial_dims_all_zero = dimensions.all_zero ();
+
// Get RHS extents, discarding singletons.
dim_vector rhdv = rhs.dims ();
@@ -1279,7 +1286,7 @@
// In the special when all dimensions are zero, colons are
// allowed to inquire the shape of RHS. The rules are more
// obscure, so we solve that elsewhere.
- if (dv.all_zero ())
+ if (initial_dims_all_zero)
rdv = zero_dims_inquire (ia, rhdv);
else
{
@@ -2253,6 +2260,7 @@
dv(dim) = std::min (nn, ns);
dv.chop_trailing_singletons ();
+ dim = std::min (dv.length (), dim);
Array m (dv);
diff -uNr octave-3.6.1/liboctave/CColVector.cc octave-3.6.2/liboctave/CColVector.cc
--- octave-3.6.1/liboctave/CColVector.cc 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/liboctave/CColVector.cc 2012-05-30 21:43:28.000000000 -0400
@@ -346,13 +346,19 @@
if (nr != 0)
{
- Complex *y = retval.fortran_vec ();
+ if (nc == 0)
+ retval.fill (0.0);
+ else
+ {
+ Complex *y = retval.fortran_vec ();
- F77_XFCN (zgemv, ZGEMV, (F77_CONST_CHAR_ARG2 ("N", 1),
- nr, nc, 1.0, m.data (), nr,
- a.data (), 1, 0.0, y, 1
- F77_CHAR_ARG_LEN (1)));
+ F77_XFCN (zgemv, ZGEMV, (F77_CONST_CHAR_ARG2 ("N", 1),
+ nr, nc, 1.0, m.data (), nr,
+ a.data (), 1, 0.0, y, 1
+ F77_CHAR_ARG_LEN (1)));
+ }
}
+
}
return retval;
diff -uNr octave-3.6.1/liboctave/config-ops.sh octave-3.6.2/liboctave/config-ops.sh
--- octave-3.6.1/liboctave/config-ops.sh 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/liboctave/config-ops.sh 2012-05-30 21:43:28.000000000 -0400
@@ -34,7 +34,7 @@
case "$src_type" in
inc | all)
VX_INC=$($AWK -f $mk_ops prefix=vx list_h_files=1 $liboctave_dir/vx-ops)
- echo "VX_OP_INC = $(echo $VX_INC)" > $liboctave_dir/vx-op-inc.mk-t
+ echo "VX_OP_INC = $VX_INC" > $liboctave_dir/vx-op-inc.mk-t
$move_if_change $liboctave_dir/vx-op-inc.mk-t $liboctave_dir/vx-op-inc.mk
;;
esac
@@ -46,7 +46,7 @@
case "$src_type" in
src | all)
VX_SRC=$($AWK -f $mk_ops prefix=vx list_cc_files=1 $liboctave_dir/vx-ops)
- echo "VX_OP_SRC = $(echo $VX_SRC)" > $liboctave_dir/vx-op-src.mk-t
+ echo "VX_OP_SRC = $VX_SRC" > $liboctave_dir/vx-op-src.mk-t
$move_if_change $liboctave_dir/vx-op-src.mk-t $liboctave_dir/vx-op-src.mk
;;
esac
@@ -58,7 +58,7 @@
case "$src_type" in
inc | all)
MX_INC=$($AWK -f $mk_ops prefix=mx list_h_files=1 $liboctave_dir/mx-ops)
- echo "MX_OP_INC = $(echo $MX_INC)" > $liboctave_dir/mx-op-inc.mk-t
+ echo "MX_OP_INC = $MX_INC" > $liboctave_dir/mx-op-inc.mk-t
$move_if_change $liboctave_dir/mx-op-inc.mk-t $liboctave_dir/mx-op-inc.mk
;;
esac
@@ -70,7 +70,7 @@
case "$src_type" in
src | all)
MX_SRC=$($AWK -f $mk_ops prefix=mx list_cc_files=1 $liboctave_dir/mx-ops)
- echo "MX_OP_SRC = $(echo $MX_SRC)" > $liboctave_dir/mx-op-src.mk-t
+ echo "MX_OP_SRC = $MX_SRC" > $liboctave_dir/mx-op-src.mk-t
$move_if_change $liboctave_dir/mx-op-src.mk-t $liboctave_dir/mx-op-src.mk
;;
esac
@@ -82,7 +82,7 @@
case "$src_type" in
inc | all)
SMX_INC=$($AWK -f $sparse_mk_ops prefix=smx list_h_files=1 $liboctave_dir/sparse-mx-ops)
- echo "SMX_OP_INC = $(echo $SMX_INC)" > $liboctave_dir/smx-op-inc.mk-t
+ echo "SMX_OP_INC = $SMX_INC" > $liboctave_dir/smx-op-inc.mk-t
$move_if_change $liboctave_dir/smx-op-inc.mk-t $liboctave_dir/smx-op-inc.mk
;;
esac
@@ -94,7 +94,7 @@
case "$src_type" in
src | all)
SMX_SRC=$($AWK -f $sparse_mk_ops prefix=smx list_cc_files=1 $liboctave_dir/sparse-mx-ops)
- echo "SMX_OP_SRC = $(echo $SMX_SRC)" > $liboctave_dir/smx-op-src.mk-t
+ echo "SMX_OP_SRC = $SMX_SRC" > $liboctave_dir/smx-op-src.mk-t
$move_if_change $liboctave_dir/smx-op-src.mk-t $liboctave_dir/smx-op-src.mk
;;
esac
diff -uNr octave-3.6.1/liboctave/dColVector.cc octave-3.6.2/liboctave/dColVector.cc
--- octave-3.6.1/liboctave/dColVector.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/liboctave/dColVector.cc 2012-05-30 21:43:28.000000000 -0400
@@ -212,12 +212,17 @@
if (nr != 0)
{
- double *y = retval.fortran_vec ();
+ if (nc == 0)
+ retval.fill (0.0);
+ else
+ {
+ double *y = retval.fortran_vec ();
- F77_XFCN (dgemv, DGEMV, (F77_CONST_CHAR_ARG2 ("N", 1),
- nr, nc, 1.0, m.data (), nr,
- a.data (), 1, 0.0, y, 1
- F77_CHAR_ARG_LEN (1)));
+ F77_XFCN (dgemv, DGEMV, (F77_CONST_CHAR_ARG2 ("N", 1),
+ nr, nc, 1.0, m.data (), nr,
+ a.data (), 1, 0.0, y, 1
+ F77_CHAR_ARG_LEN (1)));
+ }
}
}
diff -uNr octave-3.6.1/liboctave/DiagArray2.cc octave-3.6.2/liboctave/DiagArray2.cc
--- octave-3.6.1/liboctave/DiagArray2.cc 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/liboctave/DiagArray2.cc 2012-05-30 21:43:28.000000000 -0400
@@ -83,18 +83,6 @@
// A two-dimensional array with diagonal elements only.
template
-T
-DiagArray2::checkelem (octave_idx_type r, octave_idx_type c) const
-{
- if (r < 0 || r >= dim1 ())
- gripe_index_out_of_range (2, 1, r+1, dim1 ());
- if (c < 0 || c >= dim2 ())
- gripe_index_out_of_range (2, 2, c+1, dim2 ());
-
- return elem (r, c);
-}
-
-template
void
DiagArray2::resize (octave_idx_type r, octave_idx_type c,
const T& rfv)
@@ -123,3 +111,24 @@
return result;
}
+
+template
+bool
+DiagArray2::check_idx (octave_idx_type r, octave_idx_type c) const
+{
+ bool ok = true;
+
+ if (r < 0 || r >= dim1 ())
+ {
+ gripe_index_out_of_range (2, 1, r+1, dim1 ());
+ ok = false;
+ }
+
+ if (c < 0 || c >= dim2 ())
+ {
+ gripe_index_out_of_range (2, 2, c+1, dim2 ());
+ ok = false;
+ }
+
+ return ok;
+}
diff -uNr octave-3.6.1/liboctave/DiagArray2.h octave-3.6.2/liboctave/DiagArray2.h
--- octave-3.6.1/liboctave/DiagArray2.h 2012-02-22 14:34:53.000000000 -0500
+++ octave-3.6.2/liboctave/DiagArray2.h 2012-05-30 21:43:28.000000000 -0400
@@ -119,11 +119,29 @@
T& dgelem (octave_idx_type i)
{ return Array::elem (i); }
- T checkelem (octave_idx_type r, octave_idx_type c) const;
+ T checkelem (octave_idx_type r, octave_idx_type c) const
+ {
+ return check_idx (r, c) ? elem (r, c) : T (0);
+ }
T operator () (octave_idx_type r, octave_idx_type c) const
{
#if defined (BOUNDS_CHECKING)
+ checkelem (r, c);
+#else
+ return elem (r, c);
+#endif
+ }
+
+ T& checkelem (octave_idx_type r, octave_idx_type c)
+ {
+ static T zero (0);
+ return check_idx (r, c) ? elem (r, c) : zero;
+ }
+
+ T& operator () (octave_idx_type r, octave_idx_type c)
+ {
+#if defined (BOUNDS_CHECKING)
return checkelem (r, c);
#else
return elem (r, c);
@@ -159,6 +177,10 @@
void print_info (std::ostream& os, const std::string& prefix) const
{ Array::print_info (os, prefix); }
+
+private:
+
+ bool check_idx (octave_idx_type r, octave_idx_type c) const;
};
#endif
diff -uNr octave-3.6.1/liboctave/dim-vector.cc octave-3.6.2/liboctave/dim-vector.cc
--- octave-3.6.1/liboctave/dim-vector.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/liboctave/dim-vector.cc 2012-05-30 21:43:28.000000000 -0400
@@ -272,16 +272,11 @@
{
dim_vector retval = alloc (n);
- int pad = 0;
for (int i = 0; i < n_dims; i++)
- {
- retval.rep[i] = rep[i];
- if (rep[i] != 0)
- pad = 1;
- }
+ retval.rep[i] = rep[i];
for (int i = n_dims; i < n; i++)
- retval.rep[i] = pad;
+ retval.rep[i] = 1;
return retval;
}
diff -uNr octave-3.6.1/liboctave/dim-vector.h octave-3.6.2/liboctave/dim-vector.h
--- octave-3.6.1/liboctave/dim-vector.h 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/liboctave/dim-vector.h 2012-05-30 21:43:28.000000000 -0400
@@ -381,8 +381,7 @@
// Force certain dimensionality, preserving numel (). Missing
// dimensions are set to 1, redundant are folded into the trailing
// one. If n = 1, the result is 2d and the second dim is 1
- // (dim_vectors are always at least 2D). If the original dimensions
- // were all zero, the padding value is zero.
+ // (dim_vectors are always at least 2D).
dim_vector redim (int n) const;
diff -uNr octave-3.6.1/liboctave/fCColVector.cc octave-3.6.2/liboctave/fCColVector.cc
--- octave-3.6.1/liboctave/fCColVector.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/liboctave/fCColVector.cc 2012-05-30 21:43:28.000000000 -0400
@@ -346,12 +346,17 @@
if (nr != 0)
{
- FloatComplex *y = retval.fortran_vec ();
+ if (nc == 0)
+ retval.fill (0.0);
+ else
+ {
+ FloatComplex *y = retval.fortran_vec ();
- F77_XFCN (cgemv, CGEMV, (F77_CONST_CHAR_ARG2 ("N", 1),
- nr, nc, 1.0f, m.data (), nr,
- a.data (), 1, 0.0f, y, 1
- F77_CHAR_ARG_LEN (1)));
+ F77_XFCN (cgemv, CGEMV, (F77_CONST_CHAR_ARG2 ("N", 1),
+ nr, nc, 1.0f, m.data (), nr,
+ a.data (), 1, 0.0f, y, 1
+ F77_CHAR_ARG_LEN (1)));
+ }
}
}
diff -uNr octave-3.6.1/liboctave/fColVector.cc octave-3.6.2/liboctave/fColVector.cc
--- octave-3.6.1/liboctave/fColVector.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/liboctave/fColVector.cc 2012-05-30 21:43:28.000000000 -0400
@@ -211,12 +211,17 @@
if (nr != 0)
{
- float *y = retval.fortran_vec ();
+ if (nc == 0)
+ retval.fill (0.0);
+ else
+ {
+ float *y = retval.fortran_vec ();
- F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 ("N", 1),
- nr, nc, 1.0f, m.data (), nr,
- a.data (), 1, 0.0f, y, 1
- F77_CHAR_ARG_LEN (1)));
+ F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 ("N", 1),
+ nr, nc, 1.0f, m.data (), nr,
+ a.data (), 1, 0.0f, y, 1
+ F77_CHAR_ARG_LEN (1)));
+ }
}
}
diff -uNr octave-3.6.1/liboctave/Makefile.am octave-3.6.2/liboctave/Makefile.am
--- octave-3.6.1/liboctave/Makefile.am 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/liboctave/Makefile.am 2012-05-30 21:43:28.000000000 -0400
@@ -20,9 +20,11 @@
include $(top_srcdir)/build-aux/common.mk
+## Search local directories before those specified by the user.
AM_CPPFLAGS = \
- @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu \
- -I$(top_srcdir)/libcruft/misc
+ -I../libgnu -I$(top_srcdir)/libgnu \
+ -I$(top_srcdir)/libcruft/misc \
+ @CPPFLAGS@
EXTRA_DIST = \
config-ops.sh \
@@ -520,9 +522,9 @@
# Increment these as needed and according to the rules in the libtool
# manual:
-liboctave_current = 1
-liboctave_revision = 1
-liboctave_age = 0
+liboctave_current = 2
+liboctave_revision = 0
+liboctave_age = 1
liboctave_version_info = $(liboctave_current):$(liboctave_revision):$(liboctave_age)
diff -uNr octave-3.6.1/liboctave/Makefile.in octave-3.6.2/liboctave/Makefile.in
--- octave-3.6.1/liboctave/Makefile.in 2012-02-22 14:46:11.000000000 -0500
+++ octave-3.6.2/liboctave/Makefile.in 2012-05-31 11:24:29.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -190,6 +190,12 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(octlibdir)" \
"$(DESTDIR)$(octincludedir)" "$(DESTDIR)$(octincludedir)"
LTLIBRARIES = $(octlib_LTLIBRARIES)
@@ -1904,8 +1910,9 @@
# a space, so protect with $(null))
null =
AM_CPPFLAGS = \
- @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu \
- -I$(top_srcdir)/libcruft/misc
+ -I../libgnu -I$(top_srcdir)/libgnu \
+ -I$(top_srcdir)/libcruft/misc \
+ @CPPFLAGS@
EXTRA_DIST = \
config-ops.sh \
@@ -2592,9 +2599,9 @@
# Increment these as needed and according to the rules in the libtool
# manual:
-liboctave_current = 1
-liboctave_revision = 1
-liboctave_age = 0
+liboctave_current = 2
+liboctave_revision = 0
+liboctave_age = 1
liboctave_version_info = $(liboctave_current):$(liboctave_revision):$(liboctave_age)
liboctave_la_LDFLAGS = \
-version-info $(liboctave_version_info) \
@@ -2638,6 +2645,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build-aux/common.mk $(srcdir)/vx-op-inc.mk $(srcdir)/mx-op-inc.mk $(srcdir)/smx-op-inc.mk $(srcdir)/vx-op-src.mk $(srcdir)/mx-op-src.mk $(srcdir)/smx-op-src.mk $(srcdir)/link-deps.mk $(srcdir)/../libcruft/link-deps.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2678,7 +2686,7 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-liboctave.la: $(liboctave_la_OBJECTS) $(liboctave_la_DEPENDENCIES)
+liboctave.la: $(liboctave_la_OBJECTS) $(liboctave_la_DEPENDENCIES) $(EXTRA_liboctave_la_DEPENDENCIES)
$(liboctave_la_LINK) -rpath $(octlibdir) $(liboctave_la_OBJECTS) $(liboctave_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -6976,9 +6984,7 @@
@$(NORMAL_UNINSTALL)
@list='$(nodist_octinclude_HEADERS)'; test -n "$(octincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(octincludedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(octincludedir)" && rm -f $$files
+ dir='$(DESTDIR)$(octincludedir)'; $(am__uninstall_files_from_dir)
install-octincludeHEADERS: $(octinclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(octincludedir)" || $(MKDIR_P) "$(DESTDIR)$(octincludedir)"
@@ -6996,9 +7002,7 @@
@$(NORMAL_UNINSTALL)
@list='$(octinclude_HEADERS)'; test -n "$(octincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(octincludedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(octincludedir)" && rm -f $$files
+ dir='$(DESTDIR)$(octincludedir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -7101,10 +7105,15 @@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff -uNr octave-3.6.1/liboctave/mk-ops.awk octave-3.6.2/liboctave/mk-ops.awk
--- octave-3.6.1/liboctave/mk-ops.awk 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/liboctave/mk-ops.awk 2012-05-30 21:43:28.000000000 -0400
@@ -93,13 +93,13 @@
if (list_cc_files)
{
- print cc_file;
+ printf (" %s", cc_file);
next;
}
if (list_h_files)
{
- print h_file;
+ printf (" %s", h_file);
next;
}
diff -uNr octave-3.6.1/liboctave/mx-op-inc.mk octave-3.6.2/liboctave/mx-op-inc.mk
--- octave-3.6.1/liboctave/mx-op-inc.mk 2012-02-22 14:41:54.000000000 -0500
+++ octave-3.6.2/liboctave/mx-op-inc.mk 2012-05-31 11:22:58.000000000 -0400
@@ -1 +1 @@
-MX_OP_INC = mx-cdm-dm.h mx-dm-cdm.h mx-cs-dm.h mx-cs-m.h mx-cs-nda.h mx-cdm-cm.h mx-cdm-m.h mx-cdm-s.h mx-cm-cdm.h mx-cm-dm.h mx-cm-m.h mx-cnda-nda.h mx-cm-s.h mx-cnda-s.h mx-dm-cs.h mx-dm-cm.h mx-m-cs.h mx-nda-cs.h mx-m-cdm.h mx-m-cm.h mx-nda-cnda.h mx-s-cdm.h mx-s-cm.h mx-s-cnda.h mx-dm-m.h mx-m-dm.h mx-fcdm-fdm.h mx-fdm-fcdm.h mx-fcs-fdm.h mx-fcs-fm.h mx-fcs-fnda.h mx-fcdm-fcm.h mx-fcdm-fm.h mx-fcdm-fs.h mx-fcm-fcdm.h mx-fcm-fdm.h mx-fcm-fm.h mx-fcnda-fnda.h mx-fcm-fs.h mx-fcnda-fs.h mx-fdm-fcs.h mx-fdm-fcm.h mx-fm-fcs.h mx-fnda-fcs.h mx-fm-fcdm.h mx-fm-fcm.h mx-fnda-fcnda.h mx-fs-fcdm.h mx-fs-fcm.h mx-fs-fcnda.h mx-fdm-fm.h mx-fm-fdm.h mx-pm-m.h mx-m-pm.h mx-pm-cm.h mx-cm-pm.h mx-pm-fm.h mx-fm-pm.h mx-pm-fcm.h mx-fcm-pm.h mx-s-i8nda.h mx-i8nda-s.h mx-s-ui8nda.h mx-ui8nda-s.h mx-s-i16nda.h mx-i16nda-s.h mx-s-ui16nda.h mx-ui16nda-s.h mx-s-i32nda.h mx-i32nda-s.h mx-s-ui32nda.h mx-ui32nda-s.h mx-s-i64nda.h mx-i64nda-s.h mx-s-ui64nda.h mx-ui64nda-s.h mx-fs-i8nda.h mx-i8nda-fs.h mx-fs-ui8nda.h mx-ui8nda-fs.h mx-fs-i16nda.h mx-i16nda-fs.h mx-fs-ui16nda.h mx-ui16nda-fs.h mx-fs-i32nda.h mx-i32nda-fs.h mx-fs-ui32nda.h mx-ui32nda-fs.h mx-fs-i64nda.h mx-i64nda-fs.h mx-fs-ui64nda.h mx-ui64nda-fs.h mx-nda-i8.h mx-i8-nda.h mx-nda-ui8.h mx-ui8-nda.h mx-nda-i16.h mx-i16-nda.h mx-nda-ui16.h mx-ui16-nda.h mx-nda-i32.h mx-i32-nda.h mx-nda-ui32.h mx-ui32-nda.h mx-nda-i64.h mx-i64-nda.h mx-nda-ui64.h mx-ui64-nda.h mx-fnda-i8.h mx-i8-fnda.h mx-fnda-ui8.h mx-ui8-fnda.h mx-fnda-i16.h mx-i16-fnda.h mx-fnda-ui16.h mx-ui16-fnda.h mx-fnda-i32.h mx-i32-fnda.h mx-fnda-ui32.h mx-ui32-fnda.h mx-fnda-i64.h mx-i64-fnda.h mx-fnda-ui64.h mx-ui64-fnda.h mx-nda-i8nda.h mx-i8nda-nda.h mx-nda-ui8nda.h mx-ui8nda-nda.h mx-nda-i16nda.h mx-i16nda-nda.h mx-nda-ui16nda.h mx-ui16nda-nda.h mx-nda-i32nda.h mx-i32nda-nda.h mx-nda-ui32nda.h mx-ui32nda-nda.h mx-nda-i64nda.h mx-i64nda-nda.h mx-nda-ui64nda.h mx-ui64nda-nda.h mx-fnda-i8nda.h mx-i8nda-fnda.h mx-fnda-ui8nda.h mx-ui8nda-fnda.h mx-fnda-i16nda.h mx-i16nda-fnda.h mx-fnda-ui16nda.h mx-ui16nda-fnda.h mx-fnda-i32nda.h mx-i32nda-fnda.h mx-fnda-ui32nda.h mx-ui32nda-fnda.h mx-fnda-i64nda.h mx-i64nda-fnda.h mx-fnda-ui64nda.h mx-ui64nda-fnda.h mx-i8nda-ui8.h mx-i8nda-i16.h mx-i8nda-ui16.h mx-i8nda-i32.h mx-i8nda-ui32.h mx-i8nda-i64.h mx-i8nda-ui64.h mx-i16nda-i8.h mx-i16nda-ui8.h mx-i16nda-ui16.h mx-i16nda-i32.h mx-i16nda-ui32.h mx-i16nda-i64.h mx-i16nda-ui64.h mx-i32nda-i8.h mx-i32nda-ui8.h mx-i32nda-i16.h mx-i32nda-ui16.h mx-i32nda-ui32.h mx-i32nda-i64.h mx-i32nda-ui64.h mx-i64nda-i8.h mx-i64nda-ui8.h mx-i64nda-i16.h mx-i64nda-ui16.h mx-i64nda-i32.h mx-i64nda-ui32.h mx-i64nda-ui64.h mx-ui8nda-i8.h mx-ui8nda-i16.h mx-ui8nda-ui16.h mx-ui8nda-i32.h mx-ui8nda-ui32.h mx-ui8nda-i64.h mx-ui8nda-ui64.h mx-ui16nda-i8.h mx-ui16nda-ui8.h mx-ui16nda-i16.h mx-ui16nda-i32.h mx-ui16nda-ui32.h mx-ui16nda-i64.h mx-ui16nda-ui64.h mx-ui32nda-i8.h mx-ui32nda-ui8.h mx-ui32nda-i16.h mx-ui32nda-ui16.h mx-ui32nda-i32.h mx-ui32nda-i64.h mx-ui32nda-ui64.h mx-ui64nda-i8.h mx-ui64nda-ui8.h mx-ui64nda-i16.h mx-ui64nda-ui16.h mx-ui64nda-i32.h mx-ui64nda-ui32.h mx-ui64nda-i64.h mx-i8-ui8nda.h mx-i8-i16nda.h mx-i8-ui16nda.h mx-i8-i32nda.h mx-i8-ui32nda.h mx-i8-i64nda.h mx-i8-ui64nda.h mx-i16-i8nda.h mx-i16-ui8nda.h mx-i16-ui16nda.h mx-i16-i32nda.h mx-i16-ui32nda.h mx-i16-i64nda.h mx-i16-ui64nda.h mx-i32-i8nda.h mx-i32-ui8nda.h mx-i32-i16nda.h mx-i32-ui16nda.h mx-i32-ui32nda.h mx-i32-i64nda.h mx-i32-ui64nda.h mx-i64-i8nda.h mx-i64-ui8nda.h mx-i64-i16nda.h mx-i64-ui16nda.h mx-i64-i32nda.h mx-i64-ui32nda.h mx-i64-ui64nda.h mx-ui8-i8nda.h mx-ui8-i16nda.h mx-ui8-ui16nda.h mx-ui8-i32nda.h mx-ui8-ui32nda.h mx-ui8-i64nda.h mx-ui8-ui64nda.h mx-ui16-i8nda.h mx-ui16-ui8nda.h mx-ui16-i16nda.h mx-ui16-i32nda.h mx-ui16-ui32nda.h mx-ui16-i64nda.h mx-ui16-ui64nda.h mx-ui32-i8nda.h mx-ui32-ui8nda.h mx-ui32-i16nda.h mx-ui32-ui16nda.h mx-ui32-i32nda.h mx-ui32-i64nda.h mx-ui32-ui64nda.h mx-ui64-i8nda.h mx-ui64-ui8nda.h mx-ui64-i16nda.h mx-ui64-ui16nda.h mx-ui64-i32nda.h mx-ui64-ui32nda.h mx-ui64-i64nda.h mx-i8nda-ui8nda.h mx-i8nda-i16nda.h mx-i8nda-ui16nda.h mx-i8nda-i32nda.h mx-i8nda-ui32nda.h mx-i8nda-i64nda.h mx-i8nda-ui64nda.h mx-i16nda-i8nda.h mx-i16nda-ui8nda.h mx-i16nda-ui16nda.h mx-i16nda-i32nda.h mx-i16nda-ui32nda.h mx-i16nda-i64nda.h mx-i16nda-ui64nda.h mx-i32nda-i8nda.h mx-i32nda-ui8nda.h mx-i32nda-i16nda.h mx-i32nda-ui16nda.h mx-i32nda-ui32nda.h mx-i32nda-i64nda.h mx-i32nda-ui64nda.h mx-i64nda-i8nda.h mx-i64nda-ui8nda.h mx-i64nda-i16nda.h mx-i64nda-ui16nda.h mx-i64nda-i32nda.h mx-i64nda-ui32nda.h mx-i64nda-ui64nda.h mx-ui8nda-i8nda.h mx-ui8nda-i16nda.h mx-ui8nda-ui16nda.h mx-ui8nda-i32nda.h mx-ui8nda-ui32nda.h mx-ui8nda-i64nda.h mx-ui8nda-ui64nda.h mx-ui16nda-i8nda.h mx-ui16nda-ui8nda.h mx-ui16nda-i16nda.h mx-ui16nda-i32nda.h mx-ui16nda-ui32nda.h mx-ui16nda-i64nda.h mx-ui16nda-ui64nda.h mx-ui32nda-i8nda.h mx-ui32nda-ui8nda.h mx-ui32nda-i16nda.h mx-ui32nda-ui16nda.h mx-ui32nda-i32nda.h mx-ui32nda-i64nda.h mx-ui32nda-ui64nda.h mx-ui64nda-i8nda.h mx-ui64nda-ui8nda.h mx-ui64nda-i16nda.h mx-ui64nda-ui16nda.h mx-ui64nda-i32nda.h mx-ui64nda-ui32nda.h mx-ui64nda-i64nda.h
+MX_OP_INC = mx-cdm-dm.h mx-dm-cdm.h mx-cs-dm.h mx-cs-m.h mx-cs-nda.h mx-cdm-cm.h mx-cdm-m.h mx-cdm-s.h mx-cm-cdm.h mx-cm-dm.h mx-cm-m.h mx-cnda-nda.h mx-cm-s.h mx-cnda-s.h mx-dm-cs.h mx-dm-cm.h mx-m-cs.h mx-nda-cs.h mx-m-cdm.h mx-m-cm.h mx-nda-cnda.h mx-s-cdm.h mx-s-cm.h mx-s-cnda.h mx-dm-m.h mx-m-dm.h mx-fcdm-fdm.h mx-fdm-fcdm.h mx-fcs-fdm.h mx-fcs-fm.h mx-fcs-fnda.h mx-fcdm-fcm.h mx-fcdm-fm.h mx-fcdm-fs.h mx-fcm-fcdm.h mx-fcm-fdm.h mx-fcm-fm.h mx-fcnda-fnda.h mx-fcm-fs.h mx-fcnda-fs.h mx-fdm-fcs.h mx-fdm-fcm.h mx-fm-fcs.h mx-fnda-fcs.h mx-fm-fcdm.h mx-fm-fcm.h mx-fnda-fcnda.h mx-fs-fcdm.h mx-fs-fcm.h mx-fs-fcnda.h mx-fdm-fm.h mx-fm-fdm.h mx-pm-m.h mx-m-pm.h mx-pm-cm.h mx-cm-pm.h mx-pm-fm.h mx-fm-pm.h mx-pm-fcm.h mx-fcm-pm.h mx-s-i8nda.h mx-i8nda-s.h mx-s-ui8nda.h mx-ui8nda-s.h mx-s-i16nda.h mx-i16nda-s.h mx-s-ui16nda.h mx-ui16nda-s.h mx-s-i32nda.h mx-i32nda-s.h mx-s-ui32nda.h mx-ui32nda-s.h mx-s-i64nda.h mx-i64nda-s.h mx-s-ui64nda.h mx-ui64nda-s.h mx-fs-i8nda.h mx-i8nda-fs.h mx-fs-ui8nda.h mx-ui8nda-fs.h mx-fs-i16nda.h mx-i16nda-fs.h mx-fs-ui16nda.h mx-ui16nda-fs.h mx-fs-i32nda.h mx-i32nda-fs.h mx-fs-ui32nda.h mx-ui32nda-fs.h mx-fs-i64nda.h mx-i64nda-fs.h mx-fs-ui64nda.h mx-ui64nda-fs.h mx-nda-i8.h mx-i8-nda.h mx-nda-ui8.h mx-ui8-nda.h mx-nda-i16.h mx-i16-nda.h mx-nda-ui16.h mx-ui16-nda.h mx-nda-i32.h mx-i32-nda.h mx-nda-ui32.h mx-ui32-nda.h mx-nda-i64.h mx-i64-nda.h mx-nda-ui64.h mx-ui64-nda.h mx-fnda-i8.h mx-i8-fnda.h mx-fnda-ui8.h mx-ui8-fnda.h mx-fnda-i16.h mx-i16-fnda.h mx-fnda-ui16.h mx-ui16-fnda.h mx-fnda-i32.h mx-i32-fnda.h mx-fnda-ui32.h mx-ui32-fnda.h mx-fnda-i64.h mx-i64-fnda.h mx-fnda-ui64.h mx-ui64-fnda.h mx-nda-i8nda.h mx-i8nda-nda.h mx-nda-ui8nda.h mx-ui8nda-nda.h mx-nda-i16nda.h mx-i16nda-nda.h mx-nda-ui16nda.h mx-ui16nda-nda.h mx-nda-i32nda.h mx-i32nda-nda.h mx-nda-ui32nda.h mx-ui32nda-nda.h mx-nda-i64nda.h mx-i64nda-nda.h mx-nda-ui64nda.h mx-ui64nda-nda.h mx-fnda-i8nda.h mx-i8nda-fnda.h mx-fnda-ui8nda.h mx-ui8nda-fnda.h mx-fnda-i16nda.h mx-i16nda-fnda.h mx-fnda-ui16nda.h mx-ui16nda-fnda.h mx-fnda-i32nda.h mx-i32nda-fnda.h mx-fnda-ui32nda.h mx-ui32nda-fnda.h mx-fnda-i64nda.h mx-i64nda-fnda.h mx-fnda-ui64nda.h mx-ui64nda-fnda.h mx-i8nda-ui8.h mx-i8nda-i16.h mx-i8nda-ui16.h mx-i8nda-i32.h mx-i8nda-ui32.h mx-i8nda-i64.h mx-i8nda-ui64.h mx-i16nda-i8.h mx-i16nda-ui8.h mx-i16nda-ui16.h mx-i16nda-i32.h mx-i16nda-ui32.h mx-i16nda-i64.h mx-i16nda-ui64.h mx-i32nda-i8.h mx-i32nda-ui8.h mx-i32nda-i16.h mx-i32nda-ui16.h mx-i32nda-ui32.h mx-i32nda-i64.h mx-i32nda-ui64.h mx-i64nda-i8.h mx-i64nda-ui8.h mx-i64nda-i16.h mx-i64nda-ui16.h mx-i64nda-i32.h mx-i64nda-ui32.h mx-i64nda-ui64.h mx-ui8nda-i8.h mx-ui8nda-i16.h mx-ui8nda-ui16.h mx-ui8nda-i32.h mx-ui8nda-ui32.h mx-ui8nda-i64.h mx-ui8nda-ui64.h mx-ui16nda-i8.h mx-ui16nda-ui8.h mx-ui16nda-i16.h mx-ui16nda-i32.h mx-ui16nda-ui32.h mx-ui16nda-i64.h mx-ui16nda-ui64.h mx-ui32nda-i8.h mx-ui32nda-ui8.h mx-ui32nda-i16.h mx-ui32nda-ui16.h mx-ui32nda-i32.h mx-ui32nda-i64.h mx-ui32nda-ui64.h mx-ui64nda-i8.h mx-ui64nda-ui8.h mx-ui64nda-i16.h mx-ui64nda-ui16.h mx-ui64nda-i32.h mx-ui64nda-ui32.h mx-ui64nda-i64.h mx-i8-ui8nda.h mx-i8-i16nda.h mx-i8-ui16nda.h mx-i8-i32nda.h mx-i8-ui32nda.h mx-i8-i64nda.h mx-i8-ui64nda.h mx-i16-i8nda.h mx-i16-ui8nda.h mx-i16-ui16nda.h mx-i16-i32nda.h mx-i16-ui32nda.h mx-i16-i64nda.h mx-i16-ui64nda.h mx-i32-i8nda.h mx-i32-ui8nda.h mx-i32-i16nda.h mx-i32-ui16nda.h mx-i32-ui32nda.h mx-i32-i64nda.h mx-i32-ui64nda.h mx-i64-i8nda.h mx-i64-ui8nda.h mx-i64-i16nda.h mx-i64-ui16nda.h mx-i64-i32nda.h mx-i64-ui32nda.h mx-i64-ui64nda.h mx-ui8-i8nda.h mx-ui8-i16nda.h mx-ui8-ui16nda.h mx-ui8-i32nda.h mx-ui8-ui32nda.h mx-ui8-i64nda.h mx-ui8-ui64nda.h mx-ui16-i8nda.h mx-ui16-ui8nda.h mx-ui16-i16nda.h mx-ui16-i32nda.h mx-ui16-ui32nda.h mx-ui16-i64nda.h mx-ui16-ui64nda.h mx-ui32-i8nda.h mx-ui32-ui8nda.h mx-ui32-i16nda.h mx-ui32-ui16nda.h mx-ui32-i32nda.h mx-ui32-i64nda.h mx-ui32-ui64nda.h mx-ui64-i8nda.h mx-ui64-ui8nda.h mx-ui64-i16nda.h mx-ui64-ui16nda.h mx-ui64-i32nda.h mx-ui64-ui32nda.h mx-ui64-i64nda.h mx-i8nda-ui8nda.h mx-i8nda-i16nda.h mx-i8nda-ui16nda.h mx-i8nda-i32nda.h mx-i8nda-ui32nda.h mx-i8nda-i64nda.h mx-i8nda-ui64nda.h mx-i16nda-i8nda.h mx-i16nda-ui8nda.h mx-i16nda-ui16nda.h mx-i16nda-i32nda.h mx-i16nda-ui32nda.h mx-i16nda-i64nda.h mx-i16nda-ui64nda.h mx-i32nda-i8nda.h mx-i32nda-ui8nda.h mx-i32nda-i16nda.h mx-i32nda-ui16nda.h mx-i32nda-ui32nda.h mx-i32nda-i64nda.h mx-i32nda-ui64nda.h mx-i64nda-i8nda.h mx-i64nda-ui8nda.h mx-i64nda-i16nda.h mx-i64nda-ui16nda.h mx-i64nda-i32nda.h mx-i64nda-ui32nda.h mx-i64nda-ui64nda.h mx-ui8nda-i8nda.h mx-ui8nda-i16nda.h mx-ui8nda-ui16nda.h mx-ui8nda-i32nda.h mx-ui8nda-ui32nda.h mx-ui8nda-i64nda.h mx-ui8nda-ui64nda.h mx-ui16nda-i8nda.h mx-ui16nda-ui8nda.h mx-ui16nda-i16nda.h mx-ui16nda-i32nda.h mx-ui16nda-ui32nda.h mx-ui16nda-i64nda.h mx-ui16nda-ui64nda.h mx-ui32nda-i8nda.h mx-ui32nda-ui8nda.h mx-ui32nda-i16nda.h mx-ui32nda-ui16nda.h mx-ui32nda-i32nda.h mx-ui32nda-i64nda.h mx-ui32nda-ui64nda.h mx-ui64nda-i8nda.h mx-ui64nda-ui8nda.h mx-ui64nda-i16nda.h mx-ui64nda-ui16nda.h mx-ui64nda-i32nda.h mx-ui64nda-ui32nda.h mx-ui64nda-i64nda.h
diff -uNr octave-3.6.1/liboctave/mx-op-src.mk octave-3.6.2/liboctave/mx-op-src.mk
--- octave-3.6.1/liboctave/mx-op-src.mk 2012-02-22 14:41:54.000000000 -0500
+++ octave-3.6.2/liboctave/mx-op-src.mk 2012-05-31 11:22:58.000000000 -0400
@@ -1 +1 @@
-MX_OP_SRC = mx-cdm-dm.cc mx-dm-cdm.cc mx-cs-dm.cc mx-cs-m.cc mx-cs-nda.cc mx-cdm-cm.cc mx-cdm-m.cc mx-cdm-s.cc mx-cm-cdm.cc mx-cm-dm.cc mx-cm-m.cc mx-cnda-nda.cc mx-cm-s.cc mx-cnda-s.cc mx-dm-cs.cc mx-dm-cm.cc mx-m-cs.cc mx-nda-cs.cc mx-m-cdm.cc mx-m-cm.cc mx-nda-cnda.cc mx-s-cdm.cc mx-s-cm.cc mx-s-cnda.cc mx-dm-m.cc mx-m-dm.cc mx-fcdm-fdm.cc mx-fdm-fcdm.cc mx-fcs-fdm.cc mx-fcs-fm.cc mx-fcs-fnda.cc mx-fcdm-fcm.cc mx-fcdm-fm.cc mx-fcdm-fs.cc mx-fcm-fcdm.cc mx-fcm-fdm.cc mx-fcm-fm.cc mx-fcnda-fnda.cc mx-fcm-fs.cc mx-fcnda-fs.cc mx-fdm-fcs.cc mx-fdm-fcm.cc mx-fm-fcs.cc mx-fnda-fcs.cc mx-fm-fcdm.cc mx-fm-fcm.cc mx-fnda-fcnda.cc mx-fs-fcdm.cc mx-fs-fcm.cc mx-fs-fcnda.cc mx-fdm-fm.cc mx-fm-fdm.cc mx-pm-m.cc mx-m-pm.cc mx-pm-cm.cc mx-cm-pm.cc mx-pm-fm.cc mx-fm-pm.cc mx-pm-fcm.cc mx-fcm-pm.cc mx-s-i8nda.cc mx-i8nda-s.cc mx-s-ui8nda.cc mx-ui8nda-s.cc mx-s-i16nda.cc mx-i16nda-s.cc mx-s-ui16nda.cc mx-ui16nda-s.cc mx-s-i32nda.cc mx-i32nda-s.cc mx-s-ui32nda.cc mx-ui32nda-s.cc mx-s-i64nda.cc mx-i64nda-s.cc mx-s-ui64nda.cc mx-ui64nda-s.cc mx-fs-i8nda.cc mx-i8nda-fs.cc mx-fs-ui8nda.cc mx-ui8nda-fs.cc mx-fs-i16nda.cc mx-i16nda-fs.cc mx-fs-ui16nda.cc mx-ui16nda-fs.cc mx-fs-i32nda.cc mx-i32nda-fs.cc mx-fs-ui32nda.cc mx-ui32nda-fs.cc mx-fs-i64nda.cc mx-i64nda-fs.cc mx-fs-ui64nda.cc mx-ui64nda-fs.cc mx-nda-i8.cc mx-i8-nda.cc mx-nda-ui8.cc mx-ui8-nda.cc mx-nda-i16.cc mx-i16-nda.cc mx-nda-ui16.cc mx-ui16-nda.cc mx-nda-i32.cc mx-i32-nda.cc mx-nda-ui32.cc mx-ui32-nda.cc mx-nda-i64.cc mx-i64-nda.cc mx-nda-ui64.cc mx-ui64-nda.cc mx-fnda-i8.cc mx-i8-fnda.cc mx-fnda-ui8.cc mx-ui8-fnda.cc mx-fnda-i16.cc mx-i16-fnda.cc mx-fnda-ui16.cc mx-ui16-fnda.cc mx-fnda-i32.cc mx-i32-fnda.cc mx-fnda-ui32.cc mx-ui32-fnda.cc mx-fnda-i64.cc mx-i64-fnda.cc mx-fnda-ui64.cc mx-ui64-fnda.cc mx-nda-i8nda.cc mx-i8nda-nda.cc mx-nda-ui8nda.cc mx-ui8nda-nda.cc mx-nda-i16nda.cc mx-i16nda-nda.cc mx-nda-ui16nda.cc mx-ui16nda-nda.cc mx-nda-i32nda.cc mx-i32nda-nda.cc mx-nda-ui32nda.cc mx-ui32nda-nda.cc mx-nda-i64nda.cc mx-i64nda-nda.cc mx-nda-ui64nda.cc mx-ui64nda-nda.cc mx-fnda-i8nda.cc mx-i8nda-fnda.cc mx-fnda-ui8nda.cc mx-ui8nda-fnda.cc mx-fnda-i16nda.cc mx-i16nda-fnda.cc mx-fnda-ui16nda.cc mx-ui16nda-fnda.cc mx-fnda-i32nda.cc mx-i32nda-fnda.cc mx-fnda-ui32nda.cc mx-ui32nda-fnda.cc mx-fnda-i64nda.cc mx-i64nda-fnda.cc mx-fnda-ui64nda.cc mx-ui64nda-fnda.cc mx-i8nda-ui8.cc mx-i8nda-i16.cc mx-i8nda-ui16.cc mx-i8nda-i32.cc mx-i8nda-ui32.cc mx-i8nda-i64.cc mx-i8nda-ui64.cc mx-i16nda-i8.cc mx-i16nda-ui8.cc mx-i16nda-ui16.cc mx-i16nda-i32.cc mx-i16nda-ui32.cc mx-i16nda-i64.cc mx-i16nda-ui64.cc mx-i32nda-i8.cc mx-i32nda-ui8.cc mx-i32nda-i16.cc mx-i32nda-ui16.cc mx-i32nda-ui32.cc mx-i32nda-i64.cc mx-i32nda-ui64.cc mx-i64nda-i8.cc mx-i64nda-ui8.cc mx-i64nda-i16.cc mx-i64nda-ui16.cc mx-i64nda-i32.cc mx-i64nda-ui32.cc mx-i64nda-ui64.cc mx-ui8nda-i8.cc mx-ui8nda-i16.cc mx-ui8nda-ui16.cc mx-ui8nda-i32.cc mx-ui8nda-ui32.cc mx-ui8nda-i64.cc mx-ui8nda-ui64.cc mx-ui16nda-i8.cc mx-ui16nda-ui8.cc mx-ui16nda-i16.cc mx-ui16nda-i32.cc mx-ui16nda-ui32.cc mx-ui16nda-i64.cc mx-ui16nda-ui64.cc mx-ui32nda-i8.cc mx-ui32nda-ui8.cc mx-ui32nda-i16.cc mx-ui32nda-ui16.cc mx-ui32nda-i32.cc mx-ui32nda-i64.cc mx-ui32nda-ui64.cc mx-ui64nda-i8.cc mx-ui64nda-ui8.cc mx-ui64nda-i16.cc mx-ui64nda-ui16.cc mx-ui64nda-i32.cc mx-ui64nda-ui32.cc mx-ui64nda-i64.cc mx-i8-ui8nda.cc mx-i8-i16nda.cc mx-i8-ui16nda.cc mx-i8-i32nda.cc mx-i8-ui32nda.cc mx-i8-i64nda.cc mx-i8-ui64nda.cc mx-i16-i8nda.cc mx-i16-ui8nda.cc mx-i16-ui16nda.cc mx-i16-i32nda.cc mx-i16-ui32nda.cc mx-i16-i64nda.cc mx-i16-ui64nda.cc mx-i32-i8nda.cc mx-i32-ui8nda.cc mx-i32-i16nda.cc mx-i32-ui16nda.cc mx-i32-ui32nda.cc mx-i32-i64nda.cc mx-i32-ui64nda.cc mx-i64-i8nda.cc mx-i64-ui8nda.cc mx-i64-i16nda.cc mx-i64-ui16nda.cc mx-i64-i32nda.cc mx-i64-ui32nda.cc mx-i64-ui64nda.cc mx-ui8-i8nda.cc mx-ui8-i16nda.cc mx-ui8-ui16nda.cc mx-ui8-i32nda.cc mx-ui8-ui32nda.cc mx-ui8-i64nda.cc mx-ui8-ui64nda.cc mx-ui16-i8nda.cc mx-ui16-ui8nda.cc mx-ui16-i16nda.cc mx-ui16-i32nda.cc mx-ui16-ui32nda.cc mx-ui16-i64nda.cc mx-ui16-ui64nda.cc mx-ui32-i8nda.cc mx-ui32-ui8nda.cc mx-ui32-i16nda.cc mx-ui32-ui16nda.cc mx-ui32-i32nda.cc mx-ui32-i64nda.cc mx-ui32-ui64nda.cc mx-ui64-i8nda.cc mx-ui64-ui8nda.cc mx-ui64-i16nda.cc mx-ui64-ui16nda.cc mx-ui64-i32nda.cc mx-ui64-ui32nda.cc mx-ui64-i64nda.cc mx-i8nda-ui8nda.cc mx-i8nda-i16nda.cc mx-i8nda-ui16nda.cc mx-i8nda-i32nda.cc mx-i8nda-ui32nda.cc mx-i8nda-i64nda.cc mx-i8nda-ui64nda.cc mx-i16nda-i8nda.cc mx-i16nda-ui8nda.cc mx-i16nda-ui16nda.cc mx-i16nda-i32nda.cc mx-i16nda-ui32nda.cc mx-i16nda-i64nda.cc mx-i16nda-ui64nda.cc mx-i32nda-i8nda.cc mx-i32nda-ui8nda.cc mx-i32nda-i16nda.cc mx-i32nda-ui16nda.cc mx-i32nda-ui32nda.cc mx-i32nda-i64nda.cc mx-i32nda-ui64nda.cc mx-i64nda-i8nda.cc mx-i64nda-ui8nda.cc mx-i64nda-i16nda.cc mx-i64nda-ui16nda.cc mx-i64nda-i32nda.cc mx-i64nda-ui32nda.cc mx-i64nda-ui64nda.cc mx-ui8nda-i8nda.cc mx-ui8nda-i16nda.cc mx-ui8nda-ui16nda.cc mx-ui8nda-i32nda.cc mx-ui8nda-ui32nda.cc mx-ui8nda-i64nda.cc mx-ui8nda-ui64nda.cc mx-ui16nda-i8nda.cc mx-ui16nda-ui8nda.cc mx-ui16nda-i16nda.cc mx-ui16nda-i32nda.cc mx-ui16nda-ui32nda.cc mx-ui16nda-i64nda.cc mx-ui16nda-ui64nda.cc mx-ui32nda-i8nda.cc mx-ui32nda-ui8nda.cc mx-ui32nda-i16nda.cc mx-ui32nda-ui16nda.cc mx-ui32nda-i32nda.cc mx-ui32nda-i64nda.cc mx-ui32nda-ui64nda.cc mx-ui64nda-i8nda.cc mx-ui64nda-ui8nda.cc mx-ui64nda-i16nda.cc mx-ui64nda-ui16nda.cc mx-ui64nda-i32nda.cc mx-ui64nda-ui32nda.cc mx-ui64nda-i64nda.cc
+MX_OP_SRC = mx-cdm-dm.cc mx-dm-cdm.cc mx-cs-dm.cc mx-cs-m.cc mx-cs-nda.cc mx-cdm-cm.cc mx-cdm-m.cc mx-cdm-s.cc mx-cm-cdm.cc mx-cm-dm.cc mx-cm-m.cc mx-cnda-nda.cc mx-cm-s.cc mx-cnda-s.cc mx-dm-cs.cc mx-dm-cm.cc mx-m-cs.cc mx-nda-cs.cc mx-m-cdm.cc mx-m-cm.cc mx-nda-cnda.cc mx-s-cdm.cc mx-s-cm.cc mx-s-cnda.cc mx-dm-m.cc mx-m-dm.cc mx-fcdm-fdm.cc mx-fdm-fcdm.cc mx-fcs-fdm.cc mx-fcs-fm.cc mx-fcs-fnda.cc mx-fcdm-fcm.cc mx-fcdm-fm.cc mx-fcdm-fs.cc mx-fcm-fcdm.cc mx-fcm-fdm.cc mx-fcm-fm.cc mx-fcnda-fnda.cc mx-fcm-fs.cc mx-fcnda-fs.cc mx-fdm-fcs.cc mx-fdm-fcm.cc mx-fm-fcs.cc mx-fnda-fcs.cc mx-fm-fcdm.cc mx-fm-fcm.cc mx-fnda-fcnda.cc mx-fs-fcdm.cc mx-fs-fcm.cc mx-fs-fcnda.cc mx-fdm-fm.cc mx-fm-fdm.cc mx-pm-m.cc mx-m-pm.cc mx-pm-cm.cc mx-cm-pm.cc mx-pm-fm.cc mx-fm-pm.cc mx-pm-fcm.cc mx-fcm-pm.cc mx-s-i8nda.cc mx-i8nda-s.cc mx-s-ui8nda.cc mx-ui8nda-s.cc mx-s-i16nda.cc mx-i16nda-s.cc mx-s-ui16nda.cc mx-ui16nda-s.cc mx-s-i32nda.cc mx-i32nda-s.cc mx-s-ui32nda.cc mx-ui32nda-s.cc mx-s-i64nda.cc mx-i64nda-s.cc mx-s-ui64nda.cc mx-ui64nda-s.cc mx-fs-i8nda.cc mx-i8nda-fs.cc mx-fs-ui8nda.cc mx-ui8nda-fs.cc mx-fs-i16nda.cc mx-i16nda-fs.cc mx-fs-ui16nda.cc mx-ui16nda-fs.cc mx-fs-i32nda.cc mx-i32nda-fs.cc mx-fs-ui32nda.cc mx-ui32nda-fs.cc mx-fs-i64nda.cc mx-i64nda-fs.cc mx-fs-ui64nda.cc mx-ui64nda-fs.cc mx-nda-i8.cc mx-i8-nda.cc mx-nda-ui8.cc mx-ui8-nda.cc mx-nda-i16.cc mx-i16-nda.cc mx-nda-ui16.cc mx-ui16-nda.cc mx-nda-i32.cc mx-i32-nda.cc mx-nda-ui32.cc mx-ui32-nda.cc mx-nda-i64.cc mx-i64-nda.cc mx-nda-ui64.cc mx-ui64-nda.cc mx-fnda-i8.cc mx-i8-fnda.cc mx-fnda-ui8.cc mx-ui8-fnda.cc mx-fnda-i16.cc mx-i16-fnda.cc mx-fnda-ui16.cc mx-ui16-fnda.cc mx-fnda-i32.cc mx-i32-fnda.cc mx-fnda-ui32.cc mx-ui32-fnda.cc mx-fnda-i64.cc mx-i64-fnda.cc mx-fnda-ui64.cc mx-ui64-fnda.cc mx-nda-i8nda.cc mx-i8nda-nda.cc mx-nda-ui8nda.cc mx-ui8nda-nda.cc mx-nda-i16nda.cc mx-i16nda-nda.cc mx-nda-ui16nda.cc mx-ui16nda-nda.cc mx-nda-i32nda.cc mx-i32nda-nda.cc mx-nda-ui32nda.cc mx-ui32nda-nda.cc mx-nda-i64nda.cc mx-i64nda-nda.cc mx-nda-ui64nda.cc mx-ui64nda-nda.cc mx-fnda-i8nda.cc mx-i8nda-fnda.cc mx-fnda-ui8nda.cc mx-ui8nda-fnda.cc mx-fnda-i16nda.cc mx-i16nda-fnda.cc mx-fnda-ui16nda.cc mx-ui16nda-fnda.cc mx-fnda-i32nda.cc mx-i32nda-fnda.cc mx-fnda-ui32nda.cc mx-ui32nda-fnda.cc mx-fnda-i64nda.cc mx-i64nda-fnda.cc mx-fnda-ui64nda.cc mx-ui64nda-fnda.cc mx-i8nda-ui8.cc mx-i8nda-i16.cc mx-i8nda-ui16.cc mx-i8nda-i32.cc mx-i8nda-ui32.cc mx-i8nda-i64.cc mx-i8nda-ui64.cc mx-i16nda-i8.cc mx-i16nda-ui8.cc mx-i16nda-ui16.cc mx-i16nda-i32.cc mx-i16nda-ui32.cc mx-i16nda-i64.cc mx-i16nda-ui64.cc mx-i32nda-i8.cc mx-i32nda-ui8.cc mx-i32nda-i16.cc mx-i32nda-ui16.cc mx-i32nda-ui32.cc mx-i32nda-i64.cc mx-i32nda-ui64.cc mx-i64nda-i8.cc mx-i64nda-ui8.cc mx-i64nda-i16.cc mx-i64nda-ui16.cc mx-i64nda-i32.cc mx-i64nda-ui32.cc mx-i64nda-ui64.cc mx-ui8nda-i8.cc mx-ui8nda-i16.cc mx-ui8nda-ui16.cc mx-ui8nda-i32.cc mx-ui8nda-ui32.cc mx-ui8nda-i64.cc mx-ui8nda-ui64.cc mx-ui16nda-i8.cc mx-ui16nda-ui8.cc mx-ui16nda-i16.cc mx-ui16nda-i32.cc mx-ui16nda-ui32.cc mx-ui16nda-i64.cc mx-ui16nda-ui64.cc mx-ui32nda-i8.cc mx-ui32nda-ui8.cc mx-ui32nda-i16.cc mx-ui32nda-ui16.cc mx-ui32nda-i32.cc mx-ui32nda-i64.cc mx-ui32nda-ui64.cc mx-ui64nda-i8.cc mx-ui64nda-ui8.cc mx-ui64nda-i16.cc mx-ui64nda-ui16.cc mx-ui64nda-i32.cc mx-ui64nda-ui32.cc mx-ui64nda-i64.cc mx-i8-ui8nda.cc mx-i8-i16nda.cc mx-i8-ui16nda.cc mx-i8-i32nda.cc mx-i8-ui32nda.cc mx-i8-i64nda.cc mx-i8-ui64nda.cc mx-i16-i8nda.cc mx-i16-ui8nda.cc mx-i16-ui16nda.cc mx-i16-i32nda.cc mx-i16-ui32nda.cc mx-i16-i64nda.cc mx-i16-ui64nda.cc mx-i32-i8nda.cc mx-i32-ui8nda.cc mx-i32-i16nda.cc mx-i32-ui16nda.cc mx-i32-ui32nda.cc mx-i32-i64nda.cc mx-i32-ui64nda.cc mx-i64-i8nda.cc mx-i64-ui8nda.cc mx-i64-i16nda.cc mx-i64-ui16nda.cc mx-i64-i32nda.cc mx-i64-ui32nda.cc mx-i64-ui64nda.cc mx-ui8-i8nda.cc mx-ui8-i16nda.cc mx-ui8-ui16nda.cc mx-ui8-i32nda.cc mx-ui8-ui32nda.cc mx-ui8-i64nda.cc mx-ui8-ui64nda.cc mx-ui16-i8nda.cc mx-ui16-ui8nda.cc mx-ui16-i16nda.cc mx-ui16-i32nda.cc mx-ui16-ui32nda.cc mx-ui16-i64nda.cc mx-ui16-ui64nda.cc mx-ui32-i8nda.cc mx-ui32-ui8nda.cc mx-ui32-i16nda.cc mx-ui32-ui16nda.cc mx-ui32-i32nda.cc mx-ui32-i64nda.cc mx-ui32-ui64nda.cc mx-ui64-i8nda.cc mx-ui64-ui8nda.cc mx-ui64-i16nda.cc mx-ui64-ui16nda.cc mx-ui64-i32nda.cc mx-ui64-ui32nda.cc mx-ui64-i64nda.cc mx-i8nda-ui8nda.cc mx-i8nda-i16nda.cc mx-i8nda-ui16nda.cc mx-i8nda-i32nda.cc mx-i8nda-ui32nda.cc mx-i8nda-i64nda.cc mx-i8nda-ui64nda.cc mx-i16nda-i8nda.cc mx-i16nda-ui8nda.cc mx-i16nda-ui16nda.cc mx-i16nda-i32nda.cc mx-i16nda-ui32nda.cc mx-i16nda-i64nda.cc mx-i16nda-ui64nda.cc mx-i32nda-i8nda.cc mx-i32nda-ui8nda.cc mx-i32nda-i16nda.cc mx-i32nda-ui16nda.cc mx-i32nda-ui32nda.cc mx-i32nda-i64nda.cc mx-i32nda-ui64nda.cc mx-i64nda-i8nda.cc mx-i64nda-ui8nda.cc mx-i64nda-i16nda.cc mx-i64nda-ui16nda.cc mx-i64nda-i32nda.cc mx-i64nda-ui32nda.cc mx-i64nda-ui64nda.cc mx-ui8nda-i8nda.cc mx-ui8nda-i16nda.cc mx-ui8nda-ui16nda.cc mx-ui8nda-i32nda.cc mx-ui8nda-ui32nda.cc mx-ui8nda-i64nda.cc mx-ui8nda-ui64nda.cc mx-ui16nda-i8nda.cc mx-ui16nda-ui8nda.cc mx-ui16nda-i16nda.cc mx-ui16nda-i32nda.cc mx-ui16nda-ui32nda.cc mx-ui16nda-i64nda.cc mx-ui16nda-ui64nda.cc mx-ui32nda-i8nda.cc mx-ui32nda-ui8nda.cc mx-ui32nda-i16nda.cc mx-ui32nda-ui16nda.cc mx-ui32nda-i32nda.cc mx-ui32nda-i64nda.cc mx-ui32nda-ui64nda.cc mx-ui64nda-i8nda.cc mx-ui64nda-ui8nda.cc mx-ui64nda-i16nda.cc mx-ui64nda-ui16nda.cc mx-ui64nda-i32nda.cc mx-ui64nda-ui32nda.cc mx-ui64nda-i64nda.cc
diff -uNr octave-3.6.1/liboctave/regexp.cc octave-3.6.2/liboctave/regexp.cc
--- octave-3.6.1/liboctave/regexp.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/liboctave/regexp.cc 2012-05-30 21:43:28.000000000 -0400
@@ -148,7 +148,7 @@
size_t tmp_pos1 = new_pos + 2;
size_t tmp_pos2 = tmp_pos1;
- while (tmp_pos1 <= pattern.length () && brackets > 0)
+ while (tmp_pos1 < pattern.length () && brackets > 0)
{
char ch = pattern.at (tmp_pos1);
@@ -371,8 +371,21 @@
|| ovector[2*i-1] != ovector[2*i+1])
{
if (namecount > 0)
- named_tokens(named_idx(i-pos_offset-1)) =
- std::string (*(listptr+nidx[i-pos_offset-1]));
+ {
+ // FIXME: Should probably do this with a map()
+ // rather than a linear search. However,
+ // the number of captured, named expressions
+ // is usually pretty small (< 4)
+ for (int j = 0; j < namecount; j++)
+ {
+ if (nidx[j] == i)
+ {
+ named_tokens(named_idx(j)) =
+ std::string (*(listptr+i-pos_offset));
+ break;
+ }
+ }
+ }
tokens(pos_match++) = std::string (*(listptr+i));
}
diff -uNr octave-3.6.1/liboctave/smx-op-inc.mk octave-3.6.2/liboctave/smx-op-inc.mk
--- octave-3.6.1/liboctave/smx-op-inc.mk 2012-02-22 14:41:54.000000000 -0500
+++ octave-3.6.2/liboctave/smx-op-inc.mk 2012-05-31 11:22:58.000000000 -0400
@@ -1 +1 @@
-SMX_OP_INC = smx-sm-cs.h smx-cs-sm.h smx-scm-s.h smx-s-scm.h smx-scm-sm.h smx-sm-scm.h smx-m-sm.h smx-m-scm.h smx-cm-sm.h smx-cm-scm.h smx-sm-m.h smx-scm-m.h smx-sm-cm.h smx-scm-cm.h smx-bm-sbm.h smx-sbm-bm.h
+SMX_OP_INC = smx-sm-cs.h smx-cs-sm.h smx-scm-s.h smx-s-scm.h smx-scm-sm.h smx-sm-scm.h smx-m-sm.h smx-m-scm.h smx-cm-sm.h smx-cm-scm.h smx-sm-m.h smx-scm-m.h smx-sm-cm.h smx-scm-cm.h smx-bm-sbm.h smx-sbm-bm.h
diff -uNr octave-3.6.1/liboctave/smx-op-src.mk octave-3.6.2/liboctave/smx-op-src.mk
--- octave-3.6.1/liboctave/smx-op-src.mk 2012-02-22 14:41:54.000000000 -0500
+++ octave-3.6.2/liboctave/smx-op-src.mk 2012-05-31 11:22:58.000000000 -0400
@@ -1 +1 @@
-SMX_OP_SRC = smx-sm-cs.cc smx-cs-sm.cc smx-scm-s.cc smx-s-scm.cc smx-scm-sm.cc smx-sm-scm.cc smx-m-sm.cc smx-m-scm.cc smx-cm-sm.cc smx-cm-scm.cc smx-sm-m.cc smx-scm-m.cc smx-sm-cm.cc smx-scm-cm.cc smx-bm-sbm.cc smx-sbm-bm.cc
+SMX_OP_SRC = smx-sm-cs.cc smx-cs-sm.cc smx-scm-s.cc smx-s-scm.cc smx-scm-sm.cc smx-sm-scm.cc smx-m-sm.cc smx-m-scm.cc smx-cm-sm.cc smx-cm-scm.cc smx-sm-m.cc smx-scm-m.cc smx-sm-cm.cc smx-scm-cm.cc smx-bm-sbm.cc smx-sbm-bm.cc
diff -uNr octave-3.6.1/liboctave/Sparse.cc octave-3.6.2/liboctave/Sparse.cc
--- octave-3.6.1/liboctave/Sparse.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/liboctave/Sparse.cc 2012-05-30 21:43:28.000000000 -0400
@@ -1404,7 +1404,11 @@
if (idx.is_range () && idx.increment () == -1)
{
retval = Sparse (nr, 1, nz);
- std::reverse_copy (ridx (), ridx () + nz, retval.ridx ());
+
+ for (octave_idx_type j = 0; j < nz; j++)
+ retval.ridx (j) = nr - ridx (nz - j - 1) - 1;
+
+ copy_or_memcpy (2, cidx (), retval.cidx ());
std::reverse_copy (data (), data () + nz, retval.data ());
}
else
@@ -2726,6 +2730,10 @@
%!test test_sparse_slice([2 2], 22, 3);
%!test test_sparse_slice([2 2], 22, 4);
+bug #35570:
+
+%!assert (speye (3,1)(3:-1:1), sparse ([0; 0; 1]))
+
*/
template
diff -uNr octave-3.6.1/liboctave/sparse-mk-ops.awk octave-3.6.2/liboctave/sparse-mk-ops.awk
--- octave-3.6.1/liboctave/sparse-mk-ops.awk 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/liboctave/sparse-mk-ops.awk 2012-05-30 21:43:28.000000000 -0400
@@ -92,13 +92,13 @@
if (list_cc_files)
{
- print cc_file;
+ printf (" %s", cc_file);
next;
}
if (list_h_files)
{
- print h_file;
+ printf (" %s", h_file);
next;
}
diff -uNr octave-3.6.1/liboctave/vx-op-inc.mk octave-3.6.2/liboctave/vx-op-inc.mk
--- octave-3.6.1/liboctave/vx-op-inc.mk 2012-02-22 14:41:54.000000000 -0500
+++ octave-3.6.2/liboctave/vx-op-inc.mk 2012-05-31 11:22:57.000000000 -0400
@@ -1 +1 @@
-VX_OP_INC = vx-ccv-cv.h vx-ccv-s.h vx-crv-rv.h vx-crv-s.h vx-cs-cv.h vx-cs-rv.h vx-cv-ccv.h vx-cv-cs.h vx-rv-crv.h vx-rv-cs.h vx-s-ccv.h vx-s-crv.h vx-fccv-fcv.h vx-fccv-fs.h vx-fcrv-frv.h vx-fcrv-fs.h vx-fcs-fcv.h vx-fcs-frv.h vx-fcv-fccv.h vx-fcv-fcs.h vx-frv-fcrv.h vx-frv-fcs.h vx-fs-fccv.h vx-fs-fcrv.h
+VX_OP_INC = vx-ccv-cv.h vx-ccv-s.h vx-crv-rv.h vx-crv-s.h vx-cs-cv.h vx-cs-rv.h vx-cv-ccv.h vx-cv-cs.h vx-rv-crv.h vx-rv-cs.h vx-s-ccv.h vx-s-crv.h vx-fccv-fcv.h vx-fccv-fs.h vx-fcrv-frv.h vx-fcrv-fs.h vx-fcs-fcv.h vx-fcs-frv.h vx-fcv-fccv.h vx-fcv-fcs.h vx-frv-fcrv.h vx-frv-fcs.h vx-fs-fccv.h vx-fs-fcrv.h
diff -uNr octave-3.6.1/liboctave/vx-op-src.mk octave-3.6.2/liboctave/vx-op-src.mk
--- octave-3.6.1/liboctave/vx-op-src.mk 2012-02-22 14:41:54.000000000 -0500
+++ octave-3.6.2/liboctave/vx-op-src.mk 2012-05-31 11:22:57.000000000 -0400
@@ -1 +1 @@
-VX_OP_SRC = vx-ccv-cv.cc vx-ccv-s.cc vx-crv-rv.cc vx-crv-s.cc vx-cs-cv.cc vx-cs-rv.cc vx-cv-ccv.cc vx-cv-cs.cc vx-rv-crv.cc vx-rv-cs.cc vx-s-ccv.cc vx-s-crv.cc vx-fccv-fcv.cc vx-fccv-fs.cc vx-fcrv-frv.cc vx-fcrv-fs.cc vx-fcs-fcv.cc vx-fcs-frv.cc vx-fcv-fccv.cc vx-fcv-fcs.cc vx-frv-fcrv.cc vx-frv-fcs.cc vx-fs-fccv.cc vx-fs-fcrv.cc
+VX_OP_SRC = vx-ccv-cv.cc vx-ccv-s.cc vx-crv-rv.cc vx-crv-s.cc vx-cs-cv.cc vx-cs-rv.cc vx-cv-ccv.cc vx-cv-cs.cc vx-rv-crv.cc vx-rv-cs.cc vx-s-ccv.cc vx-s-crv.cc vx-fccv-fcv.cc vx-fccv-fs.cc vx-fcrv-frv.cc vx-fcrv-fs.cc vx-fcs-fcv.cc vx-fcs-frv.cc vx-fcv-fccv.cc vx-fcv-fcs.cc vx-frv-fcrv.cc vx-frv-fcs.cc vx-fs-fccv.cc vx-fs-fcrv.cc
diff -uNr octave-3.6.1/Makefile.in octave-3.6.2/Makefile.in
--- octave-3.6.1/Makefile.in 2012-02-22 14:46:14.000000000 -0500
+++ octave-3.6.2/Makefile.in 2012-05-31 11:24:32.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -58,11 +58,10 @@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/build-aux/common.mk \
$(srcdir)/config.h.in $(srcdir)/m4/module.mk \
- $(top_srcdir)/configure COPYING ChangeLog INSTALL NEWS \
+ $(top_srcdir)/configure COPYING ChangeLog NEWS \
build-aux/config.guess build-aux/config.sub build-aux/depcomp \
build-aux/install-sh build-aux/ltmain.sh build-aux/mdate-sh \
- build-aux/missing build-aux/mkinstalldirs \
- build-aux/texinfo.tex build-aux/ylwrap
+ build-aux/missing build-aux/mkinstalldirs build-aux/ylwrap
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
@@ -203,6 +202,12 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(octetcdir)" \
"$(DESTDIR)$(octincludedir)"
DATA = $(octetc_DATA)
@@ -219,9 +224,11 @@
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -250,6 +257,8 @@
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
@@ -1657,7 +1666,7 @@
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-am--refresh:
+am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/build-aux/common.mk $(srcdir)/m4/module.mk $(am__configure_deps)
@for dep in $?; do \
@@ -1682,6 +1691,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
+$(srcdir)/build-aux/common.mk $(srcdir)/m4/module.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1693,10 +1703,8 @@
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -1734,9 +1742,7 @@
@$(NORMAL_UNINSTALL)
@list='$(octetc_DATA)'; test -n "$(octetcdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(octetcdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(octetcdir)" && rm -f $$files
+ dir='$(DESTDIR)$(octetcdir)'; $(am__uninstall_files_from_dir)
install-nodist_octincludeHEADERS: $(nodist_octinclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(octincludedir)" || $(MKDIR_P) "$(DESTDIR)$(octincludedir)"
@@ -1754,9 +1760,7 @@
@$(NORMAL_UNINSTALL)
@list='$(nodist_octinclude_HEADERS)'; test -n "$(octincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(octincludedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(octincludedir)" && rm -f $$files
+ dir='$(DESTDIR)$(octincludedir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -1969,7 +1973,11 @@
$(am__remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__remove_distdir)
dist-lzma: distdir
@@ -1977,7 +1985,7 @@
$(am__remove_distdir)
dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__remove_distdir)
dist-tarZ: distdir
@@ -2008,6 +2016,8 @@
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -2027,6 +2037,7 @@
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -2055,8 +2066,16 @@
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @$(am__cd) '$(distuninstallcheck_dir)' \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
@@ -2092,10 +2111,15 @@
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -2189,8 +2213,8 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am all-local am--refresh check check-am clean \
clean-generic clean-libtool ctags ctags-recursive dist \
- dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
+ dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \
+ dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
diff -uNr octave-3.6.1/NEWS octave-3.6.2/NEWS
--- octave-3.6.1/NEWS 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/NEWS 2012-05-30 21:43:28.000000000 -0400
@@ -13,7 +13,7 @@
http://forge.scilab.org/index.php/p/arpack-ng
** Many of Octave's binary operators (.*, .^, +, -, ...) now perform
- automatic broadcasting for array operations that allows you to use
+ automatic broadcasting for array operations which allows you to use
operator notation instead of calling bsxfun or expanding arrays (and
unnecessarily wasting memory) with repmat or similar idioms. For
example, to scale the columns of a matrix by the elements of a row
@@ -46,7 +46,7 @@
rem
xor
- additionally, since the A op= B assginment operators are equivalent
+ additionally, since the A op= B assignment operators are equivalent
to A = A op B, the following operators are also affected:
+= -= .+= .-= .*= ./= .\= .^= .**= &= |=
@@ -74,8 +74,8 @@
scripts.
negative binomial function has been extended to real, non-integer
- inputs. The discrete_inv fucntion now returns v(1) for 0 instead of
- NaN. The nbincdf fucntion has bbeen recoded to use a closed form
+ inputs. The discrete_inv function now returns v(1) for 0 instead of
+ NaN. The nbincdf function has been recoded to use a closed form
solution with betainc.
** strread, textscan, and textread have been completely revamped.
@@ -137,7 +137,7 @@
string now supported.
datestr: Numerical formats 21, 22, 29 changed to match Matlab.
- Now accepts cellstr inputs.
+ Now accepts cellstr input.
** The following warning IDs have been removed:
@@ -166,7 +166,7 @@
The uiXXX functions above are experimental.
Except for uiwait and uiresume, the uiXXX functions are not
- supported with the the FLTK+OpenGL graphics toolkit.
+ supported with the FLTK+OpenGL graphics toolkit.
The gnuplot graphics toolkit does not support any of the uiXXX
functions nor the waitfor function.
@@ -210,6 +210,10 @@
__error_text__ studentize
error_text sylvester_matrix
+ ** The following functions have been modified for Matlab compatibility:
+
+ randperm
+
Summary of important user-visible changes for version 3.4.3:
-----------------------------------------------------------
diff -uNr octave-3.6.1/scripts/DOCSTRINGS octave-3.6.2/scripts/DOCSTRINGS
--- octave-3.6.1/scripts/DOCSTRINGS 2012-02-22 14:55:54.000000000 -0500
+++ octave-3.6.2/scripts/DOCSTRINGS 2012-05-31 11:33:36.000000000 -0400
@@ -2105,7 +2105,7 @@
@c logspace scripts/general/logspace.m
-*- texinfo -*-
@deftypefn {Function File} {} logspace (@var{a}, @var{b})
-@deftypefnx {Function File} {} logspace (@var{b}, @var{b}, @var{n})
+@deftypefnx {Function File} {} logspace (@var{a}, @var{b}, @var{n})
@deftypefnx {Function File} {} logspace (@var{a}, pi, @var{n})
Return a row vector with @var{n} elements logarithmically spaced from
@tex
@@ -5411,8 +5411,8 @@
@item mode
This value determines whether the editor should be started in async mode
(editor is started in the background and Octave continues) or sync mode
-(Octave waits until the editor exits). Set it to "async" to start the editor
-in async mode. The default is "sync" (see also "system").
+(Octave waits until the editor exits). Set it to "sync" to start the editor
+in sync mode. The default is "async" (see also "system").
@item editinplace
Determines whether files should be edited in place, without regard to
@@ -18564,6 +18564,16 @@
@end group
@end example
+Spaces are ignored during conversion and may be used to make the binary
+number more readable.
+
+@example
+@group
+bin2dec ("1000 0001")
+ @result{} 129
+@end group
+@end example
+
If @var{s} is a string matrix, return a column vector with one converted
number per row of @var{s}; Invalid rows evaluate to NaN@.
diff -uNr octave-3.6.1/scripts/general/logspace.m octave-3.6.2/scripts/general/logspace.m
--- octave-3.6.1/scripts/general/logspace.m 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/scripts/general/logspace.m 2012-05-30 21:43:28.000000000 -0400
@@ -18,7 +18,7 @@
## -*- texinfo -*-
## @deftypefn {Function File} {} logspace (@var{a}, @var{b})
-## @deftypefnx {Function File} {} logspace (@var{b}, @var{b}, @var{n})
+## @deftypefnx {Function File} {} logspace (@var{a}, @var{b}, @var{n})
## @deftypefnx {Function File} {} logspace (@var{a}, pi, @var{n})
## Return a row vector with @var{n} elements logarithmically spaced from
## @tex
diff -uNr octave-3.6.1/scripts/linear-algebra/logm.m octave-3.6.2/scripts/linear-algebra/logm.m
--- octave-3.6.1/scripts/linear-algebra/logm.m 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/scripts/linear-algebra/logm.m 2012-05-30 21:43:28.000000000 -0400
@@ -104,7 +104,7 @@
s = 2^k * u * s * u';
## Remove small complex values (O(eps)) which may have entered calculation
- if (real_eig)
+ if (real_eig && isreal(A))
s = real (s);
endif
@@ -159,6 +159,7 @@
%!assert(norm(logm([1 -1;0 1]) - [0 -1; 0 0]) < 1e-5);
%!assert(norm(expm(logm([-1 2 ; 4 -1])) - [-1 2 ; 4 -1]) < 1e-5);
%!assert(logm([1 -1 -1;0 1 -1; 0 0 1]), [0 -1 -1.5; 0 0 -1; 0 0 0], 1e-5);
+%!assert (logm (expm ([0 1i; -1i 0])), [0 1i; -1i 0], 10 * eps)
%% Test input validation
%!error logm ();
diff -uNr octave-3.6.1/scripts/Makefile.in octave-3.6.2/scripts/Makefile.in
--- octave-3.6.1/scripts/Makefile.in 2012-02-22 14:46:11.000000000 -0500
+++ octave-3.6.2/scripts/Makefile.in 2012-05-31 11:24:29.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -222,6 +222,12 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(imagedir)" "$(DESTDIR)$(fcnfiledir)"
DATA = $(image_DATA) $(nobase_fcnfile_DATA)
ETAGS = etags
@@ -2638,6 +2644,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build-aux/common.mk $(srcdir)/@ftp/module.mk $(srcdir)/audio/module.mk $(srcdir)/deprecated/module.mk $(srcdir)/elfun/module.mk $(srcdir)/general/module.mk $(srcdir)/geometry/module.mk $(srcdir)/help/module.mk $(srcdir)/image/module.mk $(srcdir)/io/module.mk $(srcdir)/linear-algebra/module.mk $(srcdir)/miscellaneous/module.mk $(srcdir)/optimization/module.mk $(srcdir)/path/module.mk $(srcdir)/pkg/module.mk $(srcdir)/plot/module.mk $(srcdir)/polynomial/module.mk $(srcdir)/prefs/module.mk $(srcdir)/set/module.mk $(srcdir)/signal/module.mk $(srcdir)/sparse/module.mk $(srcdir)/specfun/module.mk $(srcdir)/special-matrix/module.mk $(srcdir)/startup/module.mk $(srcdir)/statistics/base/module.mk $(srcdir)/statistics/distributions/module.mk $(srcdir)/statistics/models/module.mk $(srcdir)/statistics/tests/module.mk $(srcdir)/strings/module.mk $(srcdir)/testfun/module.mk $(srcdir)/time/module.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2656,7 +2663,7 @@
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-gethelp$(EXEEXT): $(gethelp_OBJECTS) $(gethelp_DEPENDENCIES)
+gethelp$(EXEEXT): $(gethelp_OBJECTS) $(gethelp_DEPENDENCIES) $(EXTRA_gethelp_DEPENDENCIES)
@rm -f gethelp$(EXEEXT)
$(CXXLINK) $(gethelp_OBJECTS) $(gethelp_LDADD) $(LIBS)
@@ -2714,9 +2721,7 @@
@$(NORMAL_UNINSTALL)
@list='$(image_DATA)'; test -n "$(imagedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(imagedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(imagedir)" && rm -f $$files
+ dir='$(DESTDIR)$(imagedir)'; $(am__uninstall_files_from_dir)
install-nobase_fcnfileDATA: $(nobase_fcnfile_DATA)
@$(NORMAL_INSTALL)
test -z "$(fcnfiledir)" || $(MKDIR_P) "$(DESTDIR)$(fcnfiledir)"
@@ -2737,9 +2742,7 @@
@$(NORMAL_UNINSTALL)
@list='$(nobase_fcnfile_DATA)'; test -n "$(fcnfiledir)" || list=; \
$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(fcnfiledir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(fcnfiledir)" && rm -f $$files
+ dir='$(DESTDIR)$(fcnfiledir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -2840,10 +2843,15 @@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff -uNr octave-3.6.1/scripts/miscellaneous/edit.m octave-3.6.2/scripts/miscellaneous/edit.m
--- octave-3.6.1/scripts/miscellaneous/edit.m 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/scripts/miscellaneous/edit.m 2012-05-30 21:43:28.000000000 -0400
@@ -130,8 +130,8 @@
## @item mode
## This value determines whether the editor should be started in async mode
## (editor is started in the background and Octave continues) or sync mode
-## (Octave waits until the editor exits). Set it to "async" to start the editor
-## in async mode. The default is "sync" (see also "system").
+## (Octave waits until the editor exits). Set it to "sync" to start the editor
+## in sync mode. The default is "async" (see also "system").
##
## @item editinplace
## Determines whether files should be edited in place, without regard to
diff -uNr octave-3.6.1/scripts/pkg/pkg.m octave-3.6.2/scripts/pkg/pkg.m
--- octave-3.6.1/scripts/pkg/pkg.m 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/scripts/pkg/pkg.m 2012-05-30 21:43:28.000000000 -0400
@@ -1751,7 +1751,8 @@
value = strip (line (colon+1:end));
if (length (value) == 0)
fclose (fid);
- error ("the keyword %s has an empty value", desc.keywords{end});
+ error ("The keyword `%s' of the package `%s' has an empty value",
+ keyword, desc.name);
endif
desc.(keyword) = value;
endif
diff -uNr octave-3.6.1/scripts/plot/private/__print_parse_opts__.m octave-3.6.2/scripts/plot/private/__print_parse_opts__.m
--- octave-3.6.1/scripts/plot/private/__print_parse_opts__.m 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/scripts/plot/private/__print_parse_opts__.m 2012-05-30 21:43:28.000000000 -0400
@@ -153,7 +153,7 @@
if (arg_st.ghostscript.resolution == 0)
## Do as Matlab does.
- arg_st.ghostscript.resolution = num2str (get (0, "screenpixelsperinch"));
+ arg_st.ghostscript.resolution = get (0, "screenpixelsperinch");
endif
if (isempty (arg_st.orientation))
diff -uNr octave-3.6.1/scripts/polynomial/pchip.m octave-3.6.2/scripts/polynomial/pchip.m
--- octave-3.6.1/scripts/polynomial/pchip.m 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/scripts/polynomial/pchip.m 2012-05-30 21:43:28.000000000 -0400
@@ -167,3 +167,6 @@
%!assert(squeeze(yi1(1,2,:)),[1/sqrt(2); 0; -1/sqrt(2);-1],1e-14);
%!assert(size(yi2),[3,2,5,4]);
%!assert(squeeze(yi2(1,2,3,:)),[1/sqrt(2); 0; -1/sqrt(2);-1],1e-14);
+
+%!error (pchip (1,2));
+%!error (pchip (1,2,3));
diff -uNr octave-3.6.1/scripts/statistics/base/median.m octave-3.6.2/scripts/statistics/base/median.m
--- octave-3.6.1/scripts/statistics/base/median.m 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/scripts/statistics/base/median.m 2012-05-30 21:43:28.000000000 -0400
@@ -99,6 +99,16 @@
%! assert(median ([x2, 2*x2]) == [3.5, 7]);
%! assert(median ([y2, 3*y2]) == [4, 12]);
+%% Test multidimensional arrays (bug #35679)
+%!shared a, b, x, y
+%! rand ("seed", 2);
+%! a = rand (2,3,4,5);
+%! b = rand (3,4,6,5);
+%! x = sort (a, 4);
+%! y = sort (b, 3);
+%!assert (median (a, 4), x(:, :, :, 3));
+%!assert (median (b, 3), (y(:, :, 3, :) + y(:, :, 4, :))/2);
+
%!assert(median (single([1,2,3])), single(2));
%!assert(median ([1,2,NaN;4,5,6;NaN,8,9]), [NaN, 5, NaN]);
diff -uNr octave-3.6.1/scripts/statistics/distributions/poissrnd.m octave-3.6.2/scripts/statistics/distributions/poissrnd.m
--- octave-3.6.1/scripts/statistics/distributions/poissrnd.m 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/scripts/statistics/distributions/poissrnd.m 2012-05-30 21:43:28.000000000 -0400
@@ -76,7 +76,7 @@
endif
if (isscalar (lambda))
- if (lambda > 0 && lambda < Inf)
+ if (lambda >= 0 && lambda < Inf)
rnd = randp (lambda, sz);
if (strcmp (cls, "single"))
rnd = single (rnd);
@@ -87,13 +87,12 @@
else
rnd = NaN (sz, cls);
- k = (lambda > 0) & (lambda < Inf);
+ k = (lambda >= 0) & (lambda < Inf);
rnd(k) = randp (lambda(k));
endif
endfunction
-
%!assert(size (poissrnd (2)), [1, 1]);
%!assert(size (poissrnd (ones(2,1))), [2, 1]);
%!assert(size (poissrnd (ones(2,2))), [2, 2]);
@@ -118,3 +117,6 @@
%!error poissrnd (ones(2,2), [3, 2])
%!error poissrnd (ones(2,2), 2, 3)
+%!assert (poissrnd (0, 1, 1), 0)
+%!assert (poissrnd ([0, 0, 0], [1, 3]), [0 0 0])
+
diff -uNr octave-3.6.1/scripts/strings/base2dec.m octave-3.6.2/scripts/strings/base2dec.m
--- octave-3.6.1/scripts/strings/base2dec.m 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/scripts/strings/base2dec.m 2012-05-30 21:43:29.000000000 -0400
@@ -81,15 +81,34 @@
s = toupper (s);
endif
- ## Right justify the values before anything else.
- s = strjust (s, "right");
+ ## Right justify the values and squeeze out any spaces.
+ ## This looks complicated, but indexing solution is very fast
+ ## compared to alternatives which use cellstr or cellfun or looping.
+ [nr, nc] = size (s);
+ if (nc > 1) # Bug #35621
+ s = s.';
+ nonbl = s != " ";
+ num_nonbl = sum (nonbl);
+ nc = max (num_nonbl);
+ num_blank = nc - num_nonbl;
+ R = repmat ([1 2; 0 0], 1, nr);
+ R(2, 1:2:2*nr) = num_blank;
+ R(2, 2:2:2*nr) = num_nonbl;
+ idx = repelems ([false, true], R);
+ idx = reshape (idx, nc, nr);
+
+ ## Create a blank matrix and position the nonblank characters.
+ s2 = repmat (" ", nc, nr);
+ s2(idx) = s(nonbl);
+ s = s2.';
+ endif
## Lookup value of symbols in symbol table, with invalid symbols
## evaluating to NaN and space evaluating to 0.
table = NaN (1, 256);
table(toascii (symbols(1:base))) = 0 : base-1;
table(toascii (" ")) = 0;
- s = table(toascii (s));
+ s = reshape (table(toascii (s)), size (s));
## Multiply the resulting digits by the appropriate power
## and sum the rows.
@@ -103,6 +122,9 @@
%!assert(base2dec ("-1", 2), NaN);
%!assert(base2dec ({"A1", "1A"}, 16), [161; 26]);
+%% Bug #35621
+%!assert (base2dec (["0"; "1"], 2), [0; 1])
+
%%Test input validation
%!error base2dec ();
%!error base2dec ("11120");
diff -uNr octave-3.6.1/scripts/strings/bin2dec.m octave-3.6.2/scripts/strings/bin2dec.m
--- octave-3.6.1/scripts/strings/bin2dec.m 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/scripts/strings/bin2dec.m 2012-05-30 21:43:29.000000000 -0400
@@ -28,6 +28,16 @@
## @end group
## @end example
##
+## Spaces are ignored during conversion and may be used to make the binary
+## number more readable.
+##
+## @example
+## @group
+## bin2dec ("1000 0001")
+## @result{} 129
+## @end group
+## @end example
+##
## If @var{s} is a string matrix, return a column vector with one converted
## number per row of @var{s}; Invalid rows evaluate to NaN@.
##
@@ -54,6 +64,8 @@
%!assert(bin2dec ("1110"), 14);
%!assert(bin2dec ("11111111111111111111111111111111111111111111111111111"), 2^53-1);
%!assert(bin2dec ({"1110", "1111"}), [14; 15]);
+%!assert (bin2dec ("1 0 1"), 5)
+%!assert (bin2dec (char ("1 0 1", " 1111")), [5; 15]);
%%Test input validation
%!error bin2dec ();
diff -uNr octave-3.6.1/src/data.cc octave-3.6.2/src/data.cc
--- octave-3.6.1/src/data.cc 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/src/data.cc 2012-05-30 21:43:29.000000000 -0400
@@ -1294,7 +1294,20 @@
{
octave_idx_type m = args(1).int_value (), n = args(2).int_value ();
if (! error_state)
- retval = arg0.diag ().resize (dim_vector (m, n));
+ {
+ if (arg0.is_cell ())
+ {
+ Cell rhs = arg0.cell_value ();
+ Cell tmp (m, n);
+
+ for (octave_idx_type i = 0; i < rhs.numel (); i++)
+ tmp.xelem (i, i) = rhs.xelem (i);
+
+ retval = tmp;
+ }
+ else
+ retval = arg0.diag ().resize (dim_vector (m, n), true);
+ }
else
error ("diag: invalid dimensions");
}
@@ -1341,6 +1354,12 @@
%!assert(diag (int8([0, 1, 0, 0; 0, 0, 2, 0; 0, 0, 0, 3; 0, 0, 0, 0]), 1), int8([1; 2; 3]));
%!assert(diag (int8([0, 0, 0, 0; 1, 0, 0, 0; 0, 2, 0, 0; 0, 0, 3, 0]), -1), int8([1; 2; 3]));
+## Test non-square size
+%!assert(diag ([1,2,3], 6, 3), [1 0 0; 0 2 0; 0 0 3; 0 0 0; 0 0 0; 0 0 0])
+%!assert (diag (1, 2, 3), [1,0,0; 0,0,0]);
+%!assert (diag ({1}, 2, 3), {1,[],[]; [],[],[]});
+%!assert (diag ({1,2}, 3, 4), {1,[],[],[]; [],2,[],[]; [],[],[],[]});
+
%% Test input validation
%!error diag ();
%!error diag (1,2,3,4);
diff -uNr octave-3.6.1/src/DLD-FUNCTIONS/conv2.cc octave-3.6.2/src/DLD-FUNCTIONS/conv2.cc
--- octave-3.6.1/src/DLD-FUNCTIONS/conv2.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/src/DLD-FUNCTIONS/conv2.cc 2012-05-30 21:43:29.000000000 -0400
@@ -262,9 +262,18 @@
%% Test cases from Bug #34893
%!assert (conv2 ([1:5;1:5], [1:2], 'same'), [4 7 10 13 10; 4 7 10 13 10])
%!assert (conv2 ([1:5;1:5]', [1:2]', 'same'), [4 7 10 13 10; 4 7 10 13 10]')
-%!#assert (conv2 ([1:5;1:5], [1:2], 'valid'), [4 7 10 13; 4 7 10 13])
+%!assert (conv2 ([1:5;1:5], [1:2], 'valid'), [4 7 10 13; 4 7 10 13])
%!assert (conv2 ([1:5;1:5]', [1:2]', 'valid'), [4 7 10 13; 4 7 10 13]')
+%!test
+%! rand ("seed", 42);
+%! x = rand (100);
+%! y = ones (5);
+%! A = conv2 (x, y)(5:end-4,5:end-4);
+%! B = conv2 (x, y, "valid");
+%! assert (B, A); ## Yes, this test is for *exact* equivalence.
+
+
%% Test input validation
%!error conv2 ()
%!error conv2 (1)
diff -uNr octave-3.6.1/src/DLD-FUNCTIONS/kron.cc octave-3.6.2/src/DLD-FUNCTIONS/kron.cc
--- octave-3.6.1/src/DLD-FUNCTIONS/kron.cc 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/src/DLD-FUNCTIONS/kron.cc 2012-05-30 21:43:29.000000000 -0400
@@ -162,7 +162,6 @@
return c;
}
-
template
octave_value
do_kron (const octave_value& a, const octave_value& b)
@@ -183,12 +182,18 @@
if (b.is_diag_matrix () && a.rows () == a.columns ()
&& b.rows () == b.columns ())
{
- octave_value_list tmp;
- tmp(0) = a.diag ();
- tmp(1) = b.diag ();
- tmp = dispatch_kron (tmp, 1);
- if (tmp.length () == 1)
- retval = tmp(0).diag ();
+ // We have two diagonal matrices, the product of those will be
+ // another diagonal matrix. To do that efficiently, extract
+ // the diagonals as vectors and compute the product. That
+ // will be another vector, which we then use to construct a
+ // diagonal matrix object. Note that this will fail if our
+ // digaonal matrix object is modified to allow the non-zero
+ // values to be stored off of the principal diagonal (i.e., if
+ // diag ([1,2], 3) is modified to return a diagonal matrix
+ // object instead of a full matrix object).
+
+ octave_value tmp = dispatch_kron (a.diag (), b.diag ());
+ retval = tmp.diag ();
}
else if (a.is_single_type () || b.is_single_type ())
{
@@ -289,7 +294,6 @@
/*
-
%!test
%! x = ones(2);
%! assert( kron (x, x), ones (4));
@@ -302,4 +306,17 @@
%!assert (kron (x, y, z), kron (kron (x, y), z))
%!assert (kron (x, y, z), kron (x, kron (y, z)))
+
+%!assert (kron (diag ([1, 2]), diag ([3, 4])), diag ([3, 4, 6, 8]))
+
+%% Test for two diag matrices. See the comments above in
+%% dispatch_kron for this case.
+%%
+%!test
+%! expected = zeros (16, 16);
+%! expected (1, 11) = 3;
+%! expected (2, 12) = 4;
+%! expected (5, 15) = 6;
+%! expected (6, 16) = 8;
+%! assert (kron (diag ([1, 2], 2), diag ([3, 4], 2)), expected)
*/
diff -uNr octave-3.6.1/src/DLD-FUNCTIONS/__pchip_deriv__.cc octave-3.6.2/src/DLD-FUNCTIONS/__pchip_deriv__.cc
--- octave-3.6.1/src/DLD-FUNCTIONS/__pchip_deriv__.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/src/DLD-FUNCTIONS/__pchip_deriv__.cc 2012-05-30 21:43:29.000000000 -0400
@@ -69,6 +69,13 @@
FloatMatrix ymat (args(1).float_matrix_value ());
octave_idx_type nx = xvec.length ();
+
+ if (nx < 2)
+ {
+ error ("__pchip_deriv__: X must be at least of length 2");
+ return retval;
+ }
+
octave_idx_type nyr = ymat.rows ();
octave_idx_type nyc = ymat.columns ();
@@ -109,6 +116,13 @@
Matrix ymat (args(1).matrix_value ());
octave_idx_type nx = xvec.length ();
+
+ if (nx < 2)
+ {
+ error ("__pchip_deriv__: X must be at least of length 2");
+ return retval;
+ }
+
octave_idx_type nyr = ymat.rows ();
octave_idx_type nyc = ymat.columns ();
diff -uNr octave-3.6.1/src/DLD-FUNCTIONS/rand.cc octave-3.6.2/src/DLD-FUNCTIONS/rand.cc
--- octave-3.6.1/src/DLD-FUNCTIONS/rand.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/src/DLD-FUNCTIONS/rand.cc 2012-05-30 21:43:29.000000000 -0400
@@ -1086,14 +1086,19 @@
octave_idx_type k = i +
gnulib::floor (rvec[i] * (n - i));
- if (map.find(k) == map.end())
+ //For shuffling first m entries, no need to use extra
+ //storage
+ if (k < m)
{
- map[k] = ivec[i];
- ivec[i] = k;
+ std::swap (ivec[i], ivec[k]);
}
else
- std::swap (ivec[i], map[k]);
+ {
+ if (map.find (k) == map.end ())
+ map[k] = k;
+ std::swap (ivec[i], map[k]);
+ }
}
}
else
@@ -1126,6 +1131,13 @@
}
/*
-%!assert(sort (randperm (20)),1:20)
-%!assert(length (randperm (20,10)), 10)
+%!assert (sort (randperm (20)), 1:20)
+%!assert (length (randperm (20,10)), 10)
+
+%!test
+%! rand ("seed", 0);
+%! for i = 1:100
+%! p = randperm (305, 30);
+%! assert (length (unique (p)), 30);
+%! endfor
*/
diff -uNr octave-3.6.1/src/DLD-FUNCTIONS/regexp.cc octave-3.6.2/src/DLD-FUNCTIONS/regexp.cc
--- octave-3.6.1/src/DLD-FUNCTIONS/regexp.cc 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/src/DLD-FUNCTIONS/regexp.cc 2012-05-30 21:43:29.000000000 -0400
@@ -768,10 +768,20 @@
%! assert (nm.last{1},'Davis');
%! assert (nm.last{2},'Rogers');
+## Tests for named tokens
%!test
%! # Parenthesis in named token (ie (int)) causes a problem
%! assert (regexp('qwe int asd', ['(?(int))'], 'names'), struct ('typestr', 'int'));
+%!test
+%! ## Mix of named and unnamed tokens can cause segfault (bug #35683)
+%! str = "abcde";
+%! ptn = '(?a)(\w+)(?d\w+)';
+%! tokens = regexp (str, ptn, "names");
+%! assert (isstruct (tokens) && numel (tokens) == 1);
+%! assert (tokens.T1, "a");
+%! assert (tokens.T2, "de");
+
%!assert(regexp("abc\nabc",'.'),[1:7])
%!assert(regexp("abc\nabc",'.','dotall'),[1:7])
%!test
diff -uNr octave-3.6.1/src/DLD-FUNCTIONS/schur.cc octave-3.6.2/src/DLD-FUNCTIONS/schur.cc
--- octave-3.6.1/src/DLD-FUNCTIONS/schur.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/src/DLD-FUNCTIONS/schur.cc 2012-05-30 21:43:29.000000000 -0400
@@ -376,4 +376,9 @@
%! assert (norm (tril (T, -1)), 0)
%! assert (norm (U * U'), 1, 1e-14)
+%!test
+%! A = [0, 1;-1, 0];
+%! [u, t] = schur (A);
+%! [U, T] = rsf2csf (u,t);
+%! assert (U * T * U', A, 1e-14)
*/
diff -uNr octave-3.6.1/src/graphics.h.in octave-3.6.2/src/graphics.h.in
--- octave-3.6.1/src/graphics.h.in 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/src/graphics.h.in 2012-05-30 21:43:29.000000000 -0400
@@ -4577,7 +4577,7 @@
string_property ydatasource , ""
string_property zdatasource , ""
string_property cdatasource , ""
- color_property facecolor , "{flat}|none|interp"
+ color_property facecolor , "{flat}|none|interp|texturemap"
double_radio_property facealpha , double_radio_property (1.0, radio_values ("flat|interp"))
color_property edgecolor , color_property (color_values (0, 0, 0), radio_values ("flat|none|interp"))
radio_property linestyle , "{-}|--|:|-.|none"
diff -uNr octave-3.6.1/src/graphics-props.cc octave-3.6.2/src/graphics-props.cc
--- octave-3.6.1/src/graphics-props.cc 2012-02-22 14:51:02.000000000 -0500
+++ octave-3.6.2/src/graphics-props.cc 2012-05-31 11:29:13.000000000 -0400
@@ -4237,7 +4237,7 @@
ydatasource ("ydatasource", mh, ""),
zdatasource ("zdatasource", mh, ""),
cdatasource ("cdatasource", mh, ""),
- facecolor ("facecolor", mh, "{flat}|none|interp"),
+ facecolor ("facecolor", mh, "{flat}|none|interp|texturemap"),
facealpha ("facealpha", mh, double_radio_property (1.0, radio_values ("flat|interp"))),
edgecolor ("edgecolor", mh, color_property (color_values (0, 0, 0), radio_values ("flat|none|interp"))),
linestyle ("linestyle", mh, "{-}|--|:|-.|none"),
@@ -4716,7 +4716,7 @@
m["ydatasource"] = "";
m["zdatasource"] = "";
m["cdatasource"] = "";
- m["facecolor"] = "{flat}|none|interp";
+ m["facecolor"] = "{flat}|none|interp|texturemap";
m["facealpha"] = double_radio_property (1.0, radio_values ("flat|interp"));
m["edgecolor"] = color_property (color_values (0, 0, 0), radio_values ("flat|none|interp"));
m["linestyle"] = "-";
diff -uNr octave-3.6.1/src/Makefile.am octave-3.6.2/src/Makefile.am
--- octave-3.6.1/src/Makefile.am 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/src/Makefile.am 2012-05-30 21:43:29.000000000 -0400
@@ -20,11 +20,13 @@
include $(top_srcdir)/build-aux/common.mk
+## Search local directories before those specified by the user.
AM_CPPFLAGS = \
- @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu \
+ -I../libgnu -I$(top_srcdir)/libgnu \
-I$(top_srcdir)/libcruft/misc \
-I../liboctave -I$(top_srcdir)/liboctave \
- -I. -I$(srcdir)
+ -I. -I$(srcdir) \
+ @CPPFLAGS@
AUTOMAKE_OPTIONS = subdir-objects
@@ -516,7 +518,7 @@
# Increment these as needed and according to the rules in the libtool manual:
liboctinterp_current = 1
-liboctinterp_revision = 1
+liboctinterp_revision = 2
liboctinterp_age = 0
liboctinterp_version_info = $(liboctinterp_current):$(liboctinterp_revision):$(liboctinterp_age)
diff -uNr octave-3.6.1/src/Makefile.in octave-3.6.2/src/Makefile.in
--- octave-3.6.1/src/Makefile.in 2012-02-22 14:46:13.000000000 -0500
+++ octave-3.6.2/src/Makefile.in 2012-05-31 11:24:31.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -203,6 +203,12 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(octlibdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(octincludedir)" \
"$(DESTDIR)$(octincludedir)"
@@ -1595,13 +1601,13 @@
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+ --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
YLWRAP = $(top_srcdir)/build-aux/ylwrap
-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
+ --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
SOURCES = $(DLD_FUNCTIONS___contourc___la_SOURCES) \
$(DLD_FUNCTIONS___delaunayn___la_SOURCES) \
$(DLD_FUNCTIONS___dispatch___la_SOURCES) \
@@ -3131,10 +3137,11 @@
# a space, so protect with $(null))
null =
AM_CPPFLAGS = \
- @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu \
+ -I../libgnu -I$(top_srcdir)/libgnu \
-I$(top_srcdir)/libcruft/misc \
-I../liboctave -I$(top_srcdir)/liboctave \
- -I. -I$(srcdir)
+ -I. -I$(srcdir) \
+ @CPPFLAGS@
AUTOMAKE_OPTIONS = subdir-objects
octlib_LTLIBRARIES = liboctinterp.la $(am__append_1)
@@ -4044,7 +4051,7 @@
# Increment these as needed and according to the rules in the libtool manual:
liboctinterp_current = 1
-liboctinterp_revision = 1
+liboctinterp_revision = 2
liboctinterp_age = 0
liboctinterp_version_info = $(liboctinterp_current):$(liboctinterp_revision):$(liboctinterp_age)
liboctinterp_la_LDFLAGS = \
@@ -4117,6 +4124,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build-aux/common.mk $(srcdir)/DLD-FUNCTIONS/module.mk $(srcdir)/OPERATORS/module.mk $(srcdir)/TEMPLATE-INST/module.mk $(srcdir)/link-deps.mk $(srcdir)/../liboctave/link-deps.mk $(srcdir)/../libcruft/link-deps.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4174,353 +4182,353 @@
@: > DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
DLD-FUNCTIONS/__contourc__.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__contourc__.la: $(DLD_FUNCTIONS___contourc___la_OBJECTS) $(DLD_FUNCTIONS___contourc___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__contourc__.la: $(DLD_FUNCTIONS___contourc___la_OBJECTS) $(DLD_FUNCTIONS___contourc___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___contourc___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___contourc___la_LINK) $(am_DLD_FUNCTIONS___contourc___la_rpath) $(DLD_FUNCTIONS___contourc___la_OBJECTS) $(DLD_FUNCTIONS___contourc___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS___delaunayn___la-__delaunayn__.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__delaunayn__.la: $(DLD_FUNCTIONS___delaunayn___la_OBJECTS) $(DLD_FUNCTIONS___delaunayn___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__delaunayn__.la: $(DLD_FUNCTIONS___delaunayn___la_OBJECTS) $(DLD_FUNCTIONS___delaunayn___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___delaunayn___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___delaunayn___la_LINK) $(am_DLD_FUNCTIONS___delaunayn___la_rpath) $(DLD_FUNCTIONS___delaunayn___la_OBJECTS) $(DLD_FUNCTIONS___delaunayn___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/__dispatch__.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__dispatch__.la: $(DLD_FUNCTIONS___dispatch___la_OBJECTS) $(DLD_FUNCTIONS___dispatch___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__dispatch__.la: $(DLD_FUNCTIONS___dispatch___la_OBJECTS) $(DLD_FUNCTIONS___dispatch___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___dispatch___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___dispatch___la_LINK) $(am_DLD_FUNCTIONS___dispatch___la_rpath) $(DLD_FUNCTIONS___dispatch___la_OBJECTS) $(DLD_FUNCTIONS___dispatch___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/__dsearchn__.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__dsearchn__.la: $(DLD_FUNCTIONS___dsearchn___la_OBJECTS) $(DLD_FUNCTIONS___dsearchn___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__dsearchn__.la: $(DLD_FUNCTIONS___dsearchn___la_OBJECTS) $(DLD_FUNCTIONS___dsearchn___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___dsearchn___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___dsearchn___la_LINK) $(am_DLD_FUNCTIONS___dsearchn___la_rpath) $(DLD_FUNCTIONS___dsearchn___la_OBJECTS) $(DLD_FUNCTIONS___dsearchn___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS___fltk_uigetfile___la-__fltk_uigetfile__.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__fltk_uigetfile__.la: $(DLD_FUNCTIONS___fltk_uigetfile___la_OBJECTS) $(DLD_FUNCTIONS___fltk_uigetfile___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__fltk_uigetfile__.la: $(DLD_FUNCTIONS___fltk_uigetfile___la_OBJECTS) $(DLD_FUNCTIONS___fltk_uigetfile___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___fltk_uigetfile___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___fltk_uigetfile___la_LINK) $(am_DLD_FUNCTIONS___fltk_uigetfile___la_rpath) $(DLD_FUNCTIONS___fltk_uigetfile___la_OBJECTS) $(DLD_FUNCTIONS___fltk_uigetfile___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS___glpk___la-__glpk__.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__glpk__.la: $(DLD_FUNCTIONS___glpk___la_OBJECTS) $(DLD_FUNCTIONS___glpk___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__glpk__.la: $(DLD_FUNCTIONS___glpk___la_OBJECTS) $(DLD_FUNCTIONS___glpk___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___glpk___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___glpk___la_LINK) $(am_DLD_FUNCTIONS___glpk___la_rpath) $(DLD_FUNCTIONS___glpk___la_OBJECTS) $(DLD_FUNCTIONS___glpk___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS___init_fltk___la-__init_fltk__.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__init_fltk__.la: $(DLD_FUNCTIONS___init_fltk___la_OBJECTS) $(DLD_FUNCTIONS___init_fltk___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__init_fltk__.la: $(DLD_FUNCTIONS___init_fltk___la_OBJECTS) $(DLD_FUNCTIONS___init_fltk___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___init_fltk___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___init_fltk___la_LINK) $(am_DLD_FUNCTIONS___init_fltk___la_rpath) $(DLD_FUNCTIONS___init_fltk___la_OBJECTS) $(DLD_FUNCTIONS___init_fltk___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/__init_gnuplot__.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__init_gnuplot__.la: $(DLD_FUNCTIONS___init_gnuplot___la_OBJECTS) $(DLD_FUNCTIONS___init_gnuplot___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__init_gnuplot__.la: $(DLD_FUNCTIONS___init_gnuplot___la_OBJECTS) $(DLD_FUNCTIONS___init_gnuplot___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___init_gnuplot___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___init_gnuplot___la_LINK) $(am_DLD_FUNCTIONS___init_gnuplot___la_rpath) $(DLD_FUNCTIONS___init_gnuplot___la_OBJECTS) $(DLD_FUNCTIONS___init_gnuplot___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/__lin_interpn__.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__lin_interpn__.la: $(DLD_FUNCTIONS___lin_interpn___la_OBJECTS) $(DLD_FUNCTIONS___lin_interpn___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__lin_interpn__.la: $(DLD_FUNCTIONS___lin_interpn___la_OBJECTS) $(DLD_FUNCTIONS___lin_interpn___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___lin_interpn___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___lin_interpn___la_LINK) $(am_DLD_FUNCTIONS___lin_interpn___la_rpath) $(DLD_FUNCTIONS___lin_interpn___la_OBJECTS) $(DLD_FUNCTIONS___lin_interpn___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS___magick_read___la-__magick_read__.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__magick_read__.la: $(DLD_FUNCTIONS___magick_read___la_OBJECTS) $(DLD_FUNCTIONS___magick_read___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__magick_read__.la: $(DLD_FUNCTIONS___magick_read___la_OBJECTS) $(DLD_FUNCTIONS___magick_read___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___magick_read___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___magick_read___la_LINK) $(am_DLD_FUNCTIONS___magick_read___la_rpath) $(DLD_FUNCTIONS___magick_read___la_OBJECTS) $(DLD_FUNCTIONS___magick_read___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/__pchip_deriv__.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__pchip_deriv__.la: $(DLD_FUNCTIONS___pchip_deriv___la_OBJECTS) $(DLD_FUNCTIONS___pchip_deriv___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__pchip_deriv__.la: $(DLD_FUNCTIONS___pchip_deriv___la_OBJECTS) $(DLD_FUNCTIONS___pchip_deriv___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___pchip_deriv___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___pchip_deriv___la_LINK) $(am_DLD_FUNCTIONS___pchip_deriv___la_rpath) $(DLD_FUNCTIONS___pchip_deriv___la_OBJECTS) $(DLD_FUNCTIONS___pchip_deriv___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/__qp__.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__qp__.la: $(DLD_FUNCTIONS___qp___la_OBJECTS) $(DLD_FUNCTIONS___qp___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__qp__.la: $(DLD_FUNCTIONS___qp___la_OBJECTS) $(DLD_FUNCTIONS___qp___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___qp___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___qp___la_LINK) $(am_DLD_FUNCTIONS___qp___la_rpath) $(DLD_FUNCTIONS___qp___la_OBJECTS) $(DLD_FUNCTIONS___qp___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS___voronoi___la-__voronoi__.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/__voronoi__.la: $(DLD_FUNCTIONS___voronoi___la_OBJECTS) $(DLD_FUNCTIONS___voronoi___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/__voronoi__.la: $(DLD_FUNCTIONS___voronoi___la_OBJECTS) $(DLD_FUNCTIONS___voronoi___la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS___voronoi___la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS___voronoi___la_LINK) $(am_DLD_FUNCTIONS___voronoi___la_rpath) $(DLD_FUNCTIONS___voronoi___la_OBJECTS) $(DLD_FUNCTIONS___voronoi___la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_amd_la-amd.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/amd.la: $(DLD_FUNCTIONS_amd_la_OBJECTS) $(DLD_FUNCTIONS_amd_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/amd.la: $(DLD_FUNCTIONS_amd_la_OBJECTS) $(DLD_FUNCTIONS_amd_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_amd_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_amd_la_LINK) $(am_DLD_FUNCTIONS_amd_la_rpath) $(DLD_FUNCTIONS_amd_la_OBJECTS) $(DLD_FUNCTIONS_amd_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/balance.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/balance.la: $(DLD_FUNCTIONS_balance_la_OBJECTS) $(DLD_FUNCTIONS_balance_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/balance.la: $(DLD_FUNCTIONS_balance_la_OBJECTS) $(DLD_FUNCTIONS_balance_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_balance_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_balance_la_LINK) $(am_DLD_FUNCTIONS_balance_la_rpath) $(DLD_FUNCTIONS_balance_la_OBJECTS) $(DLD_FUNCTIONS_balance_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/besselj.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/besselj.la: $(DLD_FUNCTIONS_besselj_la_OBJECTS) $(DLD_FUNCTIONS_besselj_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/besselj.la: $(DLD_FUNCTIONS_besselj_la_OBJECTS) $(DLD_FUNCTIONS_besselj_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_besselj_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_besselj_la_LINK) $(am_DLD_FUNCTIONS_besselj_la_rpath) $(DLD_FUNCTIONS_besselj_la_OBJECTS) $(DLD_FUNCTIONS_besselj_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/betainc.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/betainc.la: $(DLD_FUNCTIONS_betainc_la_OBJECTS) $(DLD_FUNCTIONS_betainc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/betainc.la: $(DLD_FUNCTIONS_betainc_la_OBJECTS) $(DLD_FUNCTIONS_betainc_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_betainc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_betainc_la_LINK) $(am_DLD_FUNCTIONS_betainc_la_rpath) $(DLD_FUNCTIONS_betainc_la_OBJECTS) $(DLD_FUNCTIONS_betainc_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/bsxfun.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/bsxfun.la: $(DLD_FUNCTIONS_bsxfun_la_OBJECTS) $(DLD_FUNCTIONS_bsxfun_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/bsxfun.la: $(DLD_FUNCTIONS_bsxfun_la_OBJECTS) $(DLD_FUNCTIONS_bsxfun_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_bsxfun_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_bsxfun_la_LINK) $(am_DLD_FUNCTIONS_bsxfun_la_rpath) $(DLD_FUNCTIONS_bsxfun_la_OBJECTS) $(DLD_FUNCTIONS_bsxfun_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_ccolamd_la-ccolamd.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/ccolamd.la: $(DLD_FUNCTIONS_ccolamd_la_OBJECTS) $(DLD_FUNCTIONS_ccolamd_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/ccolamd.la: $(DLD_FUNCTIONS_ccolamd_la_OBJECTS) $(DLD_FUNCTIONS_ccolamd_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_ccolamd_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_ccolamd_la_LINK) $(am_DLD_FUNCTIONS_ccolamd_la_rpath) $(DLD_FUNCTIONS_ccolamd_la_OBJECTS) $(DLD_FUNCTIONS_ccolamd_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/cellfun.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/cellfun.la: $(DLD_FUNCTIONS_cellfun_la_OBJECTS) $(DLD_FUNCTIONS_cellfun_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/cellfun.la: $(DLD_FUNCTIONS_cellfun_la_OBJECTS) $(DLD_FUNCTIONS_cellfun_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_cellfun_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_cellfun_la_LINK) $(am_DLD_FUNCTIONS_cellfun_la_rpath) $(DLD_FUNCTIONS_cellfun_la_OBJECTS) $(DLD_FUNCTIONS_cellfun_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_chol_la-chol.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/chol.la: $(DLD_FUNCTIONS_chol_la_OBJECTS) $(DLD_FUNCTIONS_chol_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/chol.la: $(DLD_FUNCTIONS_chol_la_OBJECTS) $(DLD_FUNCTIONS_chol_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_chol_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_chol_la_LINK) $(am_DLD_FUNCTIONS_chol_la_rpath) $(DLD_FUNCTIONS_chol_la_OBJECTS) $(DLD_FUNCTIONS_chol_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_colamd_la-colamd.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/colamd.la: $(DLD_FUNCTIONS_colamd_la_OBJECTS) $(DLD_FUNCTIONS_colamd_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/colamd.la: $(DLD_FUNCTIONS_colamd_la_OBJECTS) $(DLD_FUNCTIONS_colamd_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_colamd_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_colamd_la_LINK) $(am_DLD_FUNCTIONS_colamd_la_rpath) $(DLD_FUNCTIONS_colamd_la_OBJECTS) $(DLD_FUNCTIONS_colamd_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/colloc.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/colloc.la: $(DLD_FUNCTIONS_colloc_la_OBJECTS) $(DLD_FUNCTIONS_colloc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/colloc.la: $(DLD_FUNCTIONS_colloc_la_OBJECTS) $(DLD_FUNCTIONS_colloc_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_colloc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_colloc_la_LINK) $(am_DLD_FUNCTIONS_colloc_la_rpath) $(DLD_FUNCTIONS_colloc_la_OBJECTS) $(DLD_FUNCTIONS_colloc_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/conv2.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/conv2.la: $(DLD_FUNCTIONS_conv2_la_OBJECTS) $(DLD_FUNCTIONS_conv2_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/conv2.la: $(DLD_FUNCTIONS_conv2_la_OBJECTS) $(DLD_FUNCTIONS_conv2_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_conv2_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_conv2_la_LINK) $(am_DLD_FUNCTIONS_conv2_la_rpath) $(DLD_FUNCTIONS_conv2_la_OBJECTS) $(DLD_FUNCTIONS_conv2_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_convhulln_la-convhulln.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/convhulln.la: $(DLD_FUNCTIONS_convhulln_la_OBJECTS) $(DLD_FUNCTIONS_convhulln_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/convhulln.la: $(DLD_FUNCTIONS_convhulln_la_OBJECTS) $(DLD_FUNCTIONS_convhulln_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_convhulln_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_convhulln_la_LINK) $(am_DLD_FUNCTIONS_convhulln_la_rpath) $(DLD_FUNCTIONS_convhulln_la_OBJECTS) $(DLD_FUNCTIONS_convhulln_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/daspk.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/daspk.la: $(DLD_FUNCTIONS_daspk_la_OBJECTS) $(DLD_FUNCTIONS_daspk_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/daspk.la: $(DLD_FUNCTIONS_daspk_la_OBJECTS) $(DLD_FUNCTIONS_daspk_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_daspk_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_daspk_la_LINK) $(am_DLD_FUNCTIONS_daspk_la_rpath) $(DLD_FUNCTIONS_daspk_la_OBJECTS) $(DLD_FUNCTIONS_daspk_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/dasrt.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/dasrt.la: $(DLD_FUNCTIONS_dasrt_la_OBJECTS) $(DLD_FUNCTIONS_dasrt_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/dasrt.la: $(DLD_FUNCTIONS_dasrt_la_OBJECTS) $(DLD_FUNCTIONS_dasrt_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_dasrt_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_dasrt_la_LINK) $(am_DLD_FUNCTIONS_dasrt_la_rpath) $(DLD_FUNCTIONS_dasrt_la_OBJECTS) $(DLD_FUNCTIONS_dasrt_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/dassl.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/dassl.la: $(DLD_FUNCTIONS_dassl_la_OBJECTS) $(DLD_FUNCTIONS_dassl_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/dassl.la: $(DLD_FUNCTIONS_dassl_la_OBJECTS) $(DLD_FUNCTIONS_dassl_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_dassl_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_dassl_la_LINK) $(am_DLD_FUNCTIONS_dassl_la_rpath) $(DLD_FUNCTIONS_dassl_la_OBJECTS) $(DLD_FUNCTIONS_dassl_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/det.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/det.la: $(DLD_FUNCTIONS_det_la_OBJECTS) $(DLD_FUNCTIONS_det_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/det.la: $(DLD_FUNCTIONS_det_la_OBJECTS) $(DLD_FUNCTIONS_det_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_det_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_det_la_LINK) $(am_DLD_FUNCTIONS_det_la_rpath) $(DLD_FUNCTIONS_det_la_OBJECTS) $(DLD_FUNCTIONS_det_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/dlmread.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/dlmread.la: $(DLD_FUNCTIONS_dlmread_la_OBJECTS) $(DLD_FUNCTIONS_dlmread_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/dlmread.la: $(DLD_FUNCTIONS_dlmread_la_OBJECTS) $(DLD_FUNCTIONS_dlmread_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_dlmread_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_dlmread_la_LINK) $(am_DLD_FUNCTIONS_dlmread_la_rpath) $(DLD_FUNCTIONS_dlmread_la_OBJECTS) $(DLD_FUNCTIONS_dlmread_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_dmperm_la-dmperm.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/dmperm.la: $(DLD_FUNCTIONS_dmperm_la_OBJECTS) $(DLD_FUNCTIONS_dmperm_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/dmperm.la: $(DLD_FUNCTIONS_dmperm_la_OBJECTS) $(DLD_FUNCTIONS_dmperm_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_dmperm_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_dmperm_la_LINK) $(am_DLD_FUNCTIONS_dmperm_la_rpath) $(DLD_FUNCTIONS_dmperm_la_OBJECTS) $(DLD_FUNCTIONS_dmperm_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/dot.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/dot.la: $(DLD_FUNCTIONS_dot_la_OBJECTS) $(DLD_FUNCTIONS_dot_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/dot.la: $(DLD_FUNCTIONS_dot_la_OBJECTS) $(DLD_FUNCTIONS_dot_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_dot_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_dot_la_LINK) $(am_DLD_FUNCTIONS_dot_la_rpath) $(DLD_FUNCTIONS_dot_la_OBJECTS) $(DLD_FUNCTIONS_dot_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/eig.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/eig.la: $(DLD_FUNCTIONS_eig_la_OBJECTS) $(DLD_FUNCTIONS_eig_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/eig.la: $(DLD_FUNCTIONS_eig_la_OBJECTS) $(DLD_FUNCTIONS_eig_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_eig_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_eig_la_LINK) $(am_DLD_FUNCTIONS_eig_la_rpath) $(DLD_FUNCTIONS_eig_la_OBJECTS) $(DLD_FUNCTIONS_eig_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_eigs_la-eigs.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/eigs.la: $(DLD_FUNCTIONS_eigs_la_OBJECTS) $(DLD_FUNCTIONS_eigs_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/eigs.la: $(DLD_FUNCTIONS_eigs_la_OBJECTS) $(DLD_FUNCTIONS_eigs_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_eigs_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_eigs_la_LINK) $(am_DLD_FUNCTIONS_eigs_la_rpath) $(DLD_FUNCTIONS_eigs_la_OBJECTS) $(DLD_FUNCTIONS_eigs_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_fft_la-fft.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/fft.la: $(DLD_FUNCTIONS_fft_la_OBJECTS) $(DLD_FUNCTIONS_fft_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/fft.la: $(DLD_FUNCTIONS_fft_la_OBJECTS) $(DLD_FUNCTIONS_fft_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_fft_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_fft_la_LINK) $(am_DLD_FUNCTIONS_fft_la_rpath) $(DLD_FUNCTIONS_fft_la_OBJECTS) $(DLD_FUNCTIONS_fft_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_fft2_la-fft2.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/fft2.la: $(DLD_FUNCTIONS_fft2_la_OBJECTS) $(DLD_FUNCTIONS_fft2_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/fft2.la: $(DLD_FUNCTIONS_fft2_la_OBJECTS) $(DLD_FUNCTIONS_fft2_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_fft2_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_fft2_la_LINK) $(am_DLD_FUNCTIONS_fft2_la_rpath) $(DLD_FUNCTIONS_fft2_la_OBJECTS) $(DLD_FUNCTIONS_fft2_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_fftn_la-fftn.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/fftn.la: $(DLD_FUNCTIONS_fftn_la_OBJECTS) $(DLD_FUNCTIONS_fftn_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/fftn.la: $(DLD_FUNCTIONS_fftn_la_OBJECTS) $(DLD_FUNCTIONS_fftn_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_fftn_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_fftn_la_LINK) $(am_DLD_FUNCTIONS_fftn_la_rpath) $(DLD_FUNCTIONS_fftn_la_OBJECTS) $(DLD_FUNCTIONS_fftn_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_fftw_la-fftw.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/fftw.la: $(DLD_FUNCTIONS_fftw_la_OBJECTS) $(DLD_FUNCTIONS_fftw_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/fftw.la: $(DLD_FUNCTIONS_fftw_la_OBJECTS) $(DLD_FUNCTIONS_fftw_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_fftw_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_fftw_la_LINK) $(am_DLD_FUNCTIONS_fftw_la_rpath) $(DLD_FUNCTIONS_fftw_la_OBJECTS) $(DLD_FUNCTIONS_fftw_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/filter.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/filter.la: $(DLD_FUNCTIONS_filter_la_OBJECTS) $(DLD_FUNCTIONS_filter_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/filter.la: $(DLD_FUNCTIONS_filter_la_OBJECTS) $(DLD_FUNCTIONS_filter_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_filter_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_filter_la_LINK) $(am_DLD_FUNCTIONS_filter_la_rpath) $(DLD_FUNCTIONS_filter_la_OBJECTS) $(DLD_FUNCTIONS_filter_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/find.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/find.la: $(DLD_FUNCTIONS_find_la_OBJECTS) $(DLD_FUNCTIONS_find_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/find.la: $(DLD_FUNCTIONS_find_la_OBJECTS) $(DLD_FUNCTIONS_find_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_find_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_find_la_LINK) $(am_DLD_FUNCTIONS_find_la_rpath) $(DLD_FUNCTIONS_find_la_OBJECTS) $(DLD_FUNCTIONS_find_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/gammainc.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/gammainc.la: $(DLD_FUNCTIONS_gammainc_la_OBJECTS) $(DLD_FUNCTIONS_gammainc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/gammainc.la: $(DLD_FUNCTIONS_gammainc_la_OBJECTS) $(DLD_FUNCTIONS_gammainc_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_gammainc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_gammainc_la_LINK) $(am_DLD_FUNCTIONS_gammainc_la_rpath) $(DLD_FUNCTIONS_gammainc_la_OBJECTS) $(DLD_FUNCTIONS_gammainc_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/gcd.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/gcd.la: $(DLD_FUNCTIONS_gcd_la_OBJECTS) $(DLD_FUNCTIONS_gcd_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/gcd.la: $(DLD_FUNCTIONS_gcd_la_OBJECTS) $(DLD_FUNCTIONS_gcd_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_gcd_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_gcd_la_LINK) $(am_DLD_FUNCTIONS_gcd_la_rpath) $(DLD_FUNCTIONS_gcd_la_OBJECTS) $(DLD_FUNCTIONS_gcd_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/getgrent.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/getgrent.la: $(DLD_FUNCTIONS_getgrent_la_OBJECTS) $(DLD_FUNCTIONS_getgrent_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/getgrent.la: $(DLD_FUNCTIONS_getgrent_la_OBJECTS) $(DLD_FUNCTIONS_getgrent_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_getgrent_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_getgrent_la_LINK) $(am_DLD_FUNCTIONS_getgrent_la_rpath) $(DLD_FUNCTIONS_getgrent_la_OBJECTS) $(DLD_FUNCTIONS_getgrent_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/getpwent.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/getpwent.la: $(DLD_FUNCTIONS_getpwent_la_OBJECTS) $(DLD_FUNCTIONS_getpwent_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/getpwent.la: $(DLD_FUNCTIONS_getpwent_la_OBJECTS) $(DLD_FUNCTIONS_getpwent_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_getpwent_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_getpwent_la_LINK) $(am_DLD_FUNCTIONS_getpwent_la_rpath) $(DLD_FUNCTIONS_getpwent_la_OBJECTS) $(DLD_FUNCTIONS_getpwent_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/getrusage.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/getrusage.la: $(DLD_FUNCTIONS_getrusage_la_OBJECTS) $(DLD_FUNCTIONS_getrusage_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/getrusage.la: $(DLD_FUNCTIONS_getrusage_la_OBJECTS) $(DLD_FUNCTIONS_getrusage_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_getrusage_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_getrusage_la_LINK) $(am_DLD_FUNCTIONS_getrusage_la_rpath) $(DLD_FUNCTIONS_getrusage_la_OBJECTS) $(DLD_FUNCTIONS_getrusage_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/givens.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/givens.la: $(DLD_FUNCTIONS_givens_la_OBJECTS) $(DLD_FUNCTIONS_givens_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/givens.la: $(DLD_FUNCTIONS_givens_la_OBJECTS) $(DLD_FUNCTIONS_givens_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_givens_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_givens_la_LINK) $(am_DLD_FUNCTIONS_givens_la_rpath) $(DLD_FUNCTIONS_givens_la_OBJECTS) $(DLD_FUNCTIONS_givens_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/hess.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/hess.la: $(DLD_FUNCTIONS_hess_la_OBJECTS) $(DLD_FUNCTIONS_hess_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/hess.la: $(DLD_FUNCTIONS_hess_la_OBJECTS) $(DLD_FUNCTIONS_hess_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_hess_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_hess_la_LINK) $(am_DLD_FUNCTIONS_hess_la_rpath) $(DLD_FUNCTIONS_hess_la_OBJECTS) $(DLD_FUNCTIONS_hess_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/hex2num.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/hex2num.la: $(DLD_FUNCTIONS_hex2num_la_OBJECTS) $(DLD_FUNCTIONS_hex2num_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/hex2num.la: $(DLD_FUNCTIONS_hex2num_la_OBJECTS) $(DLD_FUNCTIONS_hex2num_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_hex2num_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_hex2num_la_LINK) $(am_DLD_FUNCTIONS_hex2num_la_rpath) $(DLD_FUNCTIONS_hex2num_la_OBJECTS) $(DLD_FUNCTIONS_hex2num_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/inv.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/inv.la: $(DLD_FUNCTIONS_inv_la_OBJECTS) $(DLD_FUNCTIONS_inv_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/inv.la: $(DLD_FUNCTIONS_inv_la_OBJECTS) $(DLD_FUNCTIONS_inv_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_inv_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_inv_la_LINK) $(am_DLD_FUNCTIONS_inv_la_rpath) $(DLD_FUNCTIONS_inv_la_OBJECTS) $(DLD_FUNCTIONS_inv_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/kron.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/kron.la: $(DLD_FUNCTIONS_kron_la_OBJECTS) $(DLD_FUNCTIONS_kron_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/kron.la: $(DLD_FUNCTIONS_kron_la_OBJECTS) $(DLD_FUNCTIONS_kron_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_kron_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_kron_la_LINK) $(am_DLD_FUNCTIONS_kron_la_rpath) $(DLD_FUNCTIONS_kron_la_OBJECTS) $(DLD_FUNCTIONS_kron_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/lookup.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/lookup.la: $(DLD_FUNCTIONS_lookup_la_OBJECTS) $(DLD_FUNCTIONS_lookup_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/lookup.la: $(DLD_FUNCTIONS_lookup_la_OBJECTS) $(DLD_FUNCTIONS_lookup_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_lookup_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_lookup_la_LINK) $(am_DLD_FUNCTIONS_lookup_la_rpath) $(DLD_FUNCTIONS_lookup_la_OBJECTS) $(DLD_FUNCTIONS_lookup_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/lsode.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/lsode.la: $(DLD_FUNCTIONS_lsode_la_OBJECTS) $(DLD_FUNCTIONS_lsode_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/lsode.la: $(DLD_FUNCTIONS_lsode_la_OBJECTS) $(DLD_FUNCTIONS_lsode_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_lsode_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_lsode_la_LINK) $(am_DLD_FUNCTIONS_lsode_la_rpath) $(DLD_FUNCTIONS_lsode_la_OBJECTS) $(DLD_FUNCTIONS_lsode_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/lu.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/lu.la: $(DLD_FUNCTIONS_lu_la_OBJECTS) $(DLD_FUNCTIONS_lu_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/lu.la: $(DLD_FUNCTIONS_lu_la_OBJECTS) $(DLD_FUNCTIONS_lu_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_lu_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_lu_la_LINK) $(am_DLD_FUNCTIONS_lu_la_rpath) $(DLD_FUNCTIONS_lu_la_OBJECTS) $(DLD_FUNCTIONS_lu_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/luinc.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/luinc.la: $(DLD_FUNCTIONS_luinc_la_OBJECTS) $(DLD_FUNCTIONS_luinc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/luinc.la: $(DLD_FUNCTIONS_luinc_la_OBJECTS) $(DLD_FUNCTIONS_luinc_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_luinc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_luinc_la_LINK) $(am_DLD_FUNCTIONS_luinc_la_rpath) $(DLD_FUNCTIONS_luinc_la_OBJECTS) $(DLD_FUNCTIONS_luinc_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/matrix_type.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/matrix_type.la: $(DLD_FUNCTIONS_matrix_type_la_OBJECTS) $(DLD_FUNCTIONS_matrix_type_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/matrix_type.la: $(DLD_FUNCTIONS_matrix_type_la_OBJECTS) $(DLD_FUNCTIONS_matrix_type_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_matrix_type_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_matrix_type_la_LINK) $(am_DLD_FUNCTIONS_matrix_type_la_rpath) $(DLD_FUNCTIONS_matrix_type_la_OBJECTS) $(DLD_FUNCTIONS_matrix_type_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/max.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/max.la: $(DLD_FUNCTIONS_max_la_OBJECTS) $(DLD_FUNCTIONS_max_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/max.la: $(DLD_FUNCTIONS_max_la_OBJECTS) $(DLD_FUNCTIONS_max_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_max_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_max_la_LINK) $(am_DLD_FUNCTIONS_max_la_rpath) $(DLD_FUNCTIONS_max_la_OBJECTS) $(DLD_FUNCTIONS_max_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/md5sum.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/md5sum.la: $(DLD_FUNCTIONS_md5sum_la_OBJECTS) $(DLD_FUNCTIONS_md5sum_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/md5sum.la: $(DLD_FUNCTIONS_md5sum_la_OBJECTS) $(DLD_FUNCTIONS_md5sum_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_md5sum_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_md5sum_la_LINK) $(am_DLD_FUNCTIONS_md5sum_la_rpath) $(DLD_FUNCTIONS_md5sum_la_OBJECTS) $(DLD_FUNCTIONS_md5sum_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/mgorth.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/mgorth.la: $(DLD_FUNCTIONS_mgorth_la_OBJECTS) $(DLD_FUNCTIONS_mgorth_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/mgorth.la: $(DLD_FUNCTIONS_mgorth_la_OBJECTS) $(DLD_FUNCTIONS_mgorth_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_mgorth_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_mgorth_la_LINK) $(am_DLD_FUNCTIONS_mgorth_la_rpath) $(DLD_FUNCTIONS_mgorth_la_OBJECTS) $(DLD_FUNCTIONS_mgorth_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/nproc.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/nproc.la: $(DLD_FUNCTIONS_nproc_la_OBJECTS) $(DLD_FUNCTIONS_nproc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/nproc.la: $(DLD_FUNCTIONS_nproc_la_OBJECTS) $(DLD_FUNCTIONS_nproc_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_nproc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_nproc_la_LINK) $(am_DLD_FUNCTIONS_nproc_la_rpath) $(DLD_FUNCTIONS_nproc_la_OBJECTS) $(DLD_FUNCTIONS_nproc_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/pinv.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/pinv.la: $(DLD_FUNCTIONS_pinv_la_OBJECTS) $(DLD_FUNCTIONS_pinv_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/pinv.la: $(DLD_FUNCTIONS_pinv_la_OBJECTS) $(DLD_FUNCTIONS_pinv_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_pinv_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_pinv_la_LINK) $(am_DLD_FUNCTIONS_pinv_la_rpath) $(DLD_FUNCTIONS_pinv_la_OBJECTS) $(DLD_FUNCTIONS_pinv_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_qr_la-qr.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/qr.la: $(DLD_FUNCTIONS_qr_la_OBJECTS) $(DLD_FUNCTIONS_qr_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/qr.la: $(DLD_FUNCTIONS_qr_la_OBJECTS) $(DLD_FUNCTIONS_qr_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_qr_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_qr_la_LINK) $(am_DLD_FUNCTIONS_qr_la_rpath) $(DLD_FUNCTIONS_qr_la_OBJECTS) $(DLD_FUNCTIONS_qr_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/quad.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/quad.la: $(DLD_FUNCTIONS_quad_la_OBJECTS) $(DLD_FUNCTIONS_quad_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/quad.la: $(DLD_FUNCTIONS_quad_la_OBJECTS) $(DLD_FUNCTIONS_quad_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_quad_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_quad_la_LINK) $(am_DLD_FUNCTIONS_quad_la_rpath) $(DLD_FUNCTIONS_quad_la_OBJECTS) $(DLD_FUNCTIONS_quad_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/quadcc.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/quadcc.la: $(DLD_FUNCTIONS_quadcc_la_OBJECTS) $(DLD_FUNCTIONS_quadcc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/quadcc.la: $(DLD_FUNCTIONS_quadcc_la_OBJECTS) $(DLD_FUNCTIONS_quadcc_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_quadcc_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_quadcc_la_LINK) $(am_DLD_FUNCTIONS_quadcc_la_rpath) $(DLD_FUNCTIONS_quadcc_la_OBJECTS) $(DLD_FUNCTIONS_quadcc_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/qz.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/qz.la: $(DLD_FUNCTIONS_qz_la_OBJECTS) $(DLD_FUNCTIONS_qz_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/qz.la: $(DLD_FUNCTIONS_qz_la_OBJECTS) $(DLD_FUNCTIONS_qz_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_qz_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_qz_la_LINK) $(am_DLD_FUNCTIONS_qz_la_rpath) $(DLD_FUNCTIONS_qz_la_OBJECTS) $(DLD_FUNCTIONS_qz_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/rand.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/rand.la: $(DLD_FUNCTIONS_rand_la_OBJECTS) $(DLD_FUNCTIONS_rand_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/rand.la: $(DLD_FUNCTIONS_rand_la_OBJECTS) $(DLD_FUNCTIONS_rand_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_rand_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_rand_la_LINK) $(am_DLD_FUNCTIONS_rand_la_rpath) $(DLD_FUNCTIONS_rand_la_OBJECTS) $(DLD_FUNCTIONS_rand_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/rcond.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/rcond.la: $(DLD_FUNCTIONS_rcond_la_OBJECTS) $(DLD_FUNCTIONS_rcond_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/rcond.la: $(DLD_FUNCTIONS_rcond_la_OBJECTS) $(DLD_FUNCTIONS_rcond_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_rcond_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_rcond_la_LINK) $(am_DLD_FUNCTIONS_rcond_la_rpath) $(DLD_FUNCTIONS_rcond_la_OBJECTS) $(DLD_FUNCTIONS_rcond_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_regexp_la-regexp.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/regexp.la: $(DLD_FUNCTIONS_regexp_la_OBJECTS) $(DLD_FUNCTIONS_regexp_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/regexp.la: $(DLD_FUNCTIONS_regexp_la_OBJECTS) $(DLD_FUNCTIONS_regexp_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_regexp_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_regexp_la_LINK) $(am_DLD_FUNCTIONS_regexp_la_rpath) $(DLD_FUNCTIONS_regexp_la_OBJECTS) $(DLD_FUNCTIONS_regexp_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/schur.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/schur.la: $(DLD_FUNCTIONS_schur_la_OBJECTS) $(DLD_FUNCTIONS_schur_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/schur.la: $(DLD_FUNCTIONS_schur_la_OBJECTS) $(DLD_FUNCTIONS_schur_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_schur_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_schur_la_LINK) $(am_DLD_FUNCTIONS_schur_la_rpath) $(DLD_FUNCTIONS_schur_la_OBJECTS) $(DLD_FUNCTIONS_schur_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/spparms.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/spparms.la: $(DLD_FUNCTIONS_spparms_la_OBJECTS) $(DLD_FUNCTIONS_spparms_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/spparms.la: $(DLD_FUNCTIONS_spparms_la_OBJECTS) $(DLD_FUNCTIONS_spparms_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_spparms_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_spparms_la_LINK) $(am_DLD_FUNCTIONS_spparms_la_rpath) $(DLD_FUNCTIONS_spparms_la_OBJECTS) $(DLD_FUNCTIONS_spparms_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/sqrtm.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/sqrtm.la: $(DLD_FUNCTIONS_sqrtm_la_OBJECTS) $(DLD_FUNCTIONS_sqrtm_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/sqrtm.la: $(DLD_FUNCTIONS_sqrtm_la_OBJECTS) $(DLD_FUNCTIONS_sqrtm_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_sqrtm_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_sqrtm_la_LINK) $(am_DLD_FUNCTIONS_sqrtm_la_rpath) $(DLD_FUNCTIONS_sqrtm_la_OBJECTS) $(DLD_FUNCTIONS_sqrtm_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/str2double.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/str2double.la: $(DLD_FUNCTIONS_str2double_la_OBJECTS) $(DLD_FUNCTIONS_str2double_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/str2double.la: $(DLD_FUNCTIONS_str2double_la_OBJECTS) $(DLD_FUNCTIONS_str2double_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_str2double_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_str2double_la_LINK) $(am_DLD_FUNCTIONS_str2double_la_rpath) $(DLD_FUNCTIONS_str2double_la_OBJECTS) $(DLD_FUNCTIONS_str2double_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/strfind.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/strfind.la: $(DLD_FUNCTIONS_strfind_la_OBJECTS) $(DLD_FUNCTIONS_strfind_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/strfind.la: $(DLD_FUNCTIONS_strfind_la_OBJECTS) $(DLD_FUNCTIONS_strfind_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_strfind_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_strfind_la_LINK) $(am_DLD_FUNCTIONS_strfind_la_rpath) $(DLD_FUNCTIONS_strfind_la_OBJECTS) $(DLD_FUNCTIONS_strfind_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/sub2ind.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/sub2ind.la: $(DLD_FUNCTIONS_sub2ind_la_OBJECTS) $(DLD_FUNCTIONS_sub2ind_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/sub2ind.la: $(DLD_FUNCTIONS_sub2ind_la_OBJECTS) $(DLD_FUNCTIONS_sub2ind_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_sub2ind_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_sub2ind_la_LINK) $(am_DLD_FUNCTIONS_sub2ind_la_rpath) $(DLD_FUNCTIONS_sub2ind_la_OBJECTS) $(DLD_FUNCTIONS_sub2ind_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/svd.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/svd.la: $(DLD_FUNCTIONS_svd_la_OBJECTS) $(DLD_FUNCTIONS_svd_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/svd.la: $(DLD_FUNCTIONS_svd_la_OBJECTS) $(DLD_FUNCTIONS_svd_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_svd_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_svd_la_LINK) $(am_DLD_FUNCTIONS_svd_la_rpath) $(DLD_FUNCTIONS_svd_la_OBJECTS) $(DLD_FUNCTIONS_svd_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/syl.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/syl.la: $(DLD_FUNCTIONS_syl_la_OBJECTS) $(DLD_FUNCTIONS_syl_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/syl.la: $(DLD_FUNCTIONS_syl_la_OBJECTS) $(DLD_FUNCTIONS_syl_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_syl_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_syl_la_LINK) $(am_DLD_FUNCTIONS_syl_la_rpath) $(DLD_FUNCTIONS_syl_la_OBJECTS) $(DLD_FUNCTIONS_syl_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_symbfact_la-symbfact.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/symbfact.la: $(DLD_FUNCTIONS_symbfact_la_OBJECTS) $(DLD_FUNCTIONS_symbfact_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/symbfact.la: $(DLD_FUNCTIONS_symbfact_la_OBJECTS) $(DLD_FUNCTIONS_symbfact_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_symbfact_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_symbfact_la_LINK) $(am_DLD_FUNCTIONS_symbfact_la_rpath) $(DLD_FUNCTIONS_symbfact_la_OBJECTS) $(DLD_FUNCTIONS_symbfact_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_symrcm_la-symrcm.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/symrcm.la: $(DLD_FUNCTIONS_symrcm_la_OBJECTS) $(DLD_FUNCTIONS_symrcm_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/symrcm.la: $(DLD_FUNCTIONS_symrcm_la_OBJECTS) $(DLD_FUNCTIONS_symrcm_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_symrcm_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_symrcm_la_LINK) $(am_DLD_FUNCTIONS_symrcm_la_rpath) $(DLD_FUNCTIONS_symrcm_la_OBJECTS) $(DLD_FUNCTIONS_symrcm_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/time.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/time.la: $(DLD_FUNCTIONS_time_la_OBJECTS) $(DLD_FUNCTIONS_time_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/time.la: $(DLD_FUNCTIONS_time_la_OBJECTS) $(DLD_FUNCTIONS_time_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_time_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_time_la_LINK) $(am_DLD_FUNCTIONS_time_la_rpath) $(DLD_FUNCTIONS_time_la_OBJECTS) $(DLD_FUNCTIONS_time_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/tril.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/tril.la: $(DLD_FUNCTIONS_tril_la_OBJECTS) $(DLD_FUNCTIONS_tril_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/tril.la: $(DLD_FUNCTIONS_tril_la_OBJECTS) $(DLD_FUNCTIONS_tril_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_tril_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_tril_la_LINK) $(am_DLD_FUNCTIONS_tril_la_rpath) $(DLD_FUNCTIONS_tril_la_OBJECTS) $(DLD_FUNCTIONS_tril_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/tsearch.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/tsearch.la: $(DLD_FUNCTIONS_tsearch_la_OBJECTS) $(DLD_FUNCTIONS_tsearch_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/tsearch.la: $(DLD_FUNCTIONS_tsearch_la_OBJECTS) $(DLD_FUNCTIONS_tsearch_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_tsearch_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_tsearch_la_LINK) $(am_DLD_FUNCTIONS_tsearch_la_rpath) $(DLD_FUNCTIONS_tsearch_la_OBJECTS) $(DLD_FUNCTIONS_tsearch_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/typecast.lo: DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/typecast.la: $(DLD_FUNCTIONS_typecast_la_OBJECTS) $(DLD_FUNCTIONS_typecast_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/typecast.la: $(DLD_FUNCTIONS_typecast_la_OBJECTS) $(DLD_FUNCTIONS_typecast_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_typecast_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_typecast_la_LINK) $(am_DLD_FUNCTIONS_typecast_la_rpath) $(DLD_FUNCTIONS_typecast_la_OBJECTS) $(DLD_FUNCTIONS_typecast_la_LIBADD) $(LIBS)
DLD-FUNCTIONS/DLD_FUNCTIONS_urlwrite_la-urlwrite.lo: \
DLD-FUNCTIONS/$(am__dirstamp) \
DLD-FUNCTIONS/$(DEPDIR)/$(am__dirstamp)
-DLD-FUNCTIONS/urlwrite.la: $(DLD_FUNCTIONS_urlwrite_la_OBJECTS) $(DLD_FUNCTIONS_urlwrite_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
+DLD-FUNCTIONS/urlwrite.la: $(DLD_FUNCTIONS_urlwrite_la_OBJECTS) $(DLD_FUNCTIONS_urlwrite_la_DEPENDENCIES) $(EXTRA_DLD_FUNCTIONS_urlwrite_la_DEPENDENCIES) DLD-FUNCTIONS/$(am__dirstamp)
$(DLD_FUNCTIONS_urlwrite_la_LINK) $(am_DLD_FUNCTIONS_urlwrite_la_rpath) $(DLD_FUNCTIONS_urlwrite_la_OBJECTS) $(DLD_FUNCTIONS_urlwrite_la_LIBADD) $(LIBS)
OPERATORS/$(am__dirstamp):
@$(MKDIR_P) OPERATORS
@@ -4794,7 +4802,7 @@
TEMPLATE-INST/liboctinterp_la-Array-tc.lo: \
TEMPLATE-INST/$(am__dirstamp) \
TEMPLATE-INST/$(DEPDIR)/$(am__dirstamp)
-liboctinterp.la: $(liboctinterp_la_OBJECTS) $(liboctinterp_la_DEPENDENCIES)
+liboctinterp.la: $(liboctinterp_la_OBJECTS) $(liboctinterp_la_DEPENDENCIES) $(EXTRA_liboctinterp_la_DEPENDENCIES)
$(liboctinterp_la_LINK) -rpath $(octlibdir) $(liboctinterp_la_OBJECTS) $(liboctinterp_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -4839,13 +4847,13 @@
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-@AMCOND_BUILD_COMPILED_AUX_PROGRAMS_TRUE@mkoctfile$(EXEEXT): $(mkoctfile_OBJECTS) $(mkoctfile_DEPENDENCIES)
+@AMCOND_BUILD_COMPILED_AUX_PROGRAMS_TRUE@mkoctfile$(EXEEXT): $(mkoctfile_OBJECTS) $(mkoctfile_DEPENDENCIES) $(EXTRA_mkoctfile_DEPENDENCIES)
@AMCOND_BUILD_COMPILED_AUX_PROGRAMS_TRUE@ @rm -f mkoctfile$(EXEEXT)
@AMCOND_BUILD_COMPILED_AUX_PROGRAMS_TRUE@ $(CXXLINK) $(mkoctfile_OBJECTS) $(mkoctfile_LDADD) $(LIBS)
-octave$(EXEEXT): $(octave_OBJECTS) $(octave_DEPENDENCIES)
+octave$(EXEEXT): $(octave_OBJECTS) $(octave_DEPENDENCIES) $(EXTRA_octave_DEPENDENCIES)
@rm -f octave$(EXEEXT)
$(octave_LINK) $(octave_OBJECTS) $(octave_LDADD) $(LIBS)
-@AMCOND_BUILD_COMPILED_AUX_PROGRAMS_TRUE@octave-config$(EXEEXT): $(octave_config_OBJECTS) $(octave_config_DEPENDENCIES)
+@AMCOND_BUILD_COMPILED_AUX_PROGRAMS_TRUE@octave-config$(EXEEXT): $(octave_config_OBJECTS) $(octave_config_DEPENDENCIES) $(EXTRA_octave_config_DEPENDENCIES)
@AMCOND_BUILD_COMPILED_AUX_PROGRAMS_TRUE@ @rm -f octave-config$(EXEEXT)
@AMCOND_BUILD_COMPILED_AUX_PROGRAMS_TRUE@ $(CXXLINK) $(octave_config_OBJECTS) $(octave_config_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@@ -4879,9 +4887,7 @@
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -7838,9 +7844,7 @@
@$(NORMAL_UNINSTALL)
@list='$(nodist_octinclude_HEADERS)'; test -n "$(octincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(octincludedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(octincludedir)" && rm -f $$files
+ dir='$(DESTDIR)$(octincludedir)'; $(am__uninstall_files_from_dir)
install-octincludeHEADERS: $(octinclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(octincludedir)" || $(MKDIR_P) "$(DESTDIR)$(octincludedir)"
@@ -7858,9 +7862,7 @@
@$(NORMAL_UNINSTALL)
@list='$(octinclude_HEADERS)'; test -n "$(octincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(octincludedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(octincludedir)" && rm -f $$files
+ dir='$(DESTDIR)$(octincludedir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -7964,10 +7966,15 @@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff -uNr octave-3.6.1/src/oct-map.cc octave-3.6.2/src/oct-map.cc
--- octave-3.6.1/src/oct-map.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/src/oct-map.cc 2012-05-30 21:43:29.000000000 -0400
@@ -971,7 +971,7 @@
octave_idx_type nf = nfields ();
for (octave_idx_type k = 0; k < nf; k++)
- xvals[k].assign (i, rhs.xvals[k]);
+ xvals[k].assign (i, rhs.xvals[k], Matrix ());
if (nf > 0)
dimensions = xvals[0].dims ();
@@ -1014,7 +1014,7 @@
octave_idx_type nf = nfields ();
for (octave_idx_type k = 0; k < nf; k++)
- xvals[k].assign (i, j, rhs.xvals[k]);
+ xvals[k].assign (i, j, rhs.xvals[k], Matrix ());
if (nf > 0)
dimensions = xvals[0].dims ();
@@ -1057,7 +1057,7 @@
octave_idx_type nf = nfields ();
for (octave_idx_type k = 0; k < nf; k++)
- xvals[k].assign (ia, rhs.xvals[k]);
+ xvals[k].assign (ia, rhs.xvals[k], Matrix ());
if (nf > 0)
dimensions = xvals[0].dims ();
@@ -1170,6 +1170,13 @@
setfield (k, tmp);
}
+/*
+%!test
+%! rhs.b = 1;
+%! a(3) = rhs;
+%! assert ({a.b}, {[], [], 1})
+*/
+
void
octave_map::delete_elements (const idx_vector& i)
{
diff -uNr octave-3.6.1/src/ov-base-diag.cc octave-3.6.2/src/ov-base-diag.cc
--- octave-3.6.1/src/ov-base-diag.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/src/ov-base-diag.cc 2012-05-30 21:43:29.000000000 -0400
@@ -82,7 +82,7 @@
if (idx0.is_scalar () && idx1.is_scalar ())
{
- retval = matrix.checkelem (idx0(0), idx1(0));
+ retval = matrix.elem (idx0(0), idx1(0));
}
else
{
diff -uNr octave-3.6.1/src/ov-base-scalar.h octave-3.6.2/src/ov-base-scalar.h
--- octave-3.6.1/src/ov-base-scalar.h 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/src/ov-base-scalar.h 2012-05-30 21:43:29.000000000 -0400
@@ -71,6 +71,9 @@
const std::list& idx,
const octave_value& rhs);
+ octave_value_list do_multi_index_op (int, const octave_value_list& idx)
+ { return do_index_op (idx); }
+
bool is_constant (void) const { return true; }
bool is_defined (void) const { return true; }
diff -uNr octave-3.6.1/src/ov-base-sparse.cc octave-3.6.2/src/ov-base-sparse.cc
--- octave-3.6.1/src/ov-base-sparse.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/src/ov-base-sparse.cc 2012-05-30 21:43:29.000000000 -0400
@@ -318,7 +318,13 @@
<< ", cols = " << nc
<< ", nnz = " << nz;
- double dnel = matrix.numel ();
+ // Avoid calling numel here since it can easily overflow
+ // octave_idx_type even when there is no real problem storing the
+ // sparse array.
+
+ double dnr = nr;
+ double dnc = nc;
+ double dnel = dnr * dnc;
if (dnel > 0)
{
diff -uNr octave-3.6.1/src/ov-cx-diag.cc octave-3.6.2/src/ov-cx-diag.cc
--- octave-3.6.1/src/ov-cx-diag.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/src/ov-cx-diag.cc 2012-05-30 21:43:29.000000000 -0400
@@ -229,3 +229,10 @@
x = val.complex_value ();
return retval;
}
+
+/*
+
+%% bug #36368
+%!assert (diag ([1+i, 1-i])^2 , diag ([2i, -2i]), 4*eps);
+
+*/
diff -uNr octave-3.6.1/src/ov-struct.cc octave-3.6.2/src/ov-struct.cc
--- octave-3.6.1/src/ov-struct.cc 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/src/ov-struct.cc 2012-05-30 21:43:29.000000000 -0400
@@ -2149,6 +2149,8 @@
%! assert (fieldnames (s), keys');
%!assert (cell2struct ({1; 2}, {"a"; "b"}), struct ("a", 1, "b", 2));
+
+%!assert (cell2struct ({}, {"f"}, 3), struct ("f", {}));
*/
diff -uNr octave-3.6.1/src/ov-usr-fcn.cc octave-3.6.2/src/ov-usr-fcn.cc
--- octave-3.6.1/src/ov-usr-fcn.cc 2012-02-22 14:38:21.000000000 -0500
+++ octave-3.6.2/src/ov-usr-fcn.cc 2012-05-30 21:43:29.000000000 -0400
@@ -598,6 +598,9 @@
if (takes_varargs ())
symbol_table::varref ("varargin") = va_args.cell_value ();
+ // Force .ignored. variable to be undefined by default.
+ symbol_table::varref (".ignored.") = octave_value ();
+
if (lvalue_list)
{
octave_idx_type nbh = 0;
@@ -619,11 +622,11 @@
}
symbol_table::varref (".ignored.") = bh;
-
- symbol_table::mark_hidden (".ignored.");
- symbol_table::mark_automatic (".ignored.");
}
}
+
+ symbol_table::mark_hidden (".ignored.");
+ symbol_table::mark_automatic (".ignored.");
}
DEFUN (nargin, args, ,
@@ -873,3 +876,40 @@
return retval;
}
+
+/*
+%!function [x, y] = try_isargout ()
+%! if (isargout (1))
+%! if (isargout (2))
+%! x = 1; y = 2;
+%! else
+%! x = -1;
+%! endif
+%! else
+%! if (isargout (2))
+%! y = -2;
+%! else
+%! error ("no outputs requested");
+%! endif
+%! endif
+%!endfunction
+%!
+%!test
+%! [x, y] = try_isargout ();
+%! assert ([x, y], [1, 2]);
+%!
+%!test
+%! [x, ~] = try_isargout ();
+%! assert (x, -1);
+%!
+%!test
+%! [~, y] = try_isargout ();
+%! assert (y, -2);
+%!
+%!error [~, ~] = try_isargout ();
+%!
+%% Check to see that isargout isn't sticky:
+%!test
+%! [x, y] = try_isargout ();
+%! assert ([x, y], [1, 2]);
+*/
diff -uNr octave-3.6.1/src/pt-assign.cc octave-3.6.2/src/pt-assign.cc
--- octave-3.6.1/src/pt-assign.cc 2012-02-22 14:34:54.000000000 -0500
+++ octave-3.6.2/src/pt-assign.cc 2012-05-30 21:43:29.000000000 -0400
@@ -431,7 +431,30 @@
}
}
else
- error ("element number %d undefined in return list", k+1);
+ {
+ // This can happen for a function like
+ //
+ // function varargout = f ()
+ // varargout{1} = nargout;
+ // endfunction
+ //
+ // called with
+ //
+ // [a, ~] = f ();
+ //
+ // Then the list of of RHS values will contain one
+ // element but we are iterating over the list of all
+ // RHS values. We shouldn't complain that a value we
+ // don't need is missing from the list.
+
+ if (ult.is_black_hole ())
+ {
+ k++;
+ continue;
+ }
+ else
+ error ("element number %d undefined in return list", k+1);
+ }
}
if (error_state)
@@ -467,6 +490,19 @@
return retval;
}
+/*
+%!function varargout = f ()
+%! varargout{1} = nargout;
+%!endfunction
+%!
+%!test
+%! [a, ~] = f ();
+%! assert (a, 2);
+%!test
+%! [a, ~, ~, ~, ~] = f ();
+%! assert (a, 5);
+*/
+
std::string
tree_multi_assignment::oper (void) const
{
diff -uNr octave-3.6.1/test/Makefile.in octave-3.6.2/test/Makefile.in
--- octave-3.6.1/test/Makefile.in 2012-02-22 14:46:13.000000000 -0500
+++ octave-3.6.2/test/Makefile.in 2012-05-31 11:24:32.000000000 -0400
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -1656,6 +1656,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build-aux/common.mk $(srcdir)/classes/module.mk $(srcdir)/class-concat/module.mk $(srcdir)/ctor-vs-method/module.mk $(srcdir)/fcn-handle-derived-resolution/module.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1722,10 +1723,15 @@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic: