view libinterp/link-deps.mk @ 18033:2627aeca5032

isa: allow cell array of class names as input, plus remove __isa_parent__(). * ov-class.cc (F__isa_parent__): removed function which was only used in isa.m and has now be removed. Replaced by new isa (implemented in C++). (Fisa): new function to replace isa.m and F__isa_parent__. Now supports a cell array of strings with classnames. While the m file implementation was kind of supporting this, it was doing so by accident and would not work when checking for parent class, integer, numeric, or float. * scripts/general/module.mk: remove isa.m from list of files. * scripts/general/isa.m: remove file. This function was really small and half of it (__isa_parent__) had to be implemented in C++ anyway. Implementing the whole thing in C++ means one less undocumented, meant as private, function. And any extra performance increase in a function called multiples times for input check is welcome.
author Carnë Draug <carandraug@octave.org>
date Fri, 29 Nov 2013 21:37:21 +0000
parents 82c94987abc6
children eb9b73ad403a 0ce7d8303152
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 += \
  $(FT2_LIBS) \
  $(HDF5_LIBS) \
  $(Z_LIBS) \
  $(FFTW_XLIBS) \
  $(OPENGL_LIBS) \
  $(X11_LIBS) \
  $(CARBON_LIBS) \
  $(GL2PS_LIBS) \
  $(LLVM_LIBS) \
  $(JAVA_LIBS) \
  $(LAPACK_LIBS)

LIBOCTINTERP_LINK_OPTS = \
  $(FT2_LDFLAGS) \
  $(HDF5_LDFLAGS) \
  $(Z_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