Mercurial > octave

changeset 21292:c1c601b8e3df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't install template source files for octave_value classes * libinterp/octave-value/module.mk (OCTAVE_VALUE_INC): Remove ov-base-diag.cc, ov-base-mat.cc, and ov-base-scalar.cc from the list. (OV_INTTYPE_INC): Remove ov-base-int.cc from the list. (libinter_EXTRA_DIST): Add ov-base-diag.cc, ov-base-mat.cc, ov-base-scalar.cc, and ov-base-int.cc to the list.
author John W. Eaton <jwe@octave.org>
date Wed, 17 Feb 2016 17:40:18 -0500
parents b4f7932a3124
children 350caa6afadf
files libinterp/octave-value/module.mk
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/octave-value/module.mk	Wed Feb 17 17:29:16 2016 -0500
+++ b/libinterp/octave-value/module.mk	Wed Feb 17 17:40:18 2016 -0500
@@ -1,6 +1,5 @@
 OV_INTTYPE_INC = \
   libinterp/octave-value/ov-base-int.h \
-  libinterp/octave-value/ov-base-int.cc \
   libinterp/octave-value/ov-int-traits.h \
   libinterp/octave-value/ov-int16.h \
   libinterp/octave-value/ov-int32.h \
@@ -20,11 +19,8 @@
 
 OCTAVE_VALUE_INC = \
   libinterp/octave-value/ov-base-diag.h \
-  libinterp/octave-value/ov-base-diag.cc \
   libinterp/octave-value/ov-base-mat.h \
-  libinterp/octave-value/ov-base-mat.cc \
   libinterp/octave-value/ov-base-scalar.h \
-  libinterp/octave-value/ov-base-scalar.cc \
   libinterp/octave-value/ov-base.h \
   libinterp/octave-value/ov-bool-mat.h \
   libinterp/octave-value/ov-bool.h \
@@ -127,6 +123,16 @@
   $(OV_INTTYPE_SRC) \
   $(OV_SPARSE_SRC)
 
+## These source files contain template definitions that are included
+## 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/octave-value/ov-base-diag.cc \
+  libinterp/octave-value/ov-base-int.cc \
+  libinterp/octave-value/ov-base-mat.cc \
+  libinterp/octave-value/ov-base-scalar.cc
+
 OV_JAVA_DF = \
   libinterp/octave-value/ov.df \
   libinterp/octave-value/ov-class.df \