Mercurial > octave-nkf

comparison libgui/link-deps.mk @ 20387:c3dab5d8e6ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow --disable-gui to work again (bug #45543) * libgui/link-deps.mk, libgui/module.mk: Surround contents with AMCOND_BUILD_BUI conditional.
author John W. Eaton <jwe@octave.org>
date Wed, 15 Jul 2015 15:27:08 -0400
parents 0ce7d8303152
children
comparison
equal deleted inserted replaced
20386:d59d9f4ec290 20387:c3dab5d8e6ab
1 if AMCOND_BUILD_GUI
2
1 if AMCOND_ENABLE_DYNAMIC_LINKING 3 if AMCOND_ENABLE_DYNAMIC_LINKING
2 LIBOCTGUI_LINK_DEPS = 4 LIBOCTGUI_LINK_DEPS =
3 else 5 else
4 LIBOCTGUI_LINK_DEPS = $(DLDFCN_LIBS) 6 LIBOCTGUI_LINK_DEPS = $(DLDFCN_LIBS)
5 endif 7 endif
16 LIBOCTGUI_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS) 18 LIBOCTGUI_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS)
17 19
18 OCTAVE_GUI_LINK_DEPS = $(LIBOCTGUI_LINK_DEPS) 20 OCTAVE_GUI_LINK_DEPS = $(LIBOCTGUI_LINK_DEPS)
19 OCTAVE_GUI_LINK_OPTS = $(LIBOCTGUI_LINK_OPTS) 21 OCTAVE_GUI_LINK_OPTS = $(LIBOCTGUI_LINK_OPTS)
20 endif 22 endif
23
24 endif