--- a/src/Makefile.in	Sun Oct 02 15:19:39 1994 +0000
+++ b/src/Makefile.in	Sun Oct 02 15:41:13 1994 +0000
@@ -35,7 +35,8 @@
 %.cc : %.l
 	$(LEX) $(LFLAGS) $< > $(@F)
 
-XALL_CXXFLAGS = $(subst -fexternal-templates, , $(ALL_CXXFLAGS))
+XALL_CXXFLAGS_1 = $(subst -fexternal-templates, , $(ALL_CXXFLAGS))
+XALL_CXXFLAGS = $(subst -fno-implicit-templates, , $(XALL_CXXFLAGS_1))
 
 %.def : %.cc
 	@echo making $@ from $<
@@ -49,87 +50,92 @@
 	  exit 1 ; \
 	fi
 
-DLD_SRC = f-balance.cc f-chol.cc f-colloc.cc f-dassl.cc f-det.cc \
+DLD_SRC := f-balance.cc f-chol.cc f-colloc.cc f-dassl.cc f-det.cc \
 	f-eig.cc f-expm.cc f-fft.cc f-fft2.cc f-find.cc \
 	f-fsolve.cc f-fsqp.cc f-givens.cc f-hess.cc f-ifft.cc \
 	f-ifft2.cc f-inv.cc f-log.cc f-lpsolve.cc f-lsode.cc f-lu.cc \
 	f-minmax.cc f-npsol.cc f-pinv.cc f-qpsol.cc f-qr.cc f-quad.cc \
 	f-qzval.cc f-rand.cc f-schur.cc f-sort.cc f-svd.cc f-syl.cc
 
-DLD_OBJ = f-balance.o f-chol.o f-colloc.o f-dassl.o f-det.o f-eig.o \
-	f-expm.o f-fft.o f-fft2.o f-find.o f-fsolve.o \
-	f-fsqp.o f-givens.o f-hess.o f-ifft.o f-ifft2.o f-inv.o \
-	f-log.o f-lpsolve.o f-lsode.o f-lu.o f-minmax.o f-npsol.o \
-	f-pinv.o f-qpsol.o f-qr.o f-quad.o f-qzval.o f-rand.o \
-	f-schur.o f-sort.o f-svd.o f-syl.o
+DLD_OBJ := $(patsubst %.cc, %.o, $(DLD_SRC))
 
-INCLUDES = arith-ops.h builtins.h defaults.h.in defun.h defun-dld.h \
+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 \
 	load-save.h mappers.h missing-math.h octave.h octave-hist.h \
 	oct-map.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 \
-	tree-plot.h tc-rep.h unwind-prot.h user-prefs.h utils.h \
-	variables.h version.h xdiv.h xpow.h Map.h SLStack.h Stack.h
+	tree-plot.h tc-inlines.cc tc-rep.h unwind-prot.h user-prefs.h \
+	utils.h variables.h version.h xdiv.h xpow.h Map.h SLStack.h \
+	Stack.h
 
-SOURCES = arith-ops.cc data.cc dirfns.cc dynamic-ld.cc \
+TI_SRC := Array-tc.cc Map-tc.cc DLList-fi.cc \
+	SLList-expr.cc SLList-misc.cc SLList-plot.cc SLList-tc.cc \
+	SLStack-i.cc SLStack-pc.cc SLStack-sym.cc SLStack-tok.cc \
+	SLStack-tm.cc SLStack-ue.cc SLStack-ui.cc
+
+TI_OBJ := $(patsubst %.cc, %.o, $(TI_SRC))
+
+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 load-save.cc mappers.cc \
 	octave.cc octave-hist.cc oct-obj.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 \
+	strncase.c symtab.cc sysdep.cc tc-rep.cc \
 	tc-rep-ass.cc tc-rep-idx.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 Map.cc SLStack.cc \
-	$(DLD_SRC)
+
+OBJECTS_4 := $(SOURCES) builtins.o
+OBJECTS_3 := $(patsubst %.l, %.o, $(OBJECTS_4))
+OBJECTS_2 := $(patsubst %.y, %.o, $(OBJECTS_3))
+OBJECTS_1 := $(patsubst %.c, %.o, $(OBJECTS_2))
+OBJECTS := $(patsubst %.cc, %.o, $(OBJECTS_1))
 
 # Ugh.
 
-DEP_SOURCES_2 = $(patsubst %.l, %.cc, $(SOURCES)) builtins.cc
-DEP_SOURCES_1 = $(patsubst %.y, %.cc, $(DEP_SOURCES_2))
-DEP_SOURCES = $(patsubst %.c, %.d, $(DEP_SOURCES_1))
-MAKEDEPS = $(patsubst %.cc, %.d, $(DEP_SOURCES))
-
-DEF_FILES_4 = $(addprefix $(srcdir)/, $(SOURCES))
-DEF_FILES_3 = $(notdir $(shell grep -l "^DEFUN" $(DEF_FILES_4)))
-DEF_FILES_2 = $(patsubst %.y, %.def, $(DEF_FILES_3))
-DEF_FILES_1 = $(patsubst %.l, %.def, $(DEF_FILES_2))
-DEF_FILES = $(patsubst %.cc, %.def, $(DEF_FILES_1))
+DEP_SOURCES_3 := $(SOURCES) $(TI_SOURCES) builtins.cc
+DEP_SOURCES_2 := $(patsubst %.l, %.cc, $(DEP_SOURCES_3))
+DEP_SOURCES_1 := $(patsubst %.y, %.cc, $(DEP_SOURCES_2))
+DEP_SOURCES := $(patsubst %.c, %.d, $(DEP_SOURCES_1))
+MAKEDEPS := $(patsubst %.cc, %.d, $(DEP_SOURCES))
 
-# XXX FIXME XXX -- Should these be generated automatically from the
-# list of source files?
+DEF_FILES_5 := $(SOURCES) $(DLD_SRC)
+DEF_FILES_4 := $(addprefix $(srcdir)/, $(DEF_FILES_5))
+DEF_FILES_3 := $(notdir $(shell grep -l "^DEFUN" $(DEF_FILES_4)))
+DEF_FILES_2 := $(patsubst %.y, %.def, $(DEF_FILES_3))
+DEF_FILES_1 := $(patsubst %.l, %.def, $(DEF_FILES_2))
+DEF_FILES := $(patsubst %.cc, %.def, $(DEF_FILES_1))
 
-OBJECTS = arith-ops.o builtins.o data.o dirfns.o dynamic-ld.o error.o \
-	file-io.o fnmatch.o getopt.o getopt1.o gripes.o help.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 tc-rep-ass.o tc-rep-idx.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 Map.o SLStack.o 
 
-OCTAVE_LIBS = @LIBOCTDLD@ ../liboctave.a ../libcruft.a ../libinfo.a \
-	../libreadline.a ../libkpathsea.a @LIBDLD@
+OCTAVE_LIBS = @LIBOCTDLD@ ../liboctave/liboctave.a libtinst.a \
+	../libcruft/libcruft.a ../info/libinfo.a \
+	../readline/libreadline.a ../kpathsea/libkpathsea.a \
+	@LIBDLD@
 
 DISTFILES = Makefile.in mkdefs mkbuiltins \
-	parse.cc lex.cc y.tab.h $(INCLUDES) $(SOURCES)
+	parse.cc lex.cc y.tab.h $(INCLUDES) $(DLD_SRC) $(SOURCES) \
+	$(TI_SRC) 
 
 all: defaults.h octave
 .PHONY: all
 
-octave: $(OBJECTS) $(DLD_OBJ) $(LIBOBJS) $(OCTAVE_LIBS) ../liboctdld.a
+octave: $(OBJECTS) $(DLD_OBJ) $(LIBOBJS) $(OCTAVE_LIBS) liboctdld.a
 	$(CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(ALL_LDFLAGS) -o octave \
 	$(OBJECTS) \
 	$(OCTAVE_LIBS) \
 	$(LIBOBJS) \
 	$(FLIBS) $(LEXLIB) -ltermcap -lm -lg++
 
-../liboctdld.a: $(DLD_OBJ)
-	$(AR) $(ARFLAGS) ../liboctdld.a $(DLD_OBJ)
-	$(RANLIB) ../liboctdld.a
+liboctdld.a: $(DLD_OBJ)
+	$(AR) $(ARFLAGS) liboctdld.a $(DLD_OBJ)
+	$(RANLIB) liboctdld.a
+
+libtinst.a: $(TI_OBJ)
+	$(AR) $(ARFLAGS) libtinst.a $(TI_OBJ)
+	$(RANLIB) libtinst.a
 
 builtins.cc: $(DEF_FILES) mkbuiltins
 	@echo making $@ from $(DEF_FILES)
@@ -150,7 +156,7 @@
 	ln $(bindir)/octave-$(version) $(bindir)/octave
 	if test -d $(libdir) ; then true ; else $(TOPDIR)/mkpath $(libdir) ; fi
 	if $(OCTAVE_LITE) && $(WITH_DLD) ; then \
-	  $(INSTALL_DATA) ../liboctdld.a $(libdir)/liboctdld.a ; \
+	  $(INSTALL_DATA) liboctdld.a $(libdir)/liboctdld.a ; \
 	fi
 .PHONY: install
 
@@ -158,11 +164,11 @@
 	rm -f $(bindir)/octave
 .PHONY: uninstall
 
-tags: $(SOURCES)
-	ctags $(SOURCES)
+tags: $(SOURCES) $(DLD_SRC) $(TI_SRC)
+	ctags $(SOURCES) $(DLD_SRC) $(TI_SRC)
 
-TAGS: $(SOURCES)
-	etags $(SOURCES)
+TAGS: $(SOURCES) $(DLD_SRC) $(TI_SRC)
+	etags $(SOURCES) $(DLD_SRC) $(TI_SRC)
 
 clean:
 	rm -f *.a *.o builtins.cc