changeset 4960:ce01dbd7e026 ss-2-1-58

[project @ 2004-09-02 03:47:49 by jwe]
author jwe
date Thu, 02 Sep 2004 03:47:49 +0000
parents 5eb434fdd95a
children 2acb248a653f
files src/ChangeLog src/Makefile.in
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Sep 02 03:40:38 2004 +0000
+++ b/src/ChangeLog	Thu Sep 02 03:47:49 2004 +0000
@@ -2,7 +2,9 @@
 
 	* version.h (OCTAVE_VERSION): Now 2.1.58.
 
-	* Makefile.in (INCLUDES): Add OPERATORS/op-int.h to the list.
+	* Makefile.in (OP_INCLUDES): New variable.
+	Include OPERATORS/op-int.h here.
+	* Makefile.in (dist): Also link $(OP_INCLUDES).
 
 	* Makefile.in (DISTFILES): Include $(EXTRAS) in the list.
 
--- a/src/Makefile.in	Thu Sep 02 03:40:38 2004 +0000
+++ b/src/Makefile.in	Thu Sep 02 03:47:49 2004 +0000
@@ -94,8 +94,7 @@
 	oct-strstrm.h oct-lvalue.h oct.h octave.h ops.h pager.h \
 	parse.h pr-output.h procstream.h sighandlers.h siglist.h \
 	symtab.h sysdep.h token.h toplev.h unwind-prot.h utils.h \
-	variables.h version.h xdiv.h xpow.h OPERATORS/op-int.h \
-	$(OV_INCLUDES) $(PT_INCLUDES)
+	variables.h version.h xdiv.h xpow.h $(OV_INCLUDES) $(PT_INCLUDES)
 
 TI_XSRC := Array-oc.cc Array-os.cc Array-sym.cc Array-tc.cc
 
@@ -118,6 +117,8 @@
 
 OP_SRC := $(addprefix OPERATORS/, $(OP_XSRC))
 
+OP_INCLUDES := OPERATORS/op-int.h
+
 OV_INTTYPE_SRC := \
 	ov-int8.cc ov-int16.cc ov-int32.cc ov-int64.cc \
 	ov-uint8.cc ov-uint16.cc ov-uint32.cc ov-uint64.cc
@@ -472,6 +473,7 @@
 	done
 	ln $(DLD_SRC) ../`cat ../.fname`/src/DLD-FUNCTIONS
 	ln $(OP_SRC) ../`cat ../.fname`/src/OPERATORS
+	ln $(OP_INCLUDES) ../`cat ../.fname`/src/OPERATORS
 	ln $(TI_SRC) ../`cat ../.fname`/src/TEMPLATE-INST
 	rm -f parse.cc lex.cc y.tab.h y.output yy.lex.c
 	rm -f oct-gperf.h defaults.h oct-conf.h *.d *.df builtins.cc