Mercurial > hg > octave-jordi

comparison libgui/link-deps.mk @ 18869:39844e6ccf13 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
link libgui with OpenGL libraries * libgui/link-deps.mk (LIBOCTGUI_LINK_DEPS, LIBOCTGUI_LINK_OPTS): Use make variables instead of autoconf substitutions. (LIBOCTGUI_LINK_DEPS): Include OPENGL_LIBS in the list.
author John W. Eaton <jwe@octave.org>
date Fri, 27 Jun 2014 17:04:16 -0400
parents 5f031158c693
children 0ce7d8303152
comparison
equal deleted inserted replaced
18866:589354cf668f 18869:39844e6ccf13
5 else 5 else
6 LIBOCTGUI_LINK_DEPS = $(DLDFCN_LIBS) 6 LIBOCTGUI_LINK_DEPS = $(DLDFCN_LIBS)
7 endif 7 endif
8 8
9 LIBOCTGUI_LINK_DEPS += \ 9 LIBOCTGUI_LINK_DEPS += \
10 @QT_LIBS@ 10 $(QT_LIBS) \
11 $(OPENGL_LIBS)
11 12
12 LIBOCTGUI_LINK_OPTS = \ 13 LIBOCTGUI_LINK_OPTS = \
13 @QT_LDFLAGS@ 14 $(QT_LDFLAGS)
14 15
15 if AMCOND_LINK_ALL_DEPS 16 if AMCOND_LINK_ALL_DEPS
16 LIBOCTGUI_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS) 17 LIBOCTGUI_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS)
17 LIBOCTGUI_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS) 18 LIBOCTGUI_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS)
18 19