Mercurial > hg > octave-avbm

--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,7 @@
 endif

 # Subdirectories in which to run `make all'.
-SUBDIRS = libgnu libcruft liboctave $(GUIDIR) src scripts @DOCDIR@ examples test
+SUBDIRS = libgnu libcruft liboctave libinterp $(GUIDIR) src scripts @DOCDIR@ examples test

 if ! AMCOND_BUILD_DOCS
 dist-hook:
--- a/autogen.sh
+++ b/autogen.sh
@@ -30,9 +30,9 @@

 (cd doc/interpreter; ./config-images.sh)

-echo "generating src/dldfcn/module.mk..."
+echo "generating libinterp/dldfcn/module.mk..."

-(cd src/dldfcn; ./config-module.sh)
+(cd libinterp/dldfcn; ./config-module.sh)

 echo "bootstrapping..."
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@
 dnl FIXME: We should auto-insert the Mercurial changeset ID into the
 dnl        AC_REVISION field whenever configure.ac is modified.
 dnl AC_REVISION($Revision: 1.603 $)
-AC_CONFIG_SRCDIR([src/octave.cc])
+AC_CONFIG_SRCDIR([libinterp/octave.cc])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -1383,7 +1383,7 @@
     SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'"
   ;;
   *-*-darwin*)
-    DL_LDFLAGS='-bundle -bundle_loader $(top_builddir)/src/octave $(LDFLAGS)'
+    DL_LDFLAGS='-bundle -bundle_loader $(top_builddir)/libinterp/octave $(LDFLAGS)'
     MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT'
     SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
     case "$canonical_host_type" in
@@ -1710,7 +1710,7 @@
   LIBOCTAVE=-loctave$SHLLINKEXT
   LIBCRUFT=-lcruft$SHLLINKEXT
 else
-  LIBOCTINTERP='$(top_builddir)/src/liboctinterp.$(LIBEXT)'
+  LIBOCTINTERP='$(top_builddir)/libinterp/liboctinterp.$(LIBEXT)'
   LIBOCTAVE='$(top_builddir)/liboctave/liboctave.$(LIBEXT)'
   LIBCRUFT='$(top_builddir)/libcruft/libcruft.$(LIBEXT)'
 fi
@@ -2355,14 +2355,14 @@
 #define OCTAVE_API OCTAVE_IMPORT
 #endif

-/* API macro for src */
+/* API macro for libinterp */
 #ifdef OCTINTERP_DLL
 #define OCTINTERP_API OCTAVE_EXPORT
 #else
 #define OCTINTERP_API OCTAVE_IMPORT
 #endif

-/* API macro for src/graphics */
+/* API macro for libinterp/graphics */
 #ifdef OCTGRAPHICS_DLL
 #define OCTGRAPHICS_API OCTAVE_EXPORT
 #else
@@ -2401,6 +2401,7 @@
   libcruft/Makefile
   libcruft/mkf77def
   libgnu/Makefile
+  libinterp/Makefile
   liboctave/Makefile
   scripts/Makefile
   src/Makefile
--- a/doc/interpreter/find-docstring-files.sh
+++ b/doc/interpreter/find-docstring-files.sh
@@ -15,8 +15,8 @@
   echo "$1/scripts/DOCSTRINGS"
 fi

-if [ -f "../../src/DOCSTRINGS" ]; then
-  echo "../../src/DOCSTRINGS"
+if [ -f "../../libinterp/DOCSTRINGS" ]; then
+  echo "../../libinterp/DOCSTRINGS"
 else
-  echo "$1/src/DOCSTRINGS"
+  echo "$1/libinterp/DOCSTRINGS"
 fi
--- a/gui/src/Makefile.am
+++ b/gui/src/Makefile.am
@@ -94,16 +94,16 @@
   -I$(srcdir)/../../libcruft/misc \
   -I../../liboctave \
   -I$(srcdir)/../../liboctave \
-  -I../../src \
-  -I../../src/interp-core \
-  -I../../src/interpfcn \
-  -I../../src/parse-tree \
-  -I$(srcdir)/../../src \
-  -I$(srcdir)/../../src/interp-core \
-  -I$(srcdir)/../../src/interpfcn \
-  -I$(srcdir)/../../src/octave-value \
-  -I$(srcdir)/../../src/operators \
-  -I$(srcdir)/../../src/parse-tree
+  -I../../libinterp \
+  -I../../libinterp/interp-core \
+  -I../../libinterp/interpfcn \
+  -I../../libinterp/parse-tree \
+  -I$(srcdir)/../../libinterp \
+  -I$(srcdir)/../../libinterp/interp-core \
+  -I$(srcdir)/../../libinterp/interpfcn \
+  -I$(srcdir)/../../libinterp/octave-value \
+  -I$(srcdir)/../../libtinerp/operators \
+  -I$(srcdir)/../../libinterp/parse-tree

 liboctgui_la_LDFLAGS = -L@QT_LIBDIR@
copy from src/Makefile.am
copy to libinterp/Makefile.am
--- a/src/Makefile.am
+++ b/libinterp/Makefile.am
@@ -36,36 +36,6 @@

 octlib_LTLIBRARIES = liboctinterp.la

-if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
-bin_PROGRAMS = \
-  mkoctfile \
-  $(OCTAVE_PROGRAMS) \
-  octave-config
-
-mkoctfile_SOURCES =
-nodist_mkoctfile_SOURCES = mkoctfile.cc
-mkoctfile_LDADD = $(top_builddir)/libgnu/libgnu.la $(LIBS)
-
-octave_config_SOURCES =
-nodist_octave_config_SOURCES = octave-config.cc
-octave_config_LDADD = \
-  corefcn/libcorefcn.la \
-	$(top_builddir)/libgnu/libgnu.la \
-	$(LIBS)
-
-BUILT_SOURCES_EXTRA = \
-  mkoctfile.cc \
-  octave-config.cc
-else
-bin_PROGRAMS = \
-  octave \
-  octave-cli
-
-bin_SCRIPTS = \
-  mkoctfile \
-  octave-config
-endif
-
 ## Order matters here.  Leave builtins.cc last, because it depends on
 ## $(DEF_FILES), and building those requires all the sources
 ## (except builtins.cc) to be available.
@@ -113,12 +83,8 @@
   mk-pkg-add \
   mkbuiltins \
   mkdefs \
-  mkoctfile.in.cc \
-  mkoctfile.in.sh \
   mkops \
   oct-conf.in.h \
-  octave-config.in.cc \
-  octave-config.in.sh \
   version.in.h \
   $(BUILT_DISTFILES)

@@ -219,40 +185,6 @@
 ## FIXME: Does this rule need to be uncommented?
 #fft.df fft.lo fft2.df fft2.lo fftn.df fftn.lo: CPPFLAGS += $(FFTW_XCPPFLAGS)

-OCTAVE_CORE_LIBS = \
-  liboctinterp.la \
-  ../liboctave/liboctave.la \
-  ../libcruft/libcruft.la
-
-octave_cli_SOURCES = main-cli.cc
-
-octave_cli_LDADD = \
-  $(OCTAVE_CORE_LIBS)
-  $(OCTAVE_LINK_DEPS)
-
-octave_cli_LDFLAGS = \
-  $(NO_UNDEFINED_LDFLAG) \
-  $(OCTAVE_LINK_OPTS)
-
-if AMCOND_BUILD_GUI
-  octave_SOURCES = main.cc
-  OCTAVE_GUI_LIBS = ../gui/src/liboctgui.la
-  OCTAVE_GUI_CPPFLAGS = -I$(top_srcdir)/gui/src
-else
-  octave_SOURCES = main-cli.cc
-  OCTAVE_GUI_LIBS =
-  OCTAVE_GUI_CPPFLAGS =
-endif
-
-octave_CPPFLAGS = $(OCTAVE_GUI_CPPFLAGS)
-
-octave_LDADD = \
-  $(OCTAVE_CORE_LIBS) \
-  $(OCTAVE_GUI_LIBS) \
-  $(OCTAVE_LINK_DEPS)
-
-octave_LDFLAGS = $(octave_cli_LDFLAGS)
-
 ## Section for defining and creating DEF_FILES
 SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(DIST_SRC))

@@ -329,53 +261,9 @@
 all-local: $(OCT_STAMP_FILES) $(DLDFCN_PKG_ADD_FILE)
 endif

-if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
-octave-config.cc: octave-config.in.cc Makefile
-	@$(do_subst_default_vals)
-
-mkoctfile.cc: mkoctfile.in.cc Makefile
-	@$(do_subst_config_vals)
-else
-octave-config: octave-config.in.sh Makefile
-	@$(do_subst_default_vals)
-	chmod a+rx $@
-
-mkoctfile: mkoctfile.in.sh Makefile
-	@$(do_subst_config_vals)
-	chmod a+rx $@
-endif
-
-install-exec-hook: make-version-links
-
 install-data-hook: install-oct

-uninstall-local: remove-version-links uninstall-oct
-
-make-version-links:
-	cd $(DESTDIR)$(bindir) && \
-	for f in $(basename $(bin_PROGRAMS)); do \
-	  mv $$f$(EXEEXT) $$f-$(version)$(EXEEXT) && \
-	    $(LN_S) $$f-$(version)$(EXEEXT) $$f$(EXEEXT); \
-	done
-if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS
-	cd $(DESTDIR)$(bindir) && \
-	for f in $(basename $(bin_SCRIPTS)); do \
-	  mv $$f $$f-$(version) && \
-	    $(LN_S) $$f-$(version) $$f; \
-	done
-endif
-
-remove-version-links:
-	for f in $(basename $(bin_PROGRAMS)); do \
-	  rm -f $(DESTDIR)$(bindir)/$$f-$(version)$(EXEEXT); \
-	done
-if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS
-	for f in $(basename $(bin_SCRIPTS)); do \
-	  rm -f $(DESTDIR)$(bindir)/$$f-$(version); \
-	done
-endif
-
-.PHONY: make-version-links remove-version-links
+uninstall-local: uninstall-oct

 if AMCOND_ENABLE_DYNAMIC_LINKING
 install-oct:
@@ -408,7 +296,6 @@
 .PHONY: install-oct uninstall-oct

 CLEANFILES = \
-  $(bin_SCRIPTS) \
   $(DLDFCN_PKG_ADD_FILE) \
   interpfcn/graphics-props.cc \
   parse-tree/oct-parse.output
rename from src/builtins.h
rename to libinterp/builtins.h
rename from src/corefcn/__contourc__.cc
rename to libinterp/corefcn/__contourc__.cc
rename from src/corefcn/__dispatch__.cc
rename to libinterp/corefcn/__dispatch__.cc
rename from src/corefcn/__lin_interpn__.cc
rename to libinterp/corefcn/__lin_interpn__.cc
rename from src/corefcn/__pchip_deriv__.cc
rename to libinterp/corefcn/__pchip_deriv__.cc
rename from src/corefcn/__qp__.cc
rename to libinterp/corefcn/__qp__.cc
rename from src/corefcn/balance.cc
rename to libinterp/corefcn/balance.cc
rename from src/corefcn/besselj.cc
rename to libinterp/corefcn/besselj.cc
rename from src/corefcn/betainc.cc
rename to libinterp/corefcn/betainc.cc
rename from src/corefcn/bitfcns.cc
rename to libinterp/corefcn/bitfcns.cc
rename from src/corefcn/bsxfun.cc
rename to libinterp/corefcn/bsxfun.cc
rename from src/corefcn/cellfun.cc
rename to libinterp/corefcn/cellfun.cc
rename from src/corefcn/colloc.cc
rename to libinterp/corefcn/colloc.cc
rename from src/corefcn/conv2.cc
rename to libinterp/corefcn/conv2.cc
rename from src/corefcn/daspk.cc
rename to libinterp/corefcn/daspk.cc
rename from src/corefcn/dasrt.cc
rename to libinterp/corefcn/dasrt.cc
rename from src/corefcn/dassl.cc
rename to libinterp/corefcn/dassl.cc
rename from src/corefcn/det.cc
rename to libinterp/corefcn/det.cc
rename from src/corefcn/dlmread.cc
rename to libinterp/corefcn/dlmread.cc
rename from src/corefcn/dot.cc
rename to libinterp/corefcn/dot.cc
rename from src/corefcn/eig.cc
rename to libinterp/corefcn/eig.cc
rename from src/corefcn/fft.cc
rename to libinterp/corefcn/fft.cc
rename from src/corefcn/fft2.cc
rename to libinterp/corefcn/fft2.cc
rename from src/corefcn/fftn.cc
rename to libinterp/corefcn/fftn.cc
rename from src/corefcn/filter.cc
rename to libinterp/corefcn/filter.cc
rename from src/corefcn/find.cc
rename to libinterp/corefcn/find.cc
rename from src/corefcn/gammainc.cc
rename to libinterp/corefcn/gammainc.cc
rename from src/corefcn/gcd.cc
rename to libinterp/corefcn/gcd.cc
rename from src/corefcn/getgrent.cc
rename to libinterp/corefcn/getgrent.cc
rename from src/corefcn/getpwent.cc
rename to libinterp/corefcn/getpwent.cc
rename from src/corefcn/getrusage.cc
rename to libinterp/corefcn/getrusage.cc
rename from src/corefcn/givens.cc
rename to libinterp/corefcn/givens.cc
rename from src/corefcn/hess.cc
rename to libinterp/corefcn/hess.cc
rename from src/corefcn/hex2num.cc
rename to libinterp/corefcn/hex2num.cc
rename from src/corefcn/inv.cc
rename to libinterp/corefcn/inv.cc
rename from src/corefcn/kron.cc
rename to libinterp/corefcn/kron.cc
rename from src/corefcn/lookup.cc
rename to libinterp/corefcn/lookup.cc
rename from src/corefcn/lsode.cc
rename to libinterp/corefcn/lsode.cc
rename from src/corefcn/lu.cc
rename to libinterp/corefcn/lu.cc
rename from src/corefcn/luinc.cc
rename to libinterp/corefcn/luinc.cc
rename from src/corefcn/mappers.cc
rename to libinterp/corefcn/mappers.cc
rename from src/corefcn/matrix_type.cc
rename to libinterp/corefcn/matrix_type.cc
rename from src/corefcn/max.cc
rename to libinterp/corefcn/max.cc
rename from src/corefcn/md5sum.cc
rename to libinterp/corefcn/md5sum.cc
rename from src/corefcn/mgorth.cc
rename to libinterp/corefcn/mgorth.cc
rename from src/corefcn/module.mk
rename to libinterp/corefcn/module.mk
rename from src/corefcn/nproc.cc
rename to libinterp/corefcn/nproc.cc
rename from src/corefcn/pinv.cc
rename to libinterp/corefcn/pinv.cc
rename from src/corefcn/quad.cc
rename to libinterp/corefcn/quad.cc
rename from src/corefcn/quadcc.cc
rename to libinterp/corefcn/quadcc.cc
rename from src/corefcn/qz.cc
rename to libinterp/corefcn/qz.cc
rename from src/corefcn/rand.cc
rename to libinterp/corefcn/rand.cc
rename from src/corefcn/rcond.cc
rename to libinterp/corefcn/rcond.cc
rename from src/corefcn/regexp.cc
rename to libinterp/corefcn/regexp.cc
rename from src/corefcn/schur.cc
rename to libinterp/corefcn/schur.cc
rename from src/corefcn/sparse.cc
rename to libinterp/corefcn/sparse.cc
rename from src/corefcn/spparms.cc
rename to libinterp/corefcn/spparms.cc
rename from src/corefcn/sqrtm.cc
rename to libinterp/corefcn/sqrtm.cc
rename from src/corefcn/str2double.cc
rename to libinterp/corefcn/str2double.cc
rename from src/corefcn/strfind.cc
rename to libinterp/corefcn/strfind.cc
rename from src/corefcn/strfns.cc
rename to libinterp/corefcn/strfns.cc
rename from src/corefcn/sub2ind.cc
rename to libinterp/corefcn/sub2ind.cc
rename from src/corefcn/svd.cc
rename to libinterp/corefcn/svd.cc
rename from src/corefcn/syl.cc
rename to libinterp/corefcn/syl.cc
rename from src/corefcn/syscalls.cc
rename to libinterp/corefcn/syscalls.cc
rename from src/corefcn/time.cc
rename to libinterp/corefcn/time.cc
rename from src/corefcn/tril.cc
rename to libinterp/corefcn/tril.cc
rename from src/corefcn/typecast.cc
rename to libinterp/corefcn/typecast.cc
rename from src/dldfcn/__delaunayn__.cc
rename to libinterp/dldfcn/__delaunayn__.cc
rename from src/dldfcn/__dsearchn__.cc
rename to libinterp/dldfcn/__dsearchn__.cc
rename from src/dldfcn/__fltk_uigetfile__.cc
rename to libinterp/dldfcn/__fltk_uigetfile__.cc
rename from src/dldfcn/__glpk__.cc
rename to libinterp/dldfcn/__glpk__.cc
rename from src/dldfcn/__init_fltk__.cc
rename to libinterp/dldfcn/__init_fltk__.cc
rename from src/dldfcn/__init_gnuplot__.cc
rename to libinterp/dldfcn/__init_gnuplot__.cc
rename from src/dldfcn/__magick_read__.cc
rename to libinterp/dldfcn/__magick_read__.cc
rename from src/dldfcn/__voronoi__.cc
rename to libinterp/dldfcn/__voronoi__.cc
rename from src/dldfcn/amd.cc
rename to libinterp/dldfcn/amd.cc
rename from src/dldfcn/ccolamd.cc
rename to libinterp/dldfcn/ccolamd.cc
rename from src/dldfcn/chol.cc
rename to libinterp/dldfcn/chol.cc
rename from src/dldfcn/colamd.cc
rename to libinterp/dldfcn/colamd.cc
rename from src/dldfcn/config-module.awk
rename to libinterp/dldfcn/config-module.awk
rename from src/dldfcn/config-module.sh
rename to libinterp/dldfcn/config-module.sh
--- a/src/dldfcn/config-module.sh
+++ b/libinterp/dldfcn/config-module.sh
@@ -12,7 +12,7 @@

 move_if_change="$top_srcdir/build-aux/move-if-change"

-dld_dir=$top_srcdir/src/dldfcn
+dld_dir=$top_srcdir/libinterp/dldfcn

 $AWK -f $dld_dir/config-module.awk < $dld_dir/module-files > $dld_dir/module.mk-t
rename from src/dldfcn/convhulln.cc
rename to libinterp/dldfcn/convhulln.cc
rename from src/dldfcn/dmperm.cc
rename to libinterp/dldfcn/dmperm.cc
rename from src/dldfcn/eigs.cc
rename to libinterp/dldfcn/eigs.cc
rename from src/dldfcn/fftw.cc
rename to libinterp/dldfcn/fftw.cc
rename from src/dldfcn/module-files
rename to libinterp/dldfcn/module-files
rename from src/dldfcn/oct-qhull.h
rename to libinterp/dldfcn/oct-qhull.h
rename from src/dldfcn/qr.cc
rename to libinterp/dldfcn/qr.cc
rename from src/dldfcn/symbfact.cc
rename to libinterp/dldfcn/symbfact.cc
rename from src/dldfcn/symrcm.cc
rename to libinterp/dldfcn/symrcm.cc
rename from src/dldfcn/tsearch.cc
rename to libinterp/dldfcn/tsearch.cc
rename from src/dldfcn/urlwrite.cc
rename to libinterp/dldfcn/urlwrite.cc
rename from src/find-defun-files.sh
rename to libinterp/find-defun-files.sh
rename from src/gendoc.pl
rename to libinterp/gendoc.pl
rename from src/genprops.awk
rename to libinterp/genprops.awk
rename from src/interp-core/Cell.cc
rename to libinterp/interp-core/Cell.cc
rename from src/interp-core/Cell.h
rename to libinterp/interp-core/Cell.h
rename from src/interp-core/c-file-ptr-stream.cc
rename to libinterp/interp-core/c-file-ptr-stream.cc
rename from src/interp-core/c-file-ptr-stream.h
rename to libinterp/interp-core/c-file-ptr-stream.h
rename from src/interp-core/comment-list.cc
rename to libinterp/interp-core/comment-list.cc
rename from src/interp-core/comment-list.h
rename to libinterp/interp-core/comment-list.h
rename from src/interp-core/cutils.c
rename to libinterp/interp-core/cutils.c
rename from src/interp-core/cutils.h
rename to libinterp/interp-core/cutils.h
rename from src/interp-core/defun-dld.h
rename to libinterp/interp-core/defun-dld.h
rename from src/interp-core/defun-int.h
rename to libinterp/interp-core/defun-int.h
rename from src/interp-core/display.cc
rename to libinterp/interp-core/display.cc
rename from src/interp-core/display.h
rename to libinterp/interp-core/display.h
rename from src/interp-core/dynamic-ld.cc
rename to libinterp/interp-core/dynamic-ld.cc
rename from src/interp-core/dynamic-ld.h
rename to libinterp/interp-core/dynamic-ld.h
rename from src/interp-core/gl-render.cc
rename to libinterp/interp-core/gl-render.cc
rename from src/interp-core/gl-render.h
rename to libinterp/interp-core/gl-render.h
rename from src/interp-core/gl2ps-renderer.cc
rename to libinterp/interp-core/gl2ps-renderer.cc
rename from src/interp-core/gl2ps-renderer.h
rename to libinterp/interp-core/gl2ps-renderer.h
rename from src/interp-core/gl2ps.c
rename to libinterp/interp-core/gl2ps.c
rename from src/interp-core/gl2ps.h
rename to libinterp/interp-core/gl2ps.h
rename from src/interp-core/gripes.cc
rename to libinterp/interp-core/gripes.cc
rename from src/interp-core/gripes.h
rename to libinterp/interp-core/gripes.h
rename from src/interp-core/jit-ir.cc
rename to libinterp/interp-core/jit-ir.cc
rename from src/interp-core/jit-ir.h
rename to libinterp/interp-core/jit-ir.h
rename from src/interp-core/jit-typeinfo.cc
rename to libinterp/interp-core/jit-typeinfo.cc
rename from src/interp-core/jit-typeinfo.h
rename to libinterp/interp-core/jit-typeinfo.h
rename from src/interp-core/jit-util.cc
rename to libinterp/interp-core/jit-util.cc
rename from src/interp-core/jit-util.h
rename to libinterp/interp-core/jit-util.h
rename from src/interp-core/ls-ascii-helper.cc
rename to libinterp/interp-core/ls-ascii-helper.cc
rename from src/interp-core/ls-ascii-helper.h
rename to libinterp/interp-core/ls-ascii-helper.h
rename from src/interp-core/ls-hdf5.cc
rename to libinterp/interp-core/ls-hdf5.cc
rename from src/interp-core/ls-hdf5.h
rename to libinterp/interp-core/ls-hdf5.h
rename from src/interp-core/ls-mat-ascii.cc
rename to libinterp/interp-core/ls-mat-ascii.cc
rename from src/interp-core/ls-mat-ascii.h
rename to libinterp/interp-core/ls-mat-ascii.h
rename from src/interp-core/ls-mat4.cc
rename to libinterp/interp-core/ls-mat4.cc
rename from src/interp-core/ls-mat4.h
rename to libinterp/interp-core/ls-mat4.h
rename from src/interp-core/ls-mat5.cc
rename to libinterp/interp-core/ls-mat5.cc
rename from src/interp-core/ls-mat5.h
rename to libinterp/interp-core/ls-mat5.h
rename from src/interp-core/ls-oct-binary.cc
rename to libinterp/interp-core/ls-oct-binary.cc
rename from src/interp-core/ls-oct-binary.h
rename to libinterp/interp-core/ls-oct-binary.h
rename from src/interp-core/ls-utils.cc
rename to libinterp/interp-core/ls-utils.cc
rename from src/interp-core/ls-utils.h
rename to libinterp/interp-core/ls-utils.h
rename from src/interp-core/matherr.c
rename to libinterp/interp-core/matherr.c
rename from src/interp-core/mex.cc
rename to libinterp/interp-core/mex.cc
rename from src/interp-core/mex.h
rename to libinterp/interp-core/mex.h
rename from src/interp-core/mexproto.h
rename to libinterp/interp-core/mexproto.h
rename from src/interp-core/module.mk
rename to libinterp/interp-core/module.mk
rename from src/interp-core/mxarray.in.h
rename to libinterp/interp-core/mxarray.in.h
rename from src/interp-core/oct-errno.h
rename to libinterp/interp-core/oct-errno.h
rename from src/interp-core/oct-errno.in.cc
rename to libinterp/interp-core/oct-errno.in.cc
rename from src/interp-core/oct-fstrm.cc
rename to libinterp/interp-core/oct-fstrm.cc
rename from src/interp-core/oct-fstrm.h
rename to libinterp/interp-core/oct-fstrm.h
rename from src/interp-core/oct-hdf5.h
rename to libinterp/interp-core/oct-hdf5.h
rename from src/interp-core/oct-iostrm.cc
rename to libinterp/interp-core/oct-iostrm.cc
rename from src/interp-core/oct-iostrm.h
rename to libinterp/interp-core/oct-iostrm.h
rename from src/interp-core/oct-lvalue.cc
rename to libinterp/interp-core/oct-lvalue.cc
rename from src/interp-core/oct-lvalue.h
rename to libinterp/interp-core/oct-lvalue.h
rename from src/interp-core/oct-map.cc
rename to libinterp/interp-core/oct-map.cc
rename from src/interp-core/oct-map.h
rename to libinterp/interp-core/oct-map.h
rename from src/interp-core/oct-obj.cc
rename to libinterp/interp-core/oct-obj.cc
rename from src/interp-core/oct-obj.h
rename to libinterp/interp-core/oct-obj.h
rename from src/interp-core/oct-prcstrm.cc
rename to libinterp/interp-core/oct-prcstrm.cc
rename from src/interp-core/oct-prcstrm.h
rename to libinterp/interp-core/oct-prcstrm.h
rename from src/interp-core/oct-procbuf.cc
rename to libinterp/interp-core/oct-procbuf.cc
rename from src/interp-core/oct-procbuf.h
rename to libinterp/interp-core/oct-procbuf.h
rename from src/interp-core/oct-stdstrm.h
rename to libinterp/interp-core/oct-stdstrm.h
rename from src/interp-core/oct-stream.cc
rename to libinterp/interp-core/oct-stream.cc
rename from src/interp-core/oct-stream.h
rename to libinterp/interp-core/oct-stream.h
rename from src/interp-core/oct-strstrm.cc
rename to libinterp/interp-core/oct-strstrm.cc
rename from src/interp-core/oct-strstrm.h
rename to libinterp/interp-core/oct-strstrm.h
rename from src/interp-core/oct.h
rename to libinterp/interp-core/oct.h
rename from src/interp-core/procstream.cc
rename to libinterp/interp-core/procstream.cc
rename from src/interp-core/procstream.h
rename to libinterp/interp-core/procstream.h
rename from src/interp-core/pt-jit.cc
rename to libinterp/interp-core/pt-jit.cc
rename from src/interp-core/pt-jit.h
rename to libinterp/interp-core/pt-jit.h
rename from src/interp-core/siglist.c
rename to libinterp/interp-core/siglist.c
rename from src/interp-core/siglist.h
rename to libinterp/interp-core/siglist.h
rename from src/interp-core/sparse-xdiv.cc
rename to libinterp/interp-core/sparse-xdiv.cc
rename from src/interp-core/sparse-xdiv.h
rename to libinterp/interp-core/sparse-xdiv.h
rename from src/interp-core/sparse-xpow.cc
rename to libinterp/interp-core/sparse-xpow.cc
rename from src/interp-core/sparse-xpow.h
rename to libinterp/interp-core/sparse-xpow.h
rename from src/interp-core/txt-eng-ft.cc
rename to libinterp/interp-core/txt-eng-ft.cc
rename from src/interp-core/txt-eng-ft.h
rename to libinterp/interp-core/txt-eng-ft.h
rename from src/interp-core/txt-eng.h
rename to libinterp/interp-core/txt-eng.h
rename from src/interp-core/unwind-prot.cc
rename to libinterp/interp-core/unwind-prot.cc
rename from src/interp-core/unwind-prot.h
rename to libinterp/interp-core/unwind-prot.h
rename from src/interp-core/xdiv.cc
rename to libinterp/interp-core/xdiv.cc
rename from src/interp-core/xdiv.h
rename to libinterp/interp-core/xdiv.h
rename from src/interp-core/xgl2ps.c
rename to libinterp/interp-core/xgl2ps.c
rename from src/interp-core/xnorm.cc
rename to libinterp/interp-core/xnorm.cc
rename from src/interp-core/xnorm.h
rename to libinterp/interp-core/xnorm.h
rename from src/interp-core/xpow.cc
rename to libinterp/interp-core/xpow.cc
rename from src/interp-core/xpow.h
rename to libinterp/interp-core/xpow.h
rename from src/interp-core/zfstream.cc
rename to libinterp/interp-core/zfstream.cc
rename from src/interp-core/zfstream.h
rename to libinterp/interp-core/zfstream.h
rename from src/interpfcn/data.cc
rename to libinterp/interpfcn/data.cc
rename from src/interpfcn/data.h
rename to libinterp/interpfcn/data.h
rename from src/interpfcn/debug.cc
rename to libinterp/interpfcn/debug.cc
rename from src/interpfcn/debug.h
rename to libinterp/interpfcn/debug.h
rename from src/interpfcn/defaults.cc
rename to libinterp/interpfcn/defaults.cc
rename from src/interpfcn/defaults.in.h
rename to libinterp/interpfcn/defaults.in.h
rename from src/interpfcn/defun.cc
rename to libinterp/interpfcn/defun.cc
rename from src/interpfcn/defun.h
rename to libinterp/interpfcn/defun.h
rename from src/interpfcn/dirfns.cc
rename to libinterp/interpfcn/dirfns.cc
rename from src/interpfcn/dirfns.h
rename to libinterp/interpfcn/dirfns.h
rename from src/interpfcn/error.cc
rename to libinterp/interpfcn/error.cc
rename from src/interpfcn/error.h
rename to libinterp/interpfcn/error.h
rename from src/interpfcn/file-io.cc
rename to libinterp/interpfcn/file-io.cc
rename from src/interpfcn/file-io.h
rename to libinterp/interpfcn/file-io.h
rename from src/interpfcn/graphics.cc
rename to libinterp/interpfcn/graphics.cc
rename from src/interpfcn/graphics.in.h
rename to libinterp/interpfcn/graphics.in.h
rename from src/interpfcn/help.cc
rename to libinterp/interpfcn/help.cc
rename from src/interpfcn/help.h
rename to libinterp/interpfcn/help.h
rename from src/interpfcn/input.cc
rename to libinterp/interpfcn/input.cc
rename from src/interpfcn/input.h
rename to libinterp/interpfcn/input.h
rename from src/interpfcn/load-path.cc
rename to libinterp/interpfcn/load-path.cc
rename from src/interpfcn/load-path.h
rename to libinterp/interpfcn/load-path.h
rename from src/interpfcn/load-save.cc
rename to libinterp/interpfcn/load-save.cc
rename from src/interpfcn/load-save.h
rename to libinterp/interpfcn/load-save.h
rename from src/interpfcn/ls-oct-ascii.cc
rename to libinterp/interpfcn/ls-oct-ascii.cc
rename from src/interpfcn/ls-oct-ascii.h
rename to libinterp/interpfcn/ls-oct-ascii.h
rename from src/interpfcn/module.mk
rename to libinterp/interpfcn/module.mk
rename from src/interpfcn/oct-hist.cc
rename to libinterp/interpfcn/oct-hist.cc
rename from src/interpfcn/oct-hist.h
rename to libinterp/interpfcn/oct-hist.h
rename from src/interpfcn/pager.cc
rename to libinterp/interpfcn/pager.cc
rename from src/interpfcn/pager.h
rename to libinterp/interpfcn/pager.h
rename from src/interpfcn/pr-output.cc
rename to libinterp/interpfcn/pr-output.cc
rename from src/interpfcn/pr-output.h
rename to libinterp/interpfcn/pr-output.h
rename from src/interpfcn/profiler.cc
rename to libinterp/interpfcn/profiler.cc
rename from src/interpfcn/profiler.h
rename to libinterp/interpfcn/profiler.h
rename from src/interpfcn/sighandlers.cc
rename to libinterp/interpfcn/sighandlers.cc
rename from src/interpfcn/sighandlers.h
rename to libinterp/interpfcn/sighandlers.h
rename from src/interpfcn/symtab.cc
rename to libinterp/interpfcn/symtab.cc
rename from src/interpfcn/symtab.h
rename to libinterp/interpfcn/symtab.h
rename from src/interpfcn/sysdep.cc
rename to libinterp/interpfcn/sysdep.cc
rename from src/interpfcn/sysdep.h
rename to libinterp/interpfcn/sysdep.h
rename from src/interpfcn/toplev.cc
rename to libinterp/interpfcn/toplev.cc
rename from src/interpfcn/toplev.h
rename to libinterp/interpfcn/toplev.h
rename from src/interpfcn/utils.cc
rename to libinterp/interpfcn/utils.cc
rename from src/interpfcn/utils.h
rename to libinterp/interpfcn/utils.h
rename from src/interpfcn/variables.cc
rename to libinterp/interpfcn/variables.cc
rename from src/interpfcn/variables.h
rename to libinterp/interpfcn/variables.h
rename from src/link-deps.mk
rename to libinterp/link-deps.mk
rename from src/mk-errno-list
rename to libinterp/mk-errno-list
rename from src/mk-pkg-add
rename to libinterp/mk-pkg-add
rename from src/mkbuiltins
rename to libinterp/mkbuiltins
rename from src/mkdefs
rename to libinterp/mkdefs
rename from src/mkdocs
rename to libinterp/mkdocs
rename from src/mkops
rename to libinterp/mkops
rename from src/oct-conf.in.h
rename to libinterp/oct-conf.in.h
rename from src/octave-value/module.mk
rename to libinterp/octave-value/module.mk
rename from src/octave-value/ov-base-diag.cc
rename to libinterp/octave-value/ov-base-diag.cc
rename from src/octave-value/ov-base-diag.h
rename to libinterp/octave-value/ov-base-diag.h
rename from src/octave-value/ov-base-int.cc
rename to libinterp/octave-value/ov-base-int.cc
rename from src/octave-value/ov-base-int.h
rename to libinterp/octave-value/ov-base-int.h
rename from src/octave-value/ov-base-mat.cc
rename to libinterp/octave-value/ov-base-mat.cc
rename from src/octave-value/ov-base-mat.h
rename to libinterp/octave-value/ov-base-mat.h
rename from src/octave-value/ov-base-scalar.cc
rename to libinterp/octave-value/ov-base-scalar.cc
rename from src/octave-value/ov-base-scalar.h
rename to libinterp/octave-value/ov-base-scalar.h
rename from src/octave-value/ov-base-sparse.cc
rename to libinterp/octave-value/ov-base-sparse.cc
rename from src/octave-value/ov-base-sparse.h
rename to libinterp/octave-value/ov-base-sparse.h
rename from src/octave-value/ov-base.cc
rename to libinterp/octave-value/ov-base.cc
rename from src/octave-value/ov-base.h
rename to libinterp/octave-value/ov-base.h
rename from src/octave-value/ov-bool-mat.cc
rename to libinterp/octave-value/ov-bool-mat.cc
rename from src/octave-value/ov-bool-mat.h
rename to libinterp/octave-value/ov-bool-mat.h
rename from src/octave-value/ov-bool-sparse.cc
rename to libinterp/octave-value/ov-bool-sparse.cc
rename from src/octave-value/ov-bool-sparse.h
rename to libinterp/octave-value/ov-bool-sparse.h
rename from src/octave-value/ov-bool.cc
rename to libinterp/octave-value/ov-bool.cc
rename from src/octave-value/ov-bool.h
rename to libinterp/octave-value/ov-bool.h
rename from src/octave-value/ov-builtin.cc
rename to libinterp/octave-value/ov-builtin.cc
rename from src/octave-value/ov-builtin.h
rename to libinterp/octave-value/ov-builtin.h
rename from src/octave-value/ov-cell.cc
rename to libinterp/octave-value/ov-cell.cc
rename from src/octave-value/ov-cell.h
rename to libinterp/octave-value/ov-cell.h
rename from src/octave-value/ov-ch-mat.cc
rename to libinterp/octave-value/ov-ch-mat.cc
rename from src/octave-value/ov-ch-mat.h
rename to libinterp/octave-value/ov-ch-mat.h
rename from src/octave-value/ov-class.cc
rename to libinterp/octave-value/ov-class.cc
rename from src/octave-value/ov-class.h
rename to libinterp/octave-value/ov-class.h
rename from src/octave-value/ov-colon.cc
rename to libinterp/octave-value/ov-colon.cc
rename from src/octave-value/ov-colon.h
rename to libinterp/octave-value/ov-colon.h
rename from src/octave-value/ov-complex.cc
rename to libinterp/octave-value/ov-complex.cc
rename from src/octave-value/ov-complex.h
rename to libinterp/octave-value/ov-complex.h
rename from src/octave-value/ov-cs-list.cc
rename to libinterp/octave-value/ov-cs-list.cc
rename from src/octave-value/ov-cs-list.h
rename to libinterp/octave-value/ov-cs-list.h
rename from src/octave-value/ov-cx-diag.cc
rename to libinterp/octave-value/ov-cx-diag.cc
rename from src/octave-value/ov-cx-diag.h
rename to libinterp/octave-value/ov-cx-diag.h
rename from src/octave-value/ov-cx-mat.cc
rename to libinterp/octave-value/ov-cx-mat.cc
rename from src/octave-value/ov-cx-mat.h
rename to libinterp/octave-value/ov-cx-mat.h
rename from src/octave-value/ov-cx-sparse.cc
rename to libinterp/octave-value/ov-cx-sparse.cc
rename from src/octave-value/ov-cx-sparse.h
rename to libinterp/octave-value/ov-cx-sparse.h
rename from src/octave-value/ov-dld-fcn.cc
rename to libinterp/octave-value/ov-dld-fcn.cc
rename from src/octave-value/ov-dld-fcn.h
rename to libinterp/octave-value/ov-dld-fcn.h
rename from src/octave-value/ov-fcn-handle.cc
rename to libinterp/octave-value/ov-fcn-handle.cc
rename from src/octave-value/ov-fcn-handle.h
rename to libinterp/octave-value/ov-fcn-handle.h
rename from src/octave-value/ov-fcn-inline.cc
rename to libinterp/octave-value/ov-fcn-inline.cc
rename from src/octave-value/ov-fcn-inline.h
rename to libinterp/octave-value/ov-fcn-inline.h
rename from src/octave-value/ov-fcn.cc
rename to libinterp/octave-value/ov-fcn.cc
rename from src/octave-value/ov-fcn.h
rename to libinterp/octave-value/ov-fcn.h
rename from src/octave-value/ov-float.cc
rename to libinterp/octave-value/ov-float.cc
rename from src/octave-value/ov-float.h
rename to libinterp/octave-value/ov-float.h
rename from src/octave-value/ov-flt-complex.cc
rename to libinterp/octave-value/ov-flt-complex.cc
rename from src/octave-value/ov-flt-complex.h
rename to libinterp/octave-value/ov-flt-complex.h
rename from src/octave-value/ov-flt-cx-diag.cc
rename to libinterp/octave-value/ov-flt-cx-diag.cc
rename from src/octave-value/ov-flt-cx-diag.h
rename to libinterp/octave-value/ov-flt-cx-diag.h
rename from src/octave-value/ov-flt-cx-mat.cc
rename to libinterp/octave-value/ov-flt-cx-mat.cc
rename from src/octave-value/ov-flt-cx-mat.h
rename to libinterp/octave-value/ov-flt-cx-mat.h
rename from src/octave-value/ov-flt-re-diag.cc
rename to libinterp/octave-value/ov-flt-re-diag.cc
rename from src/octave-value/ov-flt-re-diag.h
rename to libinterp/octave-value/ov-flt-re-diag.h
rename from src/octave-value/ov-flt-re-mat.cc
rename to libinterp/octave-value/ov-flt-re-mat.cc
rename from src/octave-value/ov-flt-re-mat.h
rename to libinterp/octave-value/ov-flt-re-mat.h
rename from src/octave-value/ov-int-traits.h
rename to libinterp/octave-value/ov-int-traits.h
rename from src/octave-value/ov-int16.cc
rename to libinterp/octave-value/ov-int16.cc
rename from src/octave-value/ov-int16.h
rename to libinterp/octave-value/ov-int16.h
rename from src/octave-value/ov-int32.cc
rename to libinterp/octave-value/ov-int32.cc
rename from src/octave-value/ov-int32.h
rename to libinterp/octave-value/ov-int32.h
rename from src/octave-value/ov-int64.cc
rename to libinterp/octave-value/ov-int64.cc
rename from src/octave-value/ov-int64.h
rename to libinterp/octave-value/ov-int64.h
rename from src/octave-value/ov-int8.cc
rename to libinterp/octave-value/ov-int8.cc
rename from src/octave-value/ov-int8.h
rename to libinterp/octave-value/ov-int8.h
rename from src/octave-value/ov-intx.h
rename to libinterp/octave-value/ov-intx.h
rename from src/octave-value/ov-lazy-idx.cc
rename to libinterp/octave-value/ov-lazy-idx.cc
rename from src/octave-value/ov-lazy-idx.h
rename to libinterp/octave-value/ov-lazy-idx.h
rename from src/octave-value/ov-mex-fcn.cc
rename to libinterp/octave-value/ov-mex-fcn.cc
rename from src/octave-value/ov-mex-fcn.h
rename to libinterp/octave-value/ov-mex-fcn.h
rename from src/octave-value/ov-null-mat.cc
rename to libinterp/octave-value/ov-null-mat.cc
rename from src/octave-value/ov-null-mat.h
rename to libinterp/octave-value/ov-null-mat.h
rename from src/octave-value/ov-oncleanup.cc
rename to libinterp/octave-value/ov-oncleanup.cc
rename from src/octave-value/ov-oncleanup.h
rename to libinterp/octave-value/ov-oncleanup.h
rename from src/octave-value/ov-perm.cc
rename to libinterp/octave-value/ov-perm.cc
rename from src/octave-value/ov-perm.h
rename to libinterp/octave-value/ov-perm.h
rename from src/octave-value/ov-range.cc
rename to libinterp/octave-value/ov-range.cc
rename from src/octave-value/ov-range.h
rename to libinterp/octave-value/ov-range.h
rename from src/octave-value/ov-re-diag.cc
rename to libinterp/octave-value/ov-re-diag.cc
rename from src/octave-value/ov-re-diag.h
rename to libinterp/octave-value/ov-re-diag.h
rename from src/octave-value/ov-re-mat.cc
rename to libinterp/octave-value/ov-re-mat.cc
rename from src/octave-value/ov-re-mat.h
rename to libinterp/octave-value/ov-re-mat.h
rename from src/octave-value/ov-re-sparse.cc
rename to libinterp/octave-value/ov-re-sparse.cc
rename from src/octave-value/ov-re-sparse.h
rename to libinterp/octave-value/ov-re-sparse.h
rename from src/octave-value/ov-scalar.cc
rename to libinterp/octave-value/ov-scalar.cc
rename from src/octave-value/ov-scalar.h
rename to libinterp/octave-value/ov-scalar.h
rename from src/octave-value/ov-str-mat.cc
rename to libinterp/octave-value/ov-str-mat.cc
rename from src/octave-value/ov-str-mat.h
rename to libinterp/octave-value/ov-str-mat.h
rename from src/octave-value/ov-struct.cc
rename to libinterp/octave-value/ov-struct.cc
rename from src/octave-value/ov-struct.h
rename to libinterp/octave-value/ov-struct.h
rename from src/octave-value/ov-type-conv.h
rename to libinterp/octave-value/ov-type-conv.h
rename from src/octave-value/ov-typeinfo.cc
rename to libinterp/octave-value/ov-typeinfo.cc
rename from src/octave-value/ov-typeinfo.h
rename to libinterp/octave-value/ov-typeinfo.h
rename from src/octave-value/ov-uint16.cc
rename to libinterp/octave-value/ov-uint16.cc
rename from src/octave-value/ov-uint16.h
rename to libinterp/octave-value/ov-uint16.h
rename from src/octave-value/ov-uint32.cc
rename to libinterp/octave-value/ov-uint32.cc
rename from src/octave-value/ov-uint32.h
rename to libinterp/octave-value/ov-uint32.h
rename from src/octave-value/ov-uint64.cc
rename to libinterp/octave-value/ov-uint64.cc
rename from src/octave-value/ov-uint64.h
rename to libinterp/octave-value/ov-uint64.h
rename from src/octave-value/ov-uint8.cc
rename to libinterp/octave-value/ov-uint8.cc
rename from src/octave-value/ov-uint8.h
rename to libinterp/octave-value/ov-uint8.h
rename from src/octave-value/ov-usr-fcn.cc
rename to libinterp/octave-value/ov-usr-fcn.cc
rename from src/octave-value/ov-usr-fcn.h
rename to libinterp/octave-value/ov-usr-fcn.h
rename from src/octave-value/ov.cc
rename to libinterp/octave-value/ov.cc
rename from src/octave-value/ov.h
rename to libinterp/octave-value/ov.h
rename from src/octave.cc
rename to libinterp/octave.cc
rename from src/octave.h
rename to libinterp/octave.h
rename from src/operators/module.mk
rename to libinterp/operators/module.mk
rename from src/operators/op-b-b.cc
rename to libinterp/operators/op-b-b.cc
rename from src/operators/op-b-bm.cc
rename to libinterp/operators/op-b-bm.cc
rename from src/operators/op-b-sbm.cc
rename to libinterp/operators/op-b-sbm.cc
rename from src/operators/op-bm-b.cc
rename to libinterp/operators/op-bm-b.cc
rename from src/operators/op-bm-bm.cc
rename to libinterp/operators/op-bm-bm.cc
rename from src/operators/op-bm-sbm.cc
rename to libinterp/operators/op-bm-sbm.cc
rename from src/operators/op-cdm-cdm.cc
rename to libinterp/operators/op-cdm-cdm.cc
rename from src/operators/op-cdm-cm.cc
rename to libinterp/operators/op-cdm-cm.cc
rename from src/operators/op-cdm-cs.cc
rename to libinterp/operators/op-cdm-cs.cc
rename from src/operators/op-cdm-dm.cc
rename to libinterp/operators/op-cdm-dm.cc
rename from src/operators/op-cdm-m.cc
rename to libinterp/operators/op-cdm-m.cc
rename from src/operators/op-cdm-s.cc
rename to libinterp/operators/op-cdm-s.cc
rename from src/operators/op-cell.cc
rename to libinterp/operators/op-cell.cc
rename from src/operators/op-chm.cc
rename to libinterp/operators/op-chm.cc
rename from src/operators/op-class.cc
rename to libinterp/operators/op-class.cc
rename from src/operators/op-cm-cdm.cc
rename to libinterp/operators/op-cm-cdm.cc
rename from src/operators/op-cm-cm.cc
rename to libinterp/operators/op-cm-cm.cc
rename from src/operators/op-cm-cs.cc
rename to libinterp/operators/op-cm-cs.cc
rename from src/operators/op-cm-dm.cc
rename to libinterp/operators/op-cm-dm.cc
rename from src/operators/op-cm-m.cc
rename to libinterp/operators/op-cm-m.cc
rename from src/operators/op-cm-pm.cc
rename to libinterp/operators/op-cm-pm.cc
rename from src/operators/op-cm-s.cc
rename to libinterp/operators/op-cm-s.cc
rename from src/operators/op-cm-scm.cc
rename to libinterp/operators/op-cm-scm.cc
rename from src/operators/op-cm-sm.cc
rename to libinterp/operators/op-cm-sm.cc
rename from src/operators/op-cs-cm.cc
rename to libinterp/operators/op-cs-cm.cc
rename from src/operators/op-cs-cs.cc
rename to libinterp/operators/op-cs-cs.cc
rename from src/operators/op-cs-m.cc
rename to libinterp/operators/op-cs-m.cc
rename from src/operators/op-cs-s.cc
rename to libinterp/operators/op-cs-s.cc
rename from src/operators/op-cs-scm.cc
rename to libinterp/operators/op-cs-scm.cc
rename from src/operators/op-cs-sm.cc
rename to libinterp/operators/op-cs-sm.cc
rename from src/operators/op-dm-cdm.cc
rename to libinterp/operators/op-dm-cdm.cc
rename from src/operators/op-dm-cm.cc
rename to libinterp/operators/op-dm-cm.cc
rename from src/operators/op-dm-cs.cc
rename to libinterp/operators/op-dm-cs.cc
rename from src/operators/op-dm-dm.cc
rename to libinterp/operators/op-dm-dm.cc
rename from src/operators/op-dm-m.cc
rename to libinterp/operators/op-dm-m.cc
rename from src/operators/op-dm-s.cc
rename to libinterp/operators/op-dm-s.cc
rename from src/operators/op-dm-scm.cc
rename to libinterp/operators/op-dm-scm.cc
rename from src/operators/op-dm-sm.cc
rename to libinterp/operators/op-dm-sm.cc
rename from src/operators/op-dm-template.cc
rename to libinterp/operators/op-dm-template.cc
rename from src/operators/op-dms-template.cc
rename to libinterp/operators/op-dms-template.cc
rename from src/operators/op-double-conv.cc
rename to libinterp/operators/op-double-conv.cc
rename from src/operators/op-fcdm-fcdm.cc
rename to libinterp/operators/op-fcdm-fcdm.cc
rename from src/operators/op-fcdm-fcm.cc
rename to libinterp/operators/op-fcdm-fcm.cc
rename from src/operators/op-fcdm-fcs.cc
rename to libinterp/operators/op-fcdm-fcs.cc
rename from src/operators/op-fcdm-fdm.cc
rename to libinterp/operators/op-fcdm-fdm.cc
rename from src/operators/op-fcdm-fm.cc
rename to libinterp/operators/op-fcdm-fm.cc
rename from src/operators/op-fcdm-fs.cc
rename to libinterp/operators/op-fcdm-fs.cc
rename from src/operators/op-fcm-fcdm.cc
rename to libinterp/operators/op-fcm-fcdm.cc
rename from src/operators/op-fcm-fcm.cc
rename to libinterp/operators/op-fcm-fcm.cc
rename from src/operators/op-fcm-fcs.cc
rename to libinterp/operators/op-fcm-fcs.cc
rename from src/operators/op-fcm-fdm.cc
rename to libinterp/operators/op-fcm-fdm.cc
rename from src/operators/op-fcm-fm.cc
rename to libinterp/operators/op-fcm-fm.cc
rename from src/operators/op-fcm-fs.cc
rename to libinterp/operators/op-fcm-fs.cc
rename from src/operators/op-fcm-pm.cc
rename to libinterp/operators/op-fcm-pm.cc
rename from src/operators/op-fcn.cc
rename to libinterp/operators/op-fcn.cc
rename from src/operators/op-fcs-fcm.cc
rename to libinterp/operators/op-fcs-fcm.cc
rename from src/operators/op-fcs-fcs.cc
rename to libinterp/operators/op-fcs-fcs.cc
rename from src/operators/op-fcs-fm.cc
rename to libinterp/operators/op-fcs-fm.cc
rename from src/operators/op-fcs-fs.cc
rename to libinterp/operators/op-fcs-fs.cc
rename from src/operators/op-fdm-fcdm.cc
rename to libinterp/operators/op-fdm-fcdm.cc
rename from src/operators/op-fdm-fcm.cc
rename to libinterp/operators/op-fdm-fcm.cc
rename from src/operators/op-fdm-fcs.cc
rename to libinterp/operators/op-fdm-fcs.cc
rename from src/operators/op-fdm-fdm.cc
rename to libinterp/operators/op-fdm-fdm.cc
rename from src/operators/op-fdm-fm.cc
rename to libinterp/operators/op-fdm-fm.cc
rename from src/operators/op-fdm-fs.cc
rename to libinterp/operators/op-fdm-fs.cc
rename from src/operators/op-float-conv.cc
rename to libinterp/operators/op-float-conv.cc
rename from src/operators/op-fm-fcdm.cc
rename to libinterp/operators/op-fm-fcdm.cc
rename from src/operators/op-fm-fcm.cc
rename to libinterp/operators/op-fm-fcm.cc
rename from src/operators/op-fm-fcs.cc
rename to libinterp/operators/op-fm-fcs.cc
rename from src/operators/op-fm-fdm.cc
rename to libinterp/operators/op-fm-fdm.cc
rename from src/operators/op-fm-fm.cc
rename to libinterp/operators/op-fm-fm.cc
rename from src/operators/op-fm-fs.cc
rename to libinterp/operators/op-fm-fs.cc
rename from src/operators/op-fm-pm.cc
rename to libinterp/operators/op-fm-pm.cc
rename from src/operators/op-fs-fcm.cc
rename to libinterp/operators/op-fs-fcm.cc
rename from src/operators/op-fs-fcs.cc
rename to libinterp/operators/op-fs-fcs.cc
rename from src/operators/op-fs-fm.cc
rename to libinterp/operators/op-fs-fm.cc
rename from src/operators/op-fs-fs.cc
rename to libinterp/operators/op-fs-fs.cc
rename from src/operators/op-i16-i16.cc
rename to libinterp/operators/op-i16-i16.cc
rename from src/operators/op-i32-i32.cc
rename to libinterp/operators/op-i32-i32.cc
rename from src/operators/op-i64-i64.cc
rename to libinterp/operators/op-i64-i64.cc
rename from src/operators/op-i8-i8.cc
rename to libinterp/operators/op-i8-i8.cc
rename from src/operators/op-int-concat.cc
rename to libinterp/operators/op-int-concat.cc
rename from src/operators/op-int-conv.cc
rename to libinterp/operators/op-int-conv.cc
rename from src/operators/op-int.h
rename to libinterp/operators/op-int.h
rename from src/operators/op-m-cdm.cc
rename to libinterp/operators/op-m-cdm.cc
rename from src/operators/op-m-cm.cc
rename to libinterp/operators/op-m-cm.cc
rename from src/operators/op-m-cs.cc
rename to libinterp/operators/op-m-cs.cc
rename from src/operators/op-m-dm.cc
rename to libinterp/operators/op-m-dm.cc
rename from src/operators/op-m-m.cc
rename to libinterp/operators/op-m-m.cc
rename from src/operators/op-m-pm.cc
rename to libinterp/operators/op-m-pm.cc
rename from src/operators/op-m-s.cc
rename to libinterp/operators/op-m-s.cc
rename from src/operators/op-m-scm.cc
rename to libinterp/operators/op-m-scm.cc
rename from src/operators/op-m-sm.cc
rename to libinterp/operators/op-m-sm.cc
rename from src/operators/op-pm-cm.cc
rename to libinterp/operators/op-pm-cm.cc
rename from src/operators/op-pm-fcm.cc
rename to libinterp/operators/op-pm-fcm.cc
rename from src/operators/op-pm-fm.cc
rename to libinterp/operators/op-pm-fm.cc
rename from src/operators/op-pm-m.cc
rename to libinterp/operators/op-pm-m.cc
rename from src/operators/op-pm-pm.cc
rename to libinterp/operators/op-pm-pm.cc
rename from src/operators/op-pm-scm.cc
rename to libinterp/operators/op-pm-scm.cc
rename from src/operators/op-pm-sm.cc
rename to libinterp/operators/op-pm-sm.cc
rename from src/operators/op-pm-template.cc
rename to libinterp/operators/op-pm-template.cc
rename from src/operators/op-range.cc
rename to libinterp/operators/op-range.cc
rename from src/operators/op-s-cm.cc
rename to libinterp/operators/op-s-cm.cc
rename from src/operators/op-s-cs.cc
rename to libinterp/operators/op-s-cs.cc
rename from src/operators/op-s-m.cc
rename to libinterp/operators/op-s-m.cc
rename from src/operators/op-s-s.cc
rename to libinterp/operators/op-s-s.cc
rename from src/operators/op-s-scm.cc
rename to libinterp/operators/op-s-scm.cc
rename from src/operators/op-s-sm.cc
rename to libinterp/operators/op-s-sm.cc
rename from src/operators/op-sbm-b.cc
rename to libinterp/operators/op-sbm-b.cc
rename from src/operators/op-sbm-bm.cc
rename to libinterp/operators/op-sbm-bm.cc
rename from src/operators/op-sbm-sbm.cc
rename to libinterp/operators/op-sbm-sbm.cc
rename from src/operators/op-scm-cm.cc
rename to libinterp/operators/op-scm-cm.cc
rename from src/operators/op-scm-cs.cc
rename to libinterp/operators/op-scm-cs.cc
rename from src/operators/op-scm-m.cc
rename to libinterp/operators/op-scm-m.cc
rename from src/operators/op-scm-s.cc
rename to libinterp/operators/op-scm-s.cc
rename from src/operators/op-scm-scm.cc
rename to libinterp/operators/op-scm-scm.cc
rename from src/operators/op-scm-sm.cc
rename to libinterp/operators/op-scm-sm.cc
rename from src/operators/op-sm-cm.cc
rename to libinterp/operators/op-sm-cm.cc
rename from src/operators/op-sm-cs.cc
rename to libinterp/operators/op-sm-cs.cc
rename from src/operators/op-sm-m.cc
rename to libinterp/operators/op-sm-m.cc
rename from src/operators/op-sm-s.cc
rename to libinterp/operators/op-sm-s.cc
rename from src/operators/op-sm-scm.cc
rename to libinterp/operators/op-sm-scm.cc
rename from src/operators/op-sm-sm.cc
rename to libinterp/operators/op-sm-sm.cc
rename from src/operators/op-str-m.cc
rename to libinterp/operators/op-str-m.cc
rename from src/operators/op-str-s.cc
rename to libinterp/operators/op-str-s.cc
rename from src/operators/op-str-str.cc
rename to libinterp/operators/op-str-str.cc
rename from src/operators/op-struct.cc
rename to libinterp/operators/op-struct.cc
rename from src/operators/op-ui16-ui16.cc
rename to libinterp/operators/op-ui16-ui16.cc
rename from src/operators/op-ui32-ui32.cc
rename to libinterp/operators/op-ui32-ui32.cc
rename from src/operators/op-ui64-ui64.cc
rename to libinterp/operators/op-ui64-ui64.cc
rename from src/operators/op-ui8-ui8.cc
rename to libinterp/operators/op-ui8-ui8.cc
rename from src/operators/ops.h
rename to libinterp/operators/ops.h
rename from src/parse-tree/lex.h
rename to libinterp/parse-tree/lex.h
rename from src/parse-tree/lex.ll
rename to libinterp/parse-tree/lex.ll
rename from src/parse-tree/module.mk
rename to libinterp/parse-tree/module.mk
rename from src/parse-tree/oct-parse.yy
rename to libinterp/parse-tree/oct-parse.yy
rename from src/parse-tree/octave.gperf
rename to libinterp/parse-tree/octave.gperf
rename from src/parse-tree/parse-private.h
rename to libinterp/parse-tree/parse-private.h
rename from src/parse-tree/parse.h
rename to libinterp/parse-tree/parse.h
rename from src/parse-tree/pt-all.h
rename to libinterp/parse-tree/pt-all.h
rename from src/parse-tree/pt-arg-list.cc
rename to libinterp/parse-tree/pt-arg-list.cc
rename from src/parse-tree/pt-arg-list.h
rename to libinterp/parse-tree/pt-arg-list.h
rename from src/parse-tree/pt-assign.cc
rename to libinterp/parse-tree/pt-assign.cc
rename from src/parse-tree/pt-assign.h
rename to libinterp/parse-tree/pt-assign.h
rename from src/parse-tree/pt-binop.cc
rename to libinterp/parse-tree/pt-binop.cc
rename from src/parse-tree/pt-binop.h
rename to libinterp/parse-tree/pt-binop.h
rename from src/parse-tree/pt-bp.cc
rename to libinterp/parse-tree/pt-bp.cc
rename from src/parse-tree/pt-bp.h
rename to libinterp/parse-tree/pt-bp.h
rename from src/parse-tree/pt-cbinop.cc
rename to libinterp/parse-tree/pt-cbinop.cc
rename from src/parse-tree/pt-cbinop.h
rename to libinterp/parse-tree/pt-cbinop.h
rename from src/parse-tree/pt-cell.cc
rename to libinterp/parse-tree/pt-cell.cc
rename from src/parse-tree/pt-cell.h
rename to libinterp/parse-tree/pt-cell.h
rename from src/parse-tree/pt-check.cc
rename to libinterp/parse-tree/pt-check.cc
rename from src/parse-tree/pt-check.h
rename to libinterp/parse-tree/pt-check.h
rename from src/parse-tree/pt-cmd.cc
rename to libinterp/parse-tree/pt-cmd.cc
rename from src/parse-tree/pt-cmd.h
rename to libinterp/parse-tree/pt-cmd.h
rename from src/parse-tree/pt-colon.cc
rename to libinterp/parse-tree/pt-colon.cc
rename from src/parse-tree/pt-colon.h
rename to libinterp/parse-tree/pt-colon.h
rename from src/parse-tree/pt-const.cc
rename to libinterp/parse-tree/pt-const.cc
rename from src/parse-tree/pt-const.h
rename to libinterp/parse-tree/pt-const.h
rename from src/parse-tree/pt-decl.cc
rename to libinterp/parse-tree/pt-decl.cc
rename from src/parse-tree/pt-decl.h
rename to libinterp/parse-tree/pt-decl.h
rename from src/parse-tree/pt-eval.cc
rename to libinterp/parse-tree/pt-eval.cc
rename from src/parse-tree/pt-eval.h
rename to libinterp/parse-tree/pt-eval.h
rename from src/parse-tree/pt-except.cc
rename to libinterp/parse-tree/pt-except.cc
rename from src/parse-tree/pt-except.h
rename to libinterp/parse-tree/pt-except.h
rename from src/parse-tree/pt-exp.cc
rename to libinterp/parse-tree/pt-exp.cc
rename from src/parse-tree/pt-exp.h
rename to libinterp/parse-tree/pt-exp.h
rename from src/parse-tree/pt-fcn-handle.cc
rename to libinterp/parse-tree/pt-fcn-handle.cc
rename from src/parse-tree/pt-fcn-handle.h
rename to libinterp/parse-tree/pt-fcn-handle.h
rename from src/parse-tree/pt-id.cc
rename to libinterp/parse-tree/pt-id.cc
rename from src/parse-tree/pt-id.h
rename to libinterp/parse-tree/pt-id.h
rename from src/parse-tree/pt-idx.cc
rename to libinterp/parse-tree/pt-idx.cc
rename from src/parse-tree/pt-idx.h
rename to libinterp/parse-tree/pt-idx.h
rename from src/parse-tree/pt-jump.cc
rename to libinterp/parse-tree/pt-jump.cc
rename from src/parse-tree/pt-jump.h
rename to libinterp/parse-tree/pt-jump.h
rename from src/parse-tree/pt-loop.cc
rename to libinterp/parse-tree/pt-loop.cc
rename from src/parse-tree/pt-loop.h
rename to libinterp/parse-tree/pt-loop.h
rename from src/parse-tree/pt-mat.cc
rename to libinterp/parse-tree/pt-mat.cc
rename from src/parse-tree/pt-mat.h
rename to libinterp/parse-tree/pt-mat.h
rename from src/parse-tree/pt-misc.cc
rename to libinterp/parse-tree/pt-misc.cc
rename from src/parse-tree/pt-misc.h
rename to libinterp/parse-tree/pt-misc.h
rename from src/parse-tree/pt-pr-code.cc
rename to libinterp/parse-tree/pt-pr-code.cc
rename from src/parse-tree/pt-pr-code.h
rename to libinterp/parse-tree/pt-pr-code.h
rename from src/parse-tree/pt-select.cc
rename to libinterp/parse-tree/pt-select.cc
rename from src/parse-tree/pt-select.h
rename to libinterp/parse-tree/pt-select.h
rename from src/parse-tree/pt-stmt.cc
rename to libinterp/parse-tree/pt-stmt.cc
rename from src/parse-tree/pt-stmt.h
rename to libinterp/parse-tree/pt-stmt.h
rename from src/parse-tree/pt-unop.cc
rename to libinterp/parse-tree/pt-unop.cc
rename from src/parse-tree/pt-unop.h
rename to libinterp/parse-tree/pt-unop.h
rename from src/parse-tree/pt-walk.h
rename to libinterp/parse-tree/pt-walk.h
rename from src/parse-tree/pt.cc
rename to libinterp/parse-tree/pt.cc
rename from src/parse-tree/pt.h
rename to libinterp/parse-tree/pt.h
rename from src/parse-tree/token.cc
rename to libinterp/parse-tree/token.cc
rename from src/parse-tree/token.h
rename to libinterp/parse-tree/token.h
rename from src/template-inst/Array-jit.cc
rename to libinterp/template-inst/Array-jit.cc
rename from src/template-inst/Array-os.cc
rename to libinterp/template-inst/Array-os.cc
rename from src/template-inst/Array-sym.cc
rename to libinterp/template-inst/Array-sym.cc
rename from src/template-inst/Array-tc.cc
rename to libinterp/template-inst/Array-tc.cc
rename from src/template-inst/module.mk
rename to libinterp/template-inst/module.mk
rename from src/version.in.h
rename to libinterp/version.in.h
--- a/run-octave.in
+++ b/run-octave.in
@@ -32,7 +32,7 @@

 d1="$top_srcdir/scripts"
 d2="$builddir/scripts"
-d3="$builddir/src"
+d3="$builddir/libinterp"

 d1_list=`$FIND "$d1" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
 d2_list=`$FIND "$d2" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,22 +20,11 @@

 include $(top_srcdir)/build-aux/common.mk

-AUTOMAKE_OPTIONS = subdir-objects
-
 ## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
-  -I$(top_srcdir)/libcruft/misc \
-  -I../liboctave -I$(top_srcdir)/liboctave \
-  -I$(srcdir)/octave-value \
-  -I$(srcdir)/operators \
-  -Iparse-tree -I$(srcdir)/parse-tree \
-  -Iinterp-core -I$(srcdir)/interp-core \
-  -Iinterpfcn -I$(srcdir)/interpfcn \
-  -Icorefcn \
+  -I$(srcdir)/../libinterp \
   -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu

-octlib_LTLIBRARIES = liboctinterp.la
-
 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
 bin_PROGRAMS = \
   mkoctfile \
@@ -66,161 +55,14 @@
   octave-config
 endif

-## Order matters here.  Leave builtins.cc last, because it depends on
-## $(DEF_FILES), and building those requires all the sources
-## (except builtins.cc) to be available.
-BUILT_SOURCES = \
-  interp-core/mxarray.h \
-  interp-core/oct-errno.cc \
-  interpfcn/defaults.h \
-  interpfcn/graphics-props.cc \
-  interpfcn/graphics.h \
-  operators/ops.cc \
-  parse-tree/lex.cc \
-  parse-tree/oct-gperf.h \
-  parse-tree/oct-parse.cc \
-  oct-conf.h \
-  version.h \
-  $(BUILT_SOURCES_EXTRA) \
-  builtins.cc
-
-BUILT_DISTFILES = \
-  parse-tree/oct-gperf.h \
-  parse-tree/oct-parse.h
-
-## Files that are created during build process and installed,
-## BUT not distributed in tarball.
-BUILT_NODISTFILES = \
-  interp-core/mxarray.h \
-  interp-core/oct-errno.cc \
-  interpfcn/defaults.h \
-  interpfcn/graphics.h \
-  operators/ops.cc \
-  oct-conf.h \
-  version.h \
-  $(OPT_HANDLERS) \
-  $(OPT_INC) \
-  $(ALL_DEF_FILES) \
-  builtins.cc
-
 EXTRA_DIST = \
-  Makefile.in \
-  DOCSTRINGS \
-  find-defun-files.sh \
-  gendoc.pl \
-  genprops.awk \
-  mk-errno-list \
-  mk-pkg-add \
-  mkbuiltins \
-  mkdefs \
   mkoctfile.in.cc \
   mkoctfile.in.sh \
-  mkops \
-  oct-conf.in.h \
   octave-config.in.cc \
-  octave-config.in.sh \
-  version.in.h \
-  $(BUILT_DISTFILES)
-
-octinclude_HEADERS = \
-  interpfcn/graphics-props.cc \
-  parse-tree/oct-gperf.h \
-  builtins.h \
-  octave.h \
-  $(OV_INCLUDES) \
-  $(OV_SPARSE_INCLUDES) \
-  $(PT_INCLUDES) \
-	$(OPERATOR_INCLUDES) \
-  $(INTERP_CORE_INCLUDES) \
-  $(INTERPFCN_INCLUDES)
-
-nodist_octinclude_HEADERS = \
-  interp-core/mxarray.h \
-  interpfcn/defaults.h \
-  interpfcn/graphics.h \
-  oct-conf.h \
-  version.h
-
-DIST_SRC = \
-  octave.cc \
-  $(OCTAVE_VALUE_SRC) \
-  $(PARSE_TREE_SRC) \
-  $(INTERP_CORE_SRC) \
-  $(INTERPFCN_SRC) \
-  $(COREFCN_SRC)
-
-noinst_LTLIBRARIES =
-
-include parse-tree/module.mk
-include octave-value/module.mk
-include operators/module.mk
-include template-inst/module.mk
-include interp-core/module.mk
-include interpfcn/module.mk
-include corefcn/module.mk
-include dldfcn/module.mk
-
-$(srcdir)/dldfcn/module.mk: $(srcdir)/dldfcn/config-module.sh $(srcdir)/dldfcn/config-module.awk $(srcdir)/dldfcn/module-files
-	$(srcdir)/dldfcn/config-module.sh $(top_srcdir)
-
-if AMCOND_ENABLE_DYNAMIC_LINKING
-  OCT_FILES = $(DLDFCN_LIBS:.la=.oct)
-  OCT_STAMP_FILES = $(subst dldfcn/,dldfcn/$(am__leading_dot),$(DLDFCN_LIBS:.la=.oct-stamp))
-  DLD_LIBOCTINTERP_LIBADD = liboctinterp.la
-else
-  OCT_FILES =
-  OCT_STAMP_FILES =
-  DLD_LIBOCTINTERP_LIBADD =
-endif
-
-liboctinterp_la_SOURCES = \
-  octave.cc \
-  $(OPERATORS_SRC) \
-  $(TEMPLATE_INST_SRC)
-
-nodist_liboctinterp_la_SOURCES = \
-  interp-core/mxarray.h \
-  interp-core/oct-errno.cc \
-  interpfcn/defaults.h \
-  interpfcn/graphics.h \
-  operators/ops.cc \
-  builtins.cc \
-  oct-conf.h \
-  version.h \
-  $(OPT_INC)
-
-liboctinterp_la_CPPFLAGS = @OCTINTERP_DLL_DEFS@ $(AM_CPPFLAGS)
-
-include link-deps.mk
-
-liboctinterp_la_LIBADD = \
-  octave-value/liboctave-value.la \
-  parse-tree/libparse-tree.la \
-  interp-core/libinterp-core.la \
-  interpfcn/libinterpfcn.la \
-  corefcn/libcorefcn.la \
-  ../liboctave/liboctave.la \
-  ../libcruft/libcruft.la \
-  $(LIBOCTINTERP_LINK_DEPS)
-
-# Increment these as needed and according to the rules in the libtool manual:
-liboctinterp_current = 1
-liboctinterp_revision = 1
-liboctinterp_age = 0
-
-liboctinterp_version_info = $(liboctinterp_current):$(liboctinterp_revision):$(liboctinterp_age)
-
-liboctinterp_la_LDFLAGS = \
-  -version-info $(liboctinterp_version_info) \
-  $(NO_UNDEFINED_LDFLAG) \
-  -bindir $(bindir) \
-  $(LIBOCTINTERP_LINK_OPTS)
-
-## FIXME: Does this rule need to be uncommented?
-#fft.df fft.lo fft2.df fft2.lo fftn.df fftn.lo: CPPFLAGS += $(FFTW_XCPPFLAGS)
+  octave-config.in.sh

 OCTAVE_CORE_LIBS = \
-  liboctinterp.la \
+  ../libinterp/liboctinterp.la \
   ../liboctave/liboctave.la \
   ../libcruft/libcruft.la

@@ -244,7 +86,9 @@
   OCTAVE_GUI_CPPFLAGS =
 endif

-octave_CPPFLAGS = $(OCTAVE_GUI_CPPFLAGS)
+octave_CPPFLAGS = \
+  $(AM_CPPFLAGS) \
+  $(OCTAVE_GUI_CPPFLAGS)

 octave_LDADD = \
   $(OCTAVE_CORE_LIBS) \
@@ -253,82 +97,6 @@

 octave_LDFLAGS = $(octave_cli_LDFLAGS)

-## Section for defining and creating DEF_FILES
-SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(DIST_SRC))
-
-DLDFCN_DEF_FILES = $(DLDFCN_SRC:.cc=.df)
-
-## builtins.cc depends on $(DEF_FILES), so DEF_FILES should only include
-## .df files that correspond to sources included in liboctave.
-if AMCOND_ENABLE_DYNAMIC_LINKING
-  DEF_FILES = $(SRC_DEF_FILES)
-else
-  DEF_FILES = $(SRC_DEF_FILES) $(DLDFCN_DEF_FILES)
-endif
-
-ALL_DEF_FILES = $(SRC_DEF_FILES) $(DLDFCN_DEF_FILES)
-
-$(SRC_DEF_FILES): mkdefs Makefile
-
-$(DEF_FILES): $(OPT_HANDLERS) $(OPT_INC)
-
-DLL_CDEFS = @OCTINTERP_DLL_DEFS@
-DLL_CXXDEFS = @OCTINTERP_DLL_DEFS@
-
-## Rule to build a DEF file from a .cc file
-%.df: %.cc
-	$(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	  $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	  -DMAKE_BUILTINS $< | $(srcdir)/mkdefs $(srcdir) $< > $@-t
-	mv $@-t $@
-
-## Special rules:
-## Mostly for sources which must be built before rest of compilation.
-
-## oct-conf.h must depend on Makefile.  Calling configure
-## may change default/config values.  However, calling configure will also
-## regenerate the Makefiles from Makefile.am and trigger the rules below.
-oct-conf.h: oct-conf.in.h Makefile
-	@$(do_subst_config_vals)
-
-version.h: version.in.h Makefile
-	$(SED) < $< \
-	  -e "s|%NO_EDIT_WARNING%|DO NOT EDIT!  Generated automatically from $(<F) by Make.|" \
-	  -e "s|%OCTAVE_API_VERSION_NUMBER%|${OCTAVE_API_VERSION_NUMBER}|" \
-	  -e "s|%OCTAVE_API_VERSION%|\"${OCTAVE_API_VERSION}\"|" \
-	  -e "s|%OCTAVE_COPYRIGHT%|\"${OCTAVE_COPYRIGHT}\"|" \
-	  -e "s|%OCTAVE_RELEASE_DATE%|\"${OCTAVE_RELEASE_DATE}\"|" \
-	  -e "s|%OCTAVE_VERSION%|\"${OCTAVE_VERSION}\"|" > $@-t
-	mv $@-t $@
-
-builtins.cc: $(DEF_FILES) mkbuiltins
-	$(srcdir)/mkbuiltins $(DEF_FILES) > $@-t
-	mv $@-t $@
-
-if AMCOND_ENABLE_DYNAMIC_LINKING
-DLDFCN_PKG_ADD_FILE = dldfcn/PKG_ADD
-
-dldfcn/PKG_ADD: $(DLDFCN_DEF_FILES) mk-pkg-add
-	$(srcdir)/mk-pkg-add $(DLDFCN_DEF_FILES) > $@-t
-	mv $@-t $@
-endif
-
-if AMCOND_BUILD_DOCS
-.DOCSTRINGS: $(ALL_DEF_FILES) gendoc.pl
-	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \
-		cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \
-		touch -r $(srcdir)/DOCSTRINGS DOCSTRINGS; \
-	fi
-	@echo "creating .DOCSTRINGS from .cc source files"
-	@$(PERL) $(srcdir)/gendoc.pl $(ALL_DEF_FILES) > $@
-	$(top_srcdir)/build-aux/move-if-change $@ DOCSTRINGS
-	touch $@
-
-all-local: $(OCT_STAMP_FILES) $(DLDFCN_PKG_ADD_FILE) .DOCSTRINGS
-else
-all-local: $(OCT_STAMP_FILES) $(DLDFCN_PKG_ADD_FILE)
-endif
-
 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
 octave-config.cc: octave-config.in.cc Makefile
 	@$(do_subst_default_vals)
@@ -347,9 +115,7 @@

 install-exec-hook: make-version-links

-install-data-hook: install-oct
-
-uninstall-local: remove-version-links uninstall-oct
+uninstall-local: remove-version-links

 make-version-links:
 	cd $(DESTDIR)$(bindir) && \
@@ -377,48 +143,5 @@

 .PHONY: make-version-links remove-version-links

-if AMCOND_ENABLE_DYNAMIC_LINKING
-install-oct:
-	$(top_srcdir)/build-aux/mkinstalldirs $(DESTDIR)$(octfiledir)
-	if [ -n "`cat $(DLDFCN_PKG_ADD_FILE)`" ]; then \
-	  $(INSTALL_DATA) $(DLDFCN_PKG_ADD_FILE) $(DESTDIR)$(octfiledir)/PKG_ADD; \
-	fi
-	cd $(DESTDIR)$(octlibdir) && \
-	for ltlib in $(DLDFCN_LIBS); do \
-	  f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
-	  dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
-	  if [ -n "$$dl" ]; then \
-	    $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
-	  else \
-	    echo "error: dlname is empty in $$ltlib!"; \
-	    exit 1; \
-	  fi; \
-	  lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$f`; \
-	  if [ -n "$$lnames" ]; then \
-	    rm -f $$f $$lnames $$dl; \
-	  fi \
-	done
-
-uninstall-oct:
-	for f in $(notdir $(OCT_FILES)); do \
-	  rm -f $(DESTDIR)$(octfiledir)/$$f; \
-	done
-	rm -f $(DESTDIR)$(octfiledir)/PKG_ADD
-endif
-.PHONY: install-oct uninstall-oct
-
 CLEANFILES = \
   $(bin_SCRIPTS) \
-  $(DLDFCN_PKG_ADD_FILE) \
-  interpfcn/graphics-props.cc \
-  parse-tree/oct-parse.output
-
-DISTCLEANFILES = \
-  .DOCSTRINGS \
-  DOCSTRINGS \
-  $(BUILT_NODISTFILES) \
-  $(OCT_FILES) \
-  $(OCT_STAMP_FILES)
-
-MAINTAINERCLEANFILES = \
-  $(BUILT_DISTFILES)