annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 include ../liboctave/link-deps.mk
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 if AMCOND_ENABLE_DYNAMIC_LINKING
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 LIBOCTINTERP_LINK_DEPS =
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 else
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 LIBOCTINTERP_LINK_DEPS = $(DLD_FUNCTIONS_LIBS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 endif
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 LIBOCTINTERP_LINK_DEPS += \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 $(GRAPHICS_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 $(FT2_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 $(HDF5_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 $(Z_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 $(OPENGL_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 $(X11_LIBS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 $(CARBON_LIBS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 LIBOCTINTERP_LINK_OPTS = \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 $(GRAPHICS_LDFLAGS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 $(FT2_LDFLAGS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 $(HDF5_LDFLAGS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 $(Z_LDFLAGS) \
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 $(REGEX_LDFLAGS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 OCT_LINK_DEPS =
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26
13024
f3c53fea9fb5 maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents: 13022
diff changeset
27 OCT_LINK_OPTS = $(LDFLAGS)
13011
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 if AMCOND_LINK_ALL_DEPS
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 LIBOCTINTERP_LINK_DEPS += $(LIBOCTAVE_LINK_DEPS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 LIBOCTINTERP_LINK_OPTS += $(LIBOCTAVE_LINK_OPTS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 OCTAVE_LINK_DEPS = $(LIBOCTINTERP_LINK_DEPS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 OCTAVE_LINK_OPTS = $(LIBOCTINTERP_LINK_OPTS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 OCT_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 OCT_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS)
1609dd300c4d maint: add missing files for changeset edc5ec6e949b
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 endif