Mercurial > octave
view libinterp/link-deps.mk @ 15208:2a36a5b89f98
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 | 2fc554ffbc28 |
children | 648dabbb4c6b |
line wrap: on
line source
include $(top_srcdir)/liboctave/link-deps.mk if AMCOND_ENABLE_DYNAMIC_LINKING LIBOCTINTERP_LINK_DEPS = else LIBOCTINTERP_LINK_DEPS = $(DLDFCN_LIBS) endif LIBOCTINTERP_LINK_DEPS += \ $(GRAPHICS_LIBS) \ $(FT2_LIBS) \ $(HDF5_LIBS) \ $(Z_LIBS) \ $(FFTW_XLIBS) \ $(REGEX_LIBS) \ $(OPENGL_LIBS) \ $(X11_LIBS) \ $(CARBON_LIBS) \ $(LLVM_LIBS) \ $(LAPACK_LIBS) LIBOCTINTERP_LINK_OPTS = \ $(GRAPHICS_LDFLAGS) \ $(FT2_LDFLAGS) \ $(HDF5_LDFLAGS) \ $(Z_LDFLAGS) \ $(REGEX_LDFLAGS) \ $(FFTW_XLDFLAGS) \ $(LLVM_LDFLAGS) OCT_LINK_DEPS = OCT_LINK_OPTS = $(LDFLAGS) if AMCOND_LINK_ALL_DEPS LIBOCTINTERP_LINK_DEPS += $(LIBOCTAVE_LINK_DEPS) LIBOCTINTERP_LINK_OPTS += $(LIBOCTAVE_LINK_OPTS) OCTAVE_LINK_DEPS = $(LIBOCTINTERP_LINK_DEPS) OCTAVE_LINK_OPTS = $(LIBOCTINTERP_LINK_OPTS) OCT_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS) OCT_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS) endif