Mercurial > octave

diff libgui/module.mk @ 27655:93f4e5e65fcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2ff12b707f60
children 83c748eb9fbd
line wrap: on
line diff
--- 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: