Mercurial > octave-nkf

annotate libgui/src/link-deps.mk @ 15208:2a36a5b89f98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
link gui in way that is more consistent with the rest of Octave * libgui/src/link-deps.mk: New file. * libgui/src/Makefile.am: Include it. (QT_INCDIR, QT_LIBDIR, QT_LIBS, QT_LDFLAGS): New variables. (liboctgui_la_CPPFLAGS): Use $(QT_INCDIR). (liboctgui_current, liboctgui_revision, liboctgui_age, liboctgui_version): Ne variables. (liboctgui_la_LDFLAGS): Use -version option, $(NO_UNDEFINED_LDFLAG), -bindir option, and $(LIBOCTGUI_LINK_OPTS). (liboctgui_la_LIBADD): Use $(LIBOCTGUI_LINK_DEPS). * src/Makefile.am: Include ../libgui/src/link-deps.mk. (octave_LDADD): Move $(OCTAVE_GUI_LIBS) ahead of $(OCTAVE_CORE_LIBS). Use $(OCTAVE_GUI_LINK_DEPS). (octave_LDFLAGS): Use $(NO_UNDEFINED_LDFLAG) and $(OCTAVE_GUI_LINK_OPTS) instead of $(octave_cli_LDFLAGS). * liboctave/link-deps.mk, libinterp/link-deps.mk: Use $(top_srcdir)/ instead of ../ to reference other link-deps.mk files.
author John W. Eaton <jwe@octave.org>
date Mon, 20 Aug 2012 15:37:54 -0400
parents
children
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 += \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 $(QT_LIBS)
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 = \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 $(QT_LDFLAGS)
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