Mercurial > octave-nkf

annotate libgui/link-deps.mk @ 15596:5f031158c693

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use pkg-config to discover Qt (pkg-config is already a requirement anyway). * build-aux/common.mk (do_subst_config_vals): Replace QT_INCDIR and QT_LIBDIR with QT_CPPFLAGS, QT_LDFLAGS and QT_LIBS. * configure.ac: Likewise and use pkg-config to discover the new variables. * libgui/Makefile.am (QT_INCDIR, QT_LIBDIR, QT_LIBS, QT_LDFLAGS): Delete variable definitions. * libgui/link-deps.mk (LIBOCTGUI_LINK_DEPS): Use automake @QT_LIBS@. (LIBOCTGUI_LIK_OPTS): Use automake @QT_LDFLAGS@. * libgui/qterminal-module.mk (qterminal_libqterminal_la_CPPFLAGS): Use automake @QT_CPPFLAGS@ instead of QT_INCDIR-based include paths. (MOC_CPPFLAGS): Define Q_OS_WIN32 instead of WIN32. * libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Use automake @QT_CPPFLAGS@ instead of QT_INCDIR-based include paths. * libinterp/interpfcn/toplev.cc (Foctave_config_info): Replace QT_INCDIR and QT_LIBDIR with QT_CPPFLAGS, QT_LDFLAGS and QT_LIBS. * libinterp/oct-conf.in.h: Replace OCTAVE_CONF_QT_INCDIR and OCTAVE_CONF_QT_LIBDIR with OCTAVE_CONF_QT_CPPFLAGS, OCTAVE_CONF_QT_LDFLAGS and OCTAVE_CONF_QT_LIBS. * m4/acinclude.m4 (OCTAVE_CHECK_FUNC_FINDFIRST_MODERN, OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT): Use QT_CPPFLAGS instead of QT_INCDIR.
author Michael Goffioul <michael.goffioul@gmail.com>
date Mon, 05 Nov 2012 01:47:49 +0000
parents 48cb1a5bb64d
children 39844e6ccf13
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15208
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 include $(top_srcdir)/libinterp/link-deps.mk
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
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 += \
15596
5f031158c693 Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15362
diff changeset
10 @QT_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
11
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 LIBOCTGUI_LINK_OPTS = \
15596
5f031158c693 Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15362
diff changeset
13 @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
14
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 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
16 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
17 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
18
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 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
20 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
21 endif