view src/link-deps.mk @ 13241:2a8dcb5b3a00

improve default indexing for objects * ov-class.cc (octave_class::is_class_method): Also return true for anonymous functions executing in the context of a class method or constructor. * ov-class.h (octave_class:do_multi_index_op): New function. * ov-fcn.h (octave_function::is_private_function_of_class): Now const. (octave_function::is_anonymous_function_of_class): New virtual function. * ov-usr-fcn.h (octave_function::anonymous_function): New data member. (octave_user_function::mark_as_anonymous_function): New function. (octave_user_function::is_anonymous_function): New function. (octave_user_function::is_anonymous_function_of_class): New function. * ov-usr-fcn.cc (octave_user_function::octave_user_function): Initialize anonymous_function data member. (octave_user_function::profiler_name): Distinguish between inline and anonymous functions. (octave_user_function::do_multi_index_op): Use is_anonymous_function instead of checking whether cmd_list is marked as an anonymous function body. * pt-fcn-handle.cc (tree_anon_fcn_handle::rvalue1): If parent function is a class method or constructor, stash the dispatch type in the new function. Mark the new function as anonymous, not inline.
author John W. Eaton <jwe@octave.org>
date Wed, 28 Sep 2011 16:45:21 -0400
parents f3c53fea9fb5
children f25d2224fa02
line wrap: on
line source

include ../liboctave/link-deps.mk

if AMCOND_ENABLE_DYNAMIC_LINKING
  LIBOCTINTERP_LINK_DEPS =
else
  LIBOCTINTERP_LINK_DEPS = $(DLD_FUNCTIONS_LIBS)
endif

LIBOCTINTERP_LINK_DEPS += \
  $(GRAPHICS_LIBS) \
  $(FT2_LIBS) \
  $(HDF5_LIBS) \
  $(Z_LIBS) \
  $(OPENGL_LIBS) \
  $(X11_LIBS) \
  $(CARBON_LIBS)

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