# HG changeset patch
# User jwe
# Date 780159202 0
# Node ID b14a2dda50e76a59063ee1e4bae4ef6514f5f0cf
# Parent  893c1893398fec7ce348aec2b9651e72ccec851f
[project @ 1994-09-21 14:51:52 by jwe]

diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 dnl along with Octave; see the file COPYING.  If not, write to the Free
 dnl Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 dnl
-AC_REVISION($Revision: 1.47 $)dnl
+AC_REVISION($Revision: 1.48 $)dnl
 AC_PREREQ(1.8)dnl
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h kpathsea/c-auto.h)
@@ -170,13 +170,11 @@
 AC_SUBST(fcnfilepath)
 AC_SUBST(imagepath)
 dnl
-DYNAMIC_LD_OBJ=
 DLD_DIR=
 LIBDLD=
 LIBOCTDLD='../liboctdld.a'
 LD_STATIC_FLAG=
 if $use_dld; then
-  DYNAMIC_LD_OBJ='dynamic-ld.o'
   DLD_DIR=dld
   LIBDLD='../libdld.a'
 # don't link them in only if doing dynamic linking and small kernel
@@ -187,9 +185,6 @@
   LD_STATIC_FLAG=-static
   AC_DEFINE(WITH_DLD, 1)dnl
 fi
-if test -n "$DYNAMIC_LD_OBJ"; then
-  AC_VERBOSE([defining DYNAMIC_LD_OBJ to be $DYNAMIC_LD_OBJ])
-fi
 if test -n "$DLD_DIR"; then
   AC_VERBOSE([defining DLD_DIR to be $DLD_DIR])
 fi
@@ -202,7 +197,6 @@
 if test -n "$LD_STATIC_FLAG"; then
   AC_VERBOSE([defining LD_STATIC_FLAG to be $LD_STATIC_FLAG])
 fi
-AC_SUBST(DYNAMIC_LD_OBJ)dnl
 AC_SUBST(DLD_DIR)dnl
 AC_SUBST(LIBDLD)dnl
 AC_SUBST(LIBOCTDLD)dnl
@@ -801,6 +795,7 @@
 define([tmpSE], [scripts/polynomial/Makefile scripts/set/Makefile])dnl
 define([tmpSF], [scripts/signal/Makefile scripts/special-matrix/Makefile])dnl
 define([tmpSG], [scripts/statistics/Makefile])dnl
-define([scriptdirs], [tmpSA tmpSB tmpSC tmpSD tmpSE tmpSF tmpSG])dnl
+define([tmpSH], [scripts/elfun/Makefile scripts/specfun/Makefile])dnl
+define([scriptdirs], [tmpSA tmpSB tmpSC tmpSD tmpSE tmpSF tmpSG tmpSH])dnl
 dnl
 AC_OUTPUT([srcdirs cruftdirs scriptdirs])dnl
diff --git a/octMakefile.in b/octMakefile.in
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -22,7 +22,7 @@
 	acconfig.h MAKEINFO.PATCH ChangeLog ChangeLog.[0-9]
 
 # Complete directory trees to distribute.
-DISTDIRS = bsd-math dld kpathsea
+DISTDIRS = bsd-math kpathsea
 
 # Subdirectories to run make in for the primary targets.
 SUBDIRS = libcruft liboctave @DLD_DIR@ info readline kpathsea src doc scripts 
diff --git a/src/Makefile.in b/src/Makefile.in
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -101,15 +101,14 @@
 # XXX FIXME XXX -- Should these be generated automatically from the
 # list of source files?
 
-OBJECTS = arith-ops.o builtins.o data.o dirfns.o error.o \
+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 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@
+	user-prefs.o utils.o variables.o xdiv.o xpow.o SLStack.o
 
 OCTAVE_LIBS = @LIBOCTDLD@ ../liboctave.a ../libcruft.a ../libinfo.a \
 	../libreadline.a ../libkpathsea.a @LIBDLD@
@@ -190,7 +189,7 @@
 dist: parse.cc lex.cc
 	ln $(DISTFILES) ../`cat ../.fname`/src
 	rm -f parse.cc lex.cc y.tab.h y.output yy.lex.c
-	rm -f lex.cc parse.cc defaults.h *.d *.def
+	rm -f lex.cc parse.cc defaults.h *.d *.def builtins.cc
 .PHONY: dist
 
 # Special rules -- these files need special things to be defined.