Mercurial > octave
changeset 32362:2239b16d17cd
maint: Merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Fri, 29 Sep 2023 13:58:29 +0200 |
parents | 9865d2a1b49b (current diff) 4acb694518de (diff) |
children | 446e747cd7d9 |
files | libinterp/module.mk libinterp/octave-value/module.mk |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/module.mk Fri Sep 29 12:09:39 2023 +0200 +++ b/libinterp/module.mk Fri Sep 29 13:58:29 2023 +0200 @@ -71,6 +71,9 @@ %reldir%/liboctinterp-build-info.cc \ %reldir%/operators/ops.cc +## C++ files with templates that are #included, not compiled +LIBINTERP_TEMPLATE_SRC = + %canon_reldir%_EXTRA_DIST += \ %reldir%/DOCSTRINGS \ %reldir%/build-env.in.cc \ @@ -87,6 +90,7 @@ %reldir%/octave.h \ $(COREFCN_INC) \ $(LIBINTERP_OPERATORS_INC) \ + $(LIBINTERP_TEMPLATE_SRC) \ $(OCTAVE_VALUE_INC) \ $(PARSE_TREE_INC) \ $(PARSER_INC) \ @@ -104,6 +108,7 @@ DIST_SRC += \ %reldir%/octave.cc \ + $(LIBINTERP_TEMPLATE_SRC) \ $(OCTAVE_VALUE_SRC) \ $(PARSE_TREE_SRC) \ $(COREFCN_SRC)
--- a/libinterp/octave-value/module.mk Fri Sep 29 12:09:39 2023 +0200 +++ b/libinterp/octave-value/module.mk Fri Sep 29 13:58:29 2023 +0200 @@ -147,7 +147,7 @@ ## in other files. They are not supposed to be compiled separately, ## so they should not appear in the OCTAVE_VALUE_SRC list. -libinterp_EXTRA_DIST += \ +LIBINTERP_TEMPLATE_SRC += \ %reldir%/ov-base-diag.cc \ %reldir%/ov-base-int.cc \ %reldir%/ov-base-mat.cc \