Mercurial > hg > octave-nkf

annotate libgui/link-deps.mk @ 20779:f61c67865d9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't return A for inv (A) when A is a singular Diagonal matrix (bug #46103). * dDiagMatrix.cc (inverse), fDiagMatrix.cc (inverse): return octave_Inf for the inverse of a diagonal element whose value is 0. * test/diag-perm.tst: Add tests for new behavior.
author Rik <rik@octave.org>
date Wed, 07 Oct 2015 07:41:44 -0700
parents c3dab5d8e6ab
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
20562
c3dab5d8e6ab allow --disable-gui to work again (bug #45543)
John W. Eaton <jwe@octave.org>
parents: 20537
diff changeset
1 if AMCOND_BUILD_GUI
c3dab5d8e6ab allow --disable-gui to work again (bug #45543)
John W. Eaton <jwe@octave.org>
parents: 20537
diff changeset
2
15208
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 if AMCOND_ENABLE_DYNAMIC_LINKING
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 LIBOCTGUI_LINK_DEPS =
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 else
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 LIBOCTGUI_LINK_DEPS = $(DLDFCN_LIBS)
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 endif
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 LIBOCTGUI_LINK_DEPS += \
19060
39844e6ccf13 link libgui with OpenGL libraries
John W. Eaton <jwe@octave.org>
parents: 15596
diff changeset
10 $(QT_LIBS) \
39844e6ccf13 link libgui with OpenGL libraries
John W. Eaton <jwe@octave.org>
parents: 15596
diff changeset
11 $(OPENGL_LIBS)
15208
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 LIBOCTGUI_LINK_OPTS = \
19060
39844e6ccf13 link libgui with OpenGL libraries
John W. Eaton <jwe@octave.org>
parents: 15596
diff changeset
14 $(QT_LDFLAGS)
15208
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 if AMCOND_LINK_ALL_DEPS
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 LIBOCTGUI_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS)
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 LIBOCTGUI_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS)
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 OCTAVE_GUI_LINK_DEPS = $(LIBOCTGUI_LINK_DEPS)
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 OCTAVE_GUI_LINK_OPTS = $(LIBOCTGUI_LINK_OPTS)
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 endif
20562
c3dab5d8e6ab allow --disable-gui to work again (bug #45543)
John W. Eaton <jwe@octave.org>
parents: 20537
diff changeset
23
c3dab5d8e6ab allow --disable-gui to work again (bug #45543)
John W. Eaton <jwe@octave.org>
parents: 20537
diff changeset
24 endif