--- a/src/Makefile.in	Sat Aug 13 16:29:27 1994 +0000
+++ b/src/Makefile.in	Sat Aug 13 19:48:17 1994 +0000
@@ -31,9 +31,11 @@
 %.cc : %.l
 	$(LEX) $(LFLAGS) $< > $(@F)
 
+XALL_CXXFLAGS = $(subst -fexternal-templates, , $(ALL_CXXFLAGS))
+
 %.def : %.cc
 	@echo making $@ from $<
-	@$(CXXCPP) -c $(CPPFLAGS) $(ALL_CXXFLAGS) -DMAKE_BUILTINS $< \
+	@$(CXXCPP) -c $(CPPFLAGS) $(XALL_CXXFLAGS) -DMAKE_BUILTINS $< \
 	  | $(srcdir)/mkdefs > $@.tmp
 	@mv $@.tmp $@
 
@@ -54,8 +56,8 @@
 
 INCLUDES = arith-ops.h builtins.h defaults.h.in defun.h defun-dld.h \
 	defun-int.h dirfns.h dynamic-ld.h error.h file-io.h fnmatch.h \
-	getopt.h gripes.h help.h idx-vector.h input.h lex.h mappers.h \
-	missing-math.h octave.h octave-hist.h \
+	getopt.h gripes.h help.h idx-vector.h input.h lex.h \
+	load-save.h mappers.h missing-math.h octave.h octave-hist.h \
 	oct-obj.h pager.h parse.h pr-output.h procstream.h \
 	sighandlers.h statdefs.h symtab.h sysdep.h token.h \
 	tree-base.h tree-cmd.h tree-const.h tree-expr.h tree-misc.h \
@@ -64,13 +66,14 @@
 
 SOURCES = arith-ops.cc data.cc dirfns.cc dynamic-ld.cc \
 	error.cc file-io.cc fnmatch.c getopt.c getopt1.c gripes.cc \
-	help.cc idx-vector.cc input.cc lex.l mappers.cc octave.cc \
-	oct-obj.cc octave-hist.cc pager.cc parse.y pr-output.cc \
-	procstream.cc sighandlers.cc strcasecmp.c strncase.c \
-	symtab.cc sysdep.cc tc-inlines.cc tc-rep.cc timefns.cc \
-	token.cc tree-base.cc tree-cmd.cc tree-const.cc tree-expr.cc \
-	tree-misc.cc tree-plot.cc unwind-prot.cc user-prefs.cc \
-	utils.cc variables.cc xdiv.cc xpow.cc SLStack.cc \
+	help.cc idx-vector.cc input.cc lex.l load-save.cc mappers.cc \
+	octave.cc oct-obj.cc octave-hist.cc pager.cc parse.y \
+	pr-output.cc procstream.cc sighandlers.cc strcasecmp.c \
+	strncase.c symtab.cc sysdep.cc tc-inlines.cc tc-rep.cc \
+	timefns.cc token.cc tree-base.cc tree-cmd.cc tree-const.cc \
+	tree-expr.cc tree-misc.cc tree-plot.cc unwind-prot.cc \
+	user-prefs.cc utils.cc variables.cc xdiv.cc xpow.cc \
+	SLStack.cc \
 	$(DLD_SRC)
 
 # Ugh.
@@ -91,12 +94,12 @@
 
 OBJECTS = arith-ops.o builtins.o data.o dirfns.o error.o \
 	file-io.o fnmatch.o getopt.o getopt1.o gripes.o help.o \
-	idx-vector.o input.o lex.o mappers.o octave.o octave-hist.o \
-	oct-obj.o pager.o parse.o pr-output.o procstream.o \
-	sighandlers.o strcasecmp.o strncase.o symtab.o sysdep.o \
-	tc-rep.o timefns.o token.o tree-base.o tree-cmd.o tree-const.o \
-	tree-expr.o tree-plot.o tree-misc.o unwind-prot.o user-prefs.o \
-	utils.o variables.o xdiv.o xpow.o SLStack.o \
+	idx-vector.o input.o lex.o load-save.o mappers.o octave.o \
+	octave-hist.o oct-obj.o pager.o parse.o pr-output.o \
+	procstream.o sighandlers.o strcasecmp.o strncase.o symtab.o \
+	sysdep.o tc-rep.o timefns.o token.o tree-base.o tree-cmd.o \
+	tree-const.o tree-expr.o tree-plot.o tree-misc.o unwind-prot.o \
+	user-prefs.o utils.o variables.o xdiv.o xpow.o SLStack.o \
 	@DYNAMIC_LD_OBJ@
 
 OCTAVE_LIBS = @LIBOCTDLD@ ../liboctave.a ../libcruft.a ../libinfo.a \