Mercurial > jwe > octave

changeset 21999:492472927079

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
install ops.h again. * libinterp/module.mk (octinclude_HEADERS): Add $(LIBINTERP_OPERATORS_INC) to the list. (noinst_HEADERS): Include $(NOINSTALL_LIBINTERP_OPERATORS_INC) here instead of Add $(LIBINTERP_OPERATORS_INC). * libinterp/operators/module.mk (NOINSTALL_LIBINTERP_OPERATORS_INC): Rename from LIBINTERP_OPERATORS_INC. (LIBINTERP_OPERATORS_INC): New list for installed headers.
author John W. Eaton <jwe@octave.org>
date Wed, 29 Jun 2016 16:13:27 -0400
parents cf5db742f552
children f471f513ffd0
files libinterp/module.mk libinterp/operators/module.mk
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/module.mk	Wed Jun 29 13:22:59 2016 -0700
+++ b/libinterp/module.mk	Wed Jun 29 16:13:27 2016 -0400
@@ -100,13 +100,14 @@
   libinterp/liboctinterp-build-info.h \
   libinterp/octave.h \
   libinterp/options-usage.h \
+  $(COREFCN_INC) \
+  $(LIBINTERP_OPERATORS_INC) \
   $(OCTAVE_VALUE_INC) \
   $(PARSE_TREE_INC) \
-  $(PARSER_INC) \
-  $(COREFCN_INC)
+  $(PARSER_INC)
 
 noinst_HEADERS += \
-  $(LIBINTERP_OPERATORS_INC)
+  $(NOINSTALL_LIBINTERP_OPERATORS_INC)
 
 nodist_octinclude_HEADERS += \
   libinterp/corefcn/mxarray.h \
--- a/libinterp/operators/module.mk	Wed Jun 29 13:22:59 2016 -0700
+++ b/libinterp/operators/module.mk	Wed Jun 29 16:13:27 2016 -0400
@@ -127,13 +127,15 @@
   libinterp/operators/op-ui64-ui64.cc \
   libinterp/operators/op-ui8-ui8.cc
 
+LIBINTERP_OPERATORS_INC = \
+  libinterp/operators/ops.h
+
 ## These look like included header files to Autotools build process
-LIBINTERP_OPERATORS_INC = \
+NOINSTALL_LIBINTERP_OPERATORS_INC = \
   libinterp/operators/op-dm-template.cc \
   libinterp/operators/op-dms-template.cc \
   libinterp/operators/op-int.h \
-  libinterp/operators/op-pm-template.cc \
-  libinterp/operators/ops.h
+  libinterp/operators/op-pm-template.cc
 
 ## Special rules for sources which must be built before rest of compilation.
 libinterp/operators/ops.cc: $(LIBINTERP_OPERATORS_SRC) libinterp/mkops