Mercurial > octave
changeset 27655:93f4e5e65fcd
fix circular dependency for libgui <-> libgraphics
* configure.ac (LIBOCTGUI_LINK_DEPS): Include $QT_OPENGL_LIBS.
(LIBOCTGUI_LINK_OPTS): Include $QT_OPENGL_LDFLAGS.
* libgui/graphics/module.mk (%canon_reldir%_libgraphics_la_LDFLAGS,
%canon_reldir%_libgraphics_la_LIBADD,
%canon_reldir%_libgraphics_la_DEPENDENCIES): Delete. These variables
are not needed for an automake/libtool convenience library.
* libgui/modelu.mk (%canon_reldir%_liboctgui_la_LIBADD):
Use $(LIBOCTGUI_LINK_DEPS), not just $(QT_LIBS).
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 07 Nov 2019 13:47:46 -0500 |
| parents | 5e0f6db9428f |
| children | 959a63d1ede6 |
| files | configure.ac libgui/graphics/module.mk libgui/module.mk |
| diffstat | 3 files changed, 3 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Nov 07 09:09:27 2019 -0500 +++ b/configure.ac Thu Nov 07 13:47:46 2019 -0500 @@ -2847,8 +2847,8 @@ OCTAVE_GUI_LINK_OPTS="" if test $build_qt_gui = yes; then - LIBOCTGUI_LINK_DEPS="$QT_LIBS" - LIBOCTGUI_LINK_OPTS="$QT_LDFLAGS" + LIBOCTGUI_LINK_DEPS="$QT_LIBS QT_OPENGL_LIBS" + LIBOCTGUI_LINK_OPTS="$QT_LDFLAGS $QT_OPENGL_LDFLAGS" if test $link_all_deps = yes || test -n "$QT_LDFLAGS"; then LIBOCTGUI_LINK_DEPS="$LIBOCTGUI_LINK_DEPS $LIBOCTINTERP_LINK_DEPS"
--- a/libgui/graphics/module.mk Thu Nov 07 09:09:27 2019 -0500 +++ b/libgui/graphics/module.mk Thu Nov 07 13:47:46 2019 -0500 @@ -140,17 +140,6 @@ -Ilibinterp/corefcn -I$(srcdir)/libinterp/corefcn \ -I$(srcdir)/libinterp/octave-value -%canon_reldir%_libgraphics_la_LDFLAGS = \ - $(QT_OPENGL_LDFLAGS) \ - $(WARN_LDFLAGS) - -%canon_reldir%_libgraphics_la_LIBADD = \ - $(OCT_GUI_LINK_DEPS) \ - $(QT_OPENGL_LIBS) \ - $(OPENGL_LIBS) - -%canon_reldir%_libgraphics_la_DEPENDENCIES = $(OCT_GUI_LINK_DEPS) - noinst_LTLIBRARIES += %reldir%/libgraphics.la libgui_EXTRA_DIST += \
--- a/libgui/module.mk Thu Nov 07 09:09:27 2019 -0500 +++ b/libgui/module.mk Thu Nov 07 13:47:46 2019 -0500 @@ -57,7 +57,7 @@ %reldir%/src/libgui-src.la \ libinterp/liboctinterp.la \ liboctave/liboctave.la \ - $(QT_LIBS) + $(LIBOCTGUI_LINK_DEPS) ## Increment the following version numbers as needed and according ## to the rules in the etc/HACKING.md file: