changeset 2910:1da1af95082e

[project @ 1997-04-30 06:42:17 by jwe]
author jwe
date Wed, 30 Apr 1997 06:45:15 +0000
parents 057273789b87
children 595e7bf1e23f
files src/Makefile.in src/mkbuiltins src/octave.cc src/toplev.cc
diffstat 4 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -64,10 +64,9 @@
   DLD_STATIC_OBJ := $(DLD_OBJ)
 endif
 
-INCLUDES := builtins.h defun.h defun-dld.h \
-	defun-int.h dirfns.h dynamic-ld.h error.h file-io.h \
-	fn-cache.h gripes.h help.h input.h lex.h load-save.h \
-	mappers.h oct.h oct-fstrm.h oct-hist.h oct-iostrm.h \
+INCLUDES := defun.h defun-dld.h defun-int.h dirfns.h dynamic-ld.h \
+	error.h file-io.h fn-cache.h gripes.h help.h input.h lex.h \
+	load-save.h oct.h oct-fstrm.h oct-hist.h oct-iostrm.h \
 	oct-map.h oct-obj.h oct-prcstrm.h oct-procbuf.h \
 	oct-stdstrm.h oct-stream.h oct-strstrm.h pager.h parse.h \
 	pathlen.h pr-output.h procstream.h pt-base.h pt-cmd.h \
--- a/src/mkbuiltins
+++ b/src/mkbuiltins
@@ -25,8 +25,6 @@
 #include "config.h"
 #endif
 
-#include "builtins.h"
-#include "mappers.h"
 #include "oct-builtin.h"
 #include "oct-obj.h"
 #include "variables.h"
@@ -76,6 +74,8 @@
 cat << \EOF
 }
 
+extern void install_mapper_functions (void);
+
 void
 install_builtins (void)
 {
--- a/src/octave.cc
+++ b/src/octave.cc
@@ -50,7 +50,6 @@
 #include "lo-error.h"
 #include "str-vec.h"
 
-#include "builtins.h"
 #include <defaults.h>
 #include "defun.h"
 #include "dynamic-ld.h"
@@ -77,6 +76,8 @@
 #include "variables.h"
 #include <version.h>
 
+extern void install_builtins (void);
+
 #if !defined (HAVE_ATEXIT) && defined (HAVE_ON_EXIT)
 extern "C" int on_exit ();
 #define atexit on_exit
--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -48,7 +48,6 @@
 #include "lo-mappers.h"
 #include "str-vec.h"
 
-#include "builtins.h"
 #include <defaults.h>
 #include "defun.h"
 #include "dynamic-ld.h"