Mercurial > octave-nkf
annotate libgui/link-deps.mk @ 20614:10ec79b47808
use new string_value method to handle value extraction errors
* __voronoi__.cc, chol.cc, colamd.cc, fftw.cc:
Use new string_value method.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 08 Oct 2015 18:15:56 -0400 |
parents | c3dab5d8e6ab |
children |
rev | line source |
---|---|
20387
c3dab5d8e6ab
allow --disable-gui to work again (bug #45543)
John W. Eaton <jwe@octave.org>
parents:
20362
diff
changeset
|
1 if AMCOND_BUILD_GUI |
c3dab5d8e6ab
allow --disable-gui to work again (bug #45543)
John W. Eaton <jwe@octave.org>
parents:
20362
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 += \ |
18904
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 = \ |
18904
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 |
20387
c3dab5d8e6ab
allow --disable-gui to work again (bug #45543)
John W. Eaton <jwe@octave.org>
parents:
20362
diff
changeset
|
23 |
c3dab5d8e6ab
allow --disable-gui to work again (bug #45543)
John W. Eaton <jwe@octave.org>
parents:
20362
diff
changeset
|
24 endif |