# HG changeset patch
# User Rik <rik@octave.org>
# Date 1346769946 25200
# Node ID 03ef3a183129380da205e92025b05cdec5ec337c
# Parent  2dd4f5930108d1340101813916d98e4c4a7ddc39
build: Use INC rather than INCLUDES for consistent naming in libinterp Makefile.am.

* libinterp/Makefile.am, libinterp/interp-core/module.mk,
libinterp/interpfcn/module.mk, libinterp/octave-value/module.mk,
libinterp/operators/module.mk, libinterp/parse-tree/module.mk:
Use INC rather than INCLUDES for consistent naming.

diff -r 2dd4f5930108 -r 03ef3a183129 libinterp/Makefile.am
--- a/libinterp/Makefile.am	Mon Sep 03 08:19:57 2012 -0700
+++ b/libinterp/Makefile.am	Tue Sep 04 07:45:46 2012 -0700
@@ -97,12 +97,11 @@
   parse-tree/oct-gperf.h \
   builtins.h \
   octave.h \
-  $(OV_INCLUDES) \
-  $(OV_SPARSE_INCLUDES) \
-  $(PT_INCLUDES) \
-	$(OPERATOR_INCLUDES) \
-  $(INTERP_CORE_INCLUDES) \
-  $(INTERPFCN_INCLUDES)
+  $(OCTAVE_VALUE_INC) \
+  $(PARSE_TREE_INC) \
+  $(OPERATORS_INC) \
+  $(INTERP_CORE_INC) \
+  $(INTERPFCN_INC)
 
 nodist_octinclude_HEADERS = \
   interp-core/mxarray.h \
diff -r 2dd4f5930108 -r 03ef3a183129 libinterp/interp-core/module.mk
--- a/libinterp/interp-core/module.mk	Mon Sep 03 08:19:57 2012 -0700
+++ b/libinterp/interp-core/module.mk	Tue Sep 04 07:45:46 2012 -0700
@@ -4,13 +4,13 @@
   interp-core/mxarray.in.h \
   interp-core/oct-errno.in.cc
 
-JIT_INCLUDES = \
+JIT_INC = \
   interp-core/jit-util.h \
   interp-core/jit-typeinfo.h \
   interp-core/jit-ir.h \
   interp-core/pt-jit.h
 
-INTERP_CORE_INCLUDES = \
+INTERP_CORE_INC = \
   interp-core/Cell.h \
   interp-core/c-file-ptr-stream.h \
   interp-core/comment-list.h \
@@ -57,7 +57,7 @@
   interp-core/xnorm.h \
   interp-core/xpow.h \
   interp-core/zfstream.h \
-  $(JIT_INCLUDES)
+  $(JIT_INC)
 
 JIT_SRC = \
   interp-core/jit-util.cc \
diff -r 2dd4f5930108 -r 03ef3a183129 libinterp/interpfcn/module.mk
--- a/libinterp/interpfcn/module.mk	Mon Sep 03 08:19:57 2012 -0700
+++ b/libinterp/interpfcn/module.mk	Tue Sep 04 07:45:46 2012 -0700
@@ -3,7 +3,7 @@
   interpfcn/defaults.in.h \
   interpfcn/graphics.in.h
 
-INTERPFCN_INCLUDES = \
+INTERPFCN_INC = \
   interpfcn/data.h \
   interpfcn/debug.h \
   interpfcn/defun.h \
diff -r 2dd4f5930108 -r 03ef3a183129 libinterp/octave-value/module.mk
--- a/libinterp/octave-value/module.mk	Mon Sep 03 08:19:57 2012 -0700
+++ b/libinterp/octave-value/module.mk	Tue Sep 04 07:45:46 2012 -0700
@@ -1,7 +1,7 @@
 EXTRA_DIST += \
   octave-value/module.mk
 
-OV_INTTYPE_INCLUDES = \
+OV_INTTYPE_INC = \
   octave-value/ov-base-int.h \
   octave-value/ov-base-int.cc \
   octave-value/ov-int-traits.h \
@@ -15,13 +15,13 @@
   octave-value/ov-uint64.h \
   octave-value/ov-uint8.h
 
-OV_SPARSE_INCLUDES = \
+OV_SPARSE_INC = \
   octave-value/ov-base-sparse.h \
   octave-value/ov-bool-sparse.h \
   octave-value/ov-cx-sparse.h \
   octave-value/ov-re-sparse.h
 
-OV_INCLUDES = \
+OCTAVE_VALUE_INC = \
   octave-value/ov-base-diag.h \
   octave-value/ov-base-diag.cc \
   octave-value/ov-base-mat.h \
@@ -66,7 +66,8 @@
   octave-value/ov-typeinfo.h \
   octave-value/ov-usr-fcn.h \
   octave-value/ov.h \
-  $(OV_INTTYPE_INCLUDES)
+  $(OV_INTTYPE_INC) \
+  $(OV_SPARSE_INC)
 
 OV_INTTYPE_SRC = \
   octave-value/ov-int16.cc \
diff -r 2dd4f5930108 -r 03ef3a183129 libinterp/operators/module.mk
--- a/libinterp/operators/module.mk	Mon Sep 03 08:19:57 2012 -0700
+++ b/libinterp/operators/module.mk	Tue Sep 04 07:45:46 2012 -0700
@@ -130,7 +130,7 @@
   operators/op-ui8-ui8.cc
 
 ## These look like included header files to Autotools build process
-OPERATOR_INCLUDES = \
+OPERATORS_INC = \
   operators/op-dm-template.cc \
   operators/op-dms-template.cc \
   operators/op-int.h \
diff -r 2dd4f5930108 -r 03ef3a183129 libinterp/parse-tree/module.mk
--- a/libinterp/parse-tree/module.mk	Mon Sep 03 08:19:57 2012 -0700
+++ b/libinterp/parse-tree/module.mk	Tue Sep 04 07:45:46 2012 -0700
@@ -2,7 +2,7 @@
   parse-tree/module.mk \
   parse-tree/octave.gperf
 
-PARSER_INCLUDES = \
+PARSER_INC = \
   parse-tree/lex.h \
   parse-tree/parse.h \
   parse-tree/parse-private.h
@@ -14,7 +14,7 @@
 lex.lo lex.o oct-parse.lo oct-parse.o: \
   AM_CXXFLAGS := $(filter-out -Wold-style-cast, $(AM_CXXFLAGS))
 
-PT_INCLUDES = \
+PARSE_TREE_INC = \
   parse-tree/pt-all.h \
   parse-tree/pt-arg-list.h \
   parse-tree/pt-assign.h \
@@ -44,7 +44,7 @@
   parse-tree/pt-walk.h \
   parse-tree/pt.h \
   parse-tree/token.h \
-  $(PARSER_INCLUDES)
+  $(PARSER_INC)
 
 PARSE_TREE_SRC = \
   parse-tree/pt-arg-list.cc \