--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,7 @@
 endif
 
 # Subdirectories in which to run `make all'.
-SUBDIRS = libgnu libcruft liboctave libinterp $(GUIDIR) src scripts @DOCDIR@ examples test
+SUBDIRS = libgnu liboctave libinterp $(GUIDIR) src scripts @DOCDIR@ examples test
 
 if ! AMCOND_BUILD_DOCS
 dist-hook:

--- a/autogen.sh
+++ b/autogen.sh
@@ -22,9 +22,9 @@
   fi
 done
 
-echo "generating source lists for liboctave/Makefile..."
+echo "generating source lists for liboctave/operators/module.mk..."
 
-(cd liboctave; ./config-ops.sh)
+(cd liboctave/operators; ./config-ops.sh)
 
 echo "generating doc/interpreter/images.mk..."
 

--- a/build-aux/common.mk
+++ b/build-aux/common.mk
@@ -172,7 +172,6 @@
 
 LIBOCTINTERP = @LIBOCTINTERP@
 LIBOCTAVE = @LIBOCTAVE@
-LIBCRUFT = @LIBCRUFT@
 
 FT2_CFLAGS = @FT2_CFLAGS@
 FT2_LIBS = @FT2_LIBS@
@@ -329,7 +328,7 @@
 # Where to install and expect extra files like NEWS and doc-cache.
 octetcdir = @octetcdir@
 
-# Where to install and expect libraries like libcruft.a, liboctave.a,
+# Where to install and expect libraries like liboctave.a, liboctinterp.a,
 # and other architecture-dependent data.
 octlibdir = @octlibdir@
 
@@ -543,7 +542,6 @@
   -e "s|%OCTAVE_CONF_LEX%|\"${LEX}\"|" \
   -e "s|%OCTAVE_CONF_LEXLIB%|\"${LEXLIB}\"|" \
   -e "s|%OCTAVE_CONF_LFLAGS%|\"${LFLAGS}\"|" \
-  -e "s|%OCTAVE_CONF_LIBCRUFT%|\"${LIBCRUFT}\"|" \
   -e "s|%OCTAVE_CONF_LIBDIR%|\"${libdir}\"|" \
   -e "s|%OCTAVE_CONF_LIBEXT%|\"${LIBEXT}\"|" \
   -e "s|%OCTAVE_CONF_LIBFLAGS%|\"${LIBFLAGS}\"|" \
@@ -665,7 +663,6 @@
   -e "s|%library_path_var%|${library_path_var}|g" \
   -e "s|%liboctinterp%|${SHLPRE}octinterp.${SHLEXT}|g" \
   -e "s|%liboctave%|${SHLPRE}octave.${SHLEXT}|g" \
-  -e "s|%libcruft%|${SHLPRE}cruft.${SHLEXT}|g" \
   -e "s|%ldpreloadsep%|${ldpreloadsep}|g" \
   -e "s|%srcdir%|${srcdir}|" \
   -e "s|%top_srcdir%|${top_srcdir}|" \

--- a/configure.ac
+++ b/configure.ac
@@ -796,7 +796,7 @@
 AM_CONDITIONAL([AMCOND_HAVE_FFTW],
   [test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"])
 
-## Subdirectory of libcruft to build if FFTW is not found.
+## Subdirectory of liboctave/cruft to build if FFTW is not found.
 FFT_DIR="fftpack"
 AC_SUBST(FFT_DIR)
 
@@ -1134,7 +1134,7 @@
       CFLAGS="$CFLAGS -DUSE_BLASWRAP"
       AC_LANG_PUSH(C)
       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-          #include "libcruft/misc/blaswrap.c"
+          #include "liboctave/cruft/misc/blaswrap.c"
         ]])],
         [mv conftest.$ac_objext blaswrap.$ac_objext
          octave_blaswrap_save_BLAS_LIBS="$BLAS_LIBS"
@@ -1151,14 +1151,14 @@
 
          ## remove temp file
          rm -f blaswrap.$ac_objext],
-        [AC_MSG_FAILURE([cannot compile libcruft/misc/blaswrap.c])])
+        [AC_MSG_FAILURE([cannot compile liboctave/cruft/misc/blaswrap.c])])
       AC_LANG_POP(C)
       CFLAGS="$octave_blaswrap_save_CFLAGS"
 
       if test "x$ax_blas_f77_func_ok" = "xno"; then
         BLAS_LIBS="$octave_blaswrap_save_BLAS_LIBS"
       else
-        ## wrapper in libcruft, remove from BLAS_LIBS
+        ## wrapper in cruft, remove from BLAS_LIBS
         BLAS_LIBS="`echo $BLAS_LIBS | sed -e 's/blaswrap.[[^ ]]* //g'`"
         AC_DEFINE(USE_BLASWRAP, 1,
           [Define to 1 if BLAS functions need to be wrapped (potentially needed for 64-bit OSX only).])
@@ -1712,11 +1712,9 @@
 if $SHARED_LIBS; then
   LIBOCTINTERP=-loctinterp$SHLLINKEXT
   LIBOCTAVE=-loctave$SHLLINKEXT
-  LIBCRUFT=-lcruft$SHLLINKEXT
 else
   LIBOCTINTERP='$(top_builddir)/libinterp/liboctinterp.$(LIBEXT)'
   LIBOCTAVE='$(top_builddir)/liboctave/liboctave.$(LIBEXT)'
-  LIBCRUFT='$(top_builddir)/libcruft/libcruft.$(LIBEXT)'
 fi
 
 AC_SUBST(LD_CXX)
@@ -1724,7 +1722,6 @@
 AC_SUBST(ENABLE_DYNAMIC_LINKING)
 AC_SUBST(LIBOCTINTERP)
 AC_SUBST(LIBOCTAVE)
-AC_SUBST(LIBCRUFT)
 
 ### Check for existence of various libraries
 
@@ -1938,7 +1935,7 @@
 OCTAVE_CHECK_FUNC_CMATH(isinf)
 OCTAVE_CHECK_FUNC_CMATH(isfinite)
 
-dnl Would like to get rid of this cruft, and just have
+dnl Would like to get rid of this crap, and just have
 dnl
 dnl   AC_CHECK_FUNCS(finite isnan isinf)
 dnl
@@ -2407,13 +2404,13 @@
   doc/liboctave/Makefile
   doc/refcard/Makefile
   examples/Makefile
-  libcruft/Makefile
-  libcruft/mkf77def
   libgnu/Makefile
   libgui/Makefile
   libgui/src/Makefile
   libinterp/Makefile
   liboctave/Makefile
+  liboctave/cruft/Makefile
+  liboctave/cruft/mkf77def
   scripts/Makefile
   src/Makefile
   test/Makefile])

--- a/doc/faq/OctaveFAQ.texi
+++ b/doc/faq/OctaveFAQ.texi
@@ -220,7 +220,7 @@
 
 A program that embeds the Octave interpreter (e.g., by calling the
 "octave_main" function), or that calls functions from Octave's
-libraries (e.g., liboctinterp, liboctave, or libcruft) is
+libraries (e.g., liboctinterp or liboctave) is
 considered a derivative work of Octave and therefore must be
 released under terms that are compatible with the GPL.
 

--- a/doc/interpreter/install.txi
+++ b/doc/interpreter/install.txi
@@ -539,7 +539,7 @@
 Octave and other binaries that people will want to run directly.
 
 @item @var{prefix}/lib/octave-@var{version}
-Libraries like libcruft.a and liboctave.a.
+Libraries like liboctave.a and liboctinterp.a.
 
 @item @var{prefix}/octave-@var{version}/include/octave
 Include files distributed with Octave.
@@ -796,12 +796,12 @@
 @end example
 
 You must ensure that all Fortran sources except those in the
-@file{libcruft/ranlib} directory are compiled such that INTEGERS are
+@file{liboctave/cruft/ranlib} directory are compiled such that INTEGERS are
 8-bytes wide.  If you are using gfortan, the configure script should
 automatically set the Makefile variable @w{@env{F77_INTEGER_8_FLAG}} to 
 @option{-fdefault-integer-8}.  If you are using another compiler, you
 must set this variable yourself.  You should NOT set this flag in
-@env{FFLAGS}, otherwise the files in @file{libcruft/ranlib} will be
+@env{FFLAGS}, otherwise the files in @file{liboctave/cruft/ranlib} will be
 miscompiled.
 
 @item Other dependencies
@@ -976,7 +976,7 @@
 @end example
 
 @noindent
-when compiling the Fortran subroutines in the @file{libcruft}
+when compiling the Fortran subroutines in the @file{liboctave/cruft}
 subdirectory, you should either upgrade your compiler or try compiling
 with optimization turned off.
 

--- a/doc/interpreter/mkoctfile.1
+++ b/doc/interpreter/mkoctfile.1
@@ -104,19 +104,19 @@
     CFLAGS                    LD_CXX
     CPICFLAG                  LD_STATIC_FLAG
     CPPFLAGS                  LFLAGS
-    CXX                       LIBCRUFT
-    CXXFLAGS                  LIBOCTAVE
-    CXXPICFLAG                LIBOCTINTERP
-    DEPEND_EXTRA_SED_PATTERN  LIBS
-    DEPEND_FLAGS              OCTAVE_LIBS
-    DL_LD                     OCTAVE_LINK_DEPS
-    DL_LDFLAGS                OCT_LINK_DEPS
-    EXEEXT                    RDYNAMIC_FLAG
-    F77                       READLINE_LIBS
-    F77_INTEGER_8_FLAG        SED
-    FFLAGS                    XTRA_CFLAGS
-    FFTW3_LDFLAGS             XTRA_CXXFLAGS
-    FFTW3_LIBS
+    CXX                       LIBOCTAVE
+    CXXFLAGS                  LIBOCTINTERP    
+    CXXPICFLAG                LIBS            
+    DEPEND_EXTRA_SED_PATTERN  OCTAVE_LIBS     
+    DEPEND_FLAGS              OCTAVE_LINK_DEPS
+    DL_LD                     OCT_LINK_DEPS   
+    DL_LDFLAGS                RDYNAMIC_FLAG   
+    EXEEXT                    READLINE_LIBS   
+    F77                       SED             
+    F77_INTEGER_8_FLAG        XTRA_CFLAGS     
+    FFLAGS                    XTRA_CXXFLAGS   
+    FFTW3_LDFLAGS                             
+    FFTW3_LIBS                                
     FFTW3F_LDFLAGS
 .Ve
 .RE

--- a/libgui/src/Makefile.am
+++ b/libgui/src/Makefile.am
@@ -103,7 +103,7 @@
   -I$(srcdir)/m-editor \
   -I$(srcdir)/octave-adapter \
   -I$(srcdir)/qtinfo \
-  -I$(srcdir)/../../libcruft/misc \
+  -I$(srcdir)/../../liboctave/cruft/misc \
   -I../../liboctave \
   -I$(srcdir)/../../liboctave \
   -I../../libinterp \
@@ -123,7 +123,6 @@
   libqterminal.la \
   ../../libinterp/liboctinterp.la \
   ../../liboctave/liboctave.la \
-  ../../libcruft/libcruft.la \
   $(LIBOCTGUI_LINK_DEPS)
 
 # Increment these as needed and according to the rules in the libtool manual:

--- a/libinterp/Makefile.am
+++ b/libinterp/Makefile.am
@@ -24,7 +24,12 @@
 
 ## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
-  -I$(top_srcdir)/libcruft/misc \
+  -I$(top_srcdir)/liboctave/cruft/misc \
+  -I../liboctave/array -I$(top_srcdir)/liboctave/array \
+  -I../liboctave/numeric -I$(top_srcdir)/liboctave/numeric \
+  -I../liboctave/operators -I$(top_srcdir)/liboctave/operators \
+  -I../liboctave/system -I$(top_srcdir)/liboctave/system \
+  -I../liboctave/util -I$(top_srcdir)/liboctave/util \
   -I../liboctave -I$(top_srcdir)/liboctave \
   -I$(srcdir)/octave-value \
   -I$(srcdir)/operators \
@@ -166,7 +171,6 @@
   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:

--- a/libinterp/corefcn/module.mk
+++ b/libinterp/corefcn/module.mk
@@ -11,18 +11,18 @@
   corefcn/Quad-opts.cc
 
 OPT_INC = \
-  $(top_builddir)/liboctave/DASPK-opts.h \
-  $(top_builddir)/liboctave/DASRT-opts.h \
-  $(top_builddir)/liboctave/DASSL-opts.h \
-  $(top_builddir)/liboctave/LSODE-opts.h \
-  $(top_builddir)/liboctave/Quad-opts.h
+  $(top_builddir)/liboctave/numeric/DASPK-opts.h \
+  $(top_builddir)/liboctave/numeric/DASRT-opts.h \
+  $(top_builddir)/liboctave/numeric/DASSL-opts.h \
+  $(top_builddir)/liboctave/numeric/LSODE-opts.h \
+  $(top_builddir)/liboctave/numeric/Quad-opts.h
 
-$(OPT_HANDLERS): corefcn/%.cc : $(top_builddir)/liboctave/%.in
+$(OPT_HANDLERS): corefcn/%.cc : $(top_builddir)/liboctave/numeric/%.in
 	$(PERL) $(top_srcdir)/build-aux/mk-opts.pl --opt-handler-fcns $< > $@-t
 	mv $@-t $@
 
 $(OPT_INC) : %.h : %.in
-	$(MAKE) -C $(top_builddir)/liboctave $(@F)
+	$(MAKE) -C $(top_builddir)/liboctave/numeric $(@F)
 
 COREFCN_SRC = \
   corefcn/__contourc__.cc \

--- a/libinterp/dldfcn/config-module.awk
+++ b/libinterp/dldfcn/config-module.awk
@@ -71,7 +71,7 @@
       }
     printf ("dldfcn_%s_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED_LDFLAG) %s $(OCT_LINK_OPTS)\n",
             basename, ldflags[i]);
-    printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la ../libcruft/libcruft.la %s $(OCT_LINK_DEPS)\n",
+    printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la %s $(OCT_LINK_DEPS)\n",
             basename, libraries[i]);
   }
 }

--- a/libinterp/interpfcn/toplev.cc
+++ b/libinterp/interpfcn/toplev.cc
@@ -1318,7 +1318,6 @@
       { false, "LEX", OCTAVE_CONF_LEX },
       { false, "LEXLIB", OCTAVE_CONF_LEXLIB },
       { false, "LFLAGS", OCTAVE_CONF_LFLAGS },
-      { false, "LIBCRUFT", OCTAVE_CONF_LIBCRUFT },
       { false, "LIBEXT", OCTAVE_CONF_LIBEXT },
       { false, "LIBFLAGS", OCTAVE_CONF_LIBFLAGS },
       { false, "LIBOCTAVE", OCTAVE_CONF_LIBOCTAVE },

--- a/libinterp/link-deps.mk
+++ b/libinterp/link-deps.mk
@@ -7,6 +7,7 @@
 endif
 
 LIBOCTINTERP_LINK_DEPS += \
+	$(GNULIB_LINK_DEPS) \
   $(GRAPHICS_LIBS) \
   $(FT2_LIBS) \
   $(HDF5_LIBS) \

--- a/libinterp/oct-conf.in.h
+++ b/libinterp/oct-conf.in.h
@@ -350,10 +350,6 @@
 #define OCTAVE_CONF_LFLAGS %OCTAVE_CONF_LFLAGS%
 #endif
 
-#ifndef OCTAVE_CONF_LIBCRUFT
-#define OCTAVE_CONF_LIBCRUFT %OCTAVE_CONF_LIBCRUFT%
-#endif
-
 #ifndef OCTAVE_CONF_LIBEXT
 #define OCTAVE_CONF_LIBEXT %OCTAVE_CONF_LIBEXT%
 #endif

--- a/liboctave/Makefile.am
+++ b/liboctave/Makefile.am
@@ -20,266 +20,30 @@
 
 include $(top_srcdir)/build-aux/common.mk
 
+AUTOMAKE_OPTIONS = subdir-objects
+
+## Run cruft dir with stand-alone Makefile.
+## Eventually this will use module.mk syntax.
+SUBDIRS = cruft
+
 ## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
-  -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu \
-  -I$(top_srcdir)/libcruft/misc
-
-EXTRA_DIST = \
-  config-ops.sh \
-  mk-ops.awk \
-  mx-op-inc.mk \
-  mx-op-src.mk \
-  mx-ops \
-  smx-op-inc.mk \
-  smx-op-src.mk \
-  sparse-mk-ops.awk \
-  sparse-mx-ops \
-  vx-op-inc.mk \
-  vx-op-src.mk \
-  vx-ops \
-  $(OPT_IN)
+  -I$(srcdir)/cruft/misc \
+  -I$(srcdir)/array \
+  -Inumeric -I$(srcdir)/numeric \
+  -Ioperators -I$(srcdir)/operators \
+  -I$(srcdir)/system \
+  -I$(srcdir)/util \
+  -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
 
-MATRIX_INC = \
-  Array-util.h \
-  Array.h \
-  Array2.h \
-  Array3.h \
-  ArrayN.h \
-  CColVector.h \
-  CDiagMatrix.h \
-  CMatrix.h \
-  CNDArray.h \
-  CRowVector.h \
-  CSparse.h \
-  CmplxAEPBAL.h \
-  CmplxCHOL.h \
-  CmplxGEPBAL.h \
-  CmplxHESS.h \
-  CmplxLU.h \
-  CmplxQR.h \
-  CmplxQRP.h \
-  CmplxSCHUR.h \
-  CmplxSVD.h \
-  DET.h \
-  DiagArray2.h \
-  EIG.h \
-  MArray-decl.h \
-  MArray-defs.h \
-  MArray.h \
-  MArray2.h \
-  MArrayN.h \
-  MDiagArray2.h \
-  MSparse-defs.h \
-  MSparse.h \
-  Matrix.h \
-  MatrixType.h \
-  PermMatrix.h \
-  Sparse-diag-op-defs.h \
-  Sparse-op-defs.h \
-  Sparse-perm-op-defs.h \
-  Sparse.h \
-  SparseCmplxCHOL.h \
-  SparseCmplxLU.h \
-  SparseCmplxQR.h \
-  SparseQR.h \
-  SparsedbleCHOL.h \
-  SparsedbleLU.h \
-  base-aepbal.h \
-  base-lu.h \
-  base-qr.h \
-  boolMatrix.h \
-  boolNDArray.h \
-  boolSparse.h \
-  bsxfun-decl.h \
-  chMatrix.h \
-  chNDArray.h \
-  dColVector.h \
-  dDiagMatrix.h \
-  dMatrix.h \
-  dNDArray.h \
-  dRowVector.h \
-  dSparse.h \
-  dbleAEPBAL.h \
-  dbleCHOL.h \
-  dbleGEPBAL.h \
-  dbleHESS.h \
-  dbleLU.h \
-  dbleQR.h \
-  dbleQRP.h \
-  dbleSCHUR.h \
-  dbleSVD.h \
-  dim-vector.h \
-  fCColVector.h \
-  fCDiagMatrix.h \
-  fCMatrix.h \
-  fCNDArray.h \
-  fCRowVector.h \
-  fCmplxAEPBAL.h \
-  fCmplxCHOL.h \
-  fCmplxGEPBAL.h \
-  fCmplxHESS.h \
-  fCmplxLU.h \
-  fCmplxQR.h \
-  fCmplxQRP.h \
-  fCmplxSCHUR.h \
-  fCmplxSVD.h \
-  fColVector.h \
-  fDiagMatrix.h \
-  fEIG.h \
-  fMatrix.h \
-  fNDArray.h \
-  fRowVector.h \
-  floatAEPBAL.h \
-  floatCHOL.h \
-  floatGEPBAL.h \
-  floatHESS.h \
-  floatLU.h \
-  floatQR.h \
-  floatQRP.h \
-  floatSCHUR.h \
-  floatSVD.h \
-  int16NDArray.h \
-  int32NDArray.h \
-  int64NDArray.h \
-  int8NDArray.h \
-  intNDArray.h \
-  mx-base.h \
-  mx-defs.h \
-  mx-ext.h \
-  mx-op-decl.h \
-  mx-op-defs.h \
-  sparse-base-chol.h \
-  sparse-base-lu.h \
-  uint16NDArray.h \
-  uint32NDArray.h \
-  uint64NDArray.h \
-  uint8NDArray.h
+octlib_LTLIBRARIES = liboctave.la
 
-OPT_IN = \
-  DASPK-opts.in \
-  DASRT-opts.in \
-  DASSL-opts.in \
-  LSODE-opts.in \
-  Quad-opts.in
-
-OPT_INC = \
-  DASPK-opts.h \
-  DASRT-opts.h \
-  DASSL-opts.h \
-  LSODE-opts.h \
-  Quad-opts.h
+EXTRA_DIST =
 
-INCS = \
-  CollocWt.h \
-  DAE.h \
-  DAEFunc.h \
-  DAERT.h \
-  DAERTFunc.h \
-  DASPK.h \
-  DASRT.h \
-  DASSL.h \
-  LSODE.h \
-  ODE.h \
-  ODEFunc.h \
-  ODES.h \
-  ODESFunc.h \
-  Quad.h \
-  Range.h \
-  base-dae.h \
-  base-de.h \
-  base-list.h \
-  base-min.h \
-  bsxfun.h \
-  byte-swap.h \
-  caseless-str.h \
-  cmd-edit.h \
-  cmd-hist.h \
-  data-conv.h \
-  dir-ops.h \
-  file-ops.h \
-  file-stat.h \
-  functor.h \
-  glob-match.h \
-  idx-vector.h \
-  lo-array-gripes.h \
-  lo-cutils.h \
-  lo-ieee.h \
-  lo-macros.h \
-  lo-mappers.h \
-  lo-math.h \
-  lo-specfun.h \
-  lo-sysdep.h \
-  lo-traits.h \
-  lo-utils.h \
-  mach-info.h \
-  oct-alloc.h \
-  oct-base64.h \
-  oct-binmap.h \
-  oct-cmplx.h \
-  oct-convn.h \
-  oct-env.h \
-  oct-fftw.h \
-  oct-glob.h \
-  oct-group.h \
-  oct-inttypes.h \
-  oct-locbuf.h \
-  oct-md5.h \
-  oct-mem.h \
-  oct-mutex.h \
-  oct-norm.h \
-  oct-openmp.h \
-  oct-passwd.h \
-  oct-rand.h \
-  oct-refcount.h \
-  oct-rl-edit.h \
-  oct-rl-hist.h \
-  oct-shlib.h \
-  oct-sort.h \
-  oct-sparse.h \
-  oct-spparms.h \
-  oct-syscalls.h \
-  oct-time.h \
-  oct-uname.h \
-  pathlen.h \
-  pathsearch.h \
-  randgamma.h \
-  randmtzig.h \
-  randpoisson.h \
-  regexp.h \
-  singleton-cleanup.h \
-  sparse-sort.h \
-  sparse-util.h \
-  statdefs.h \
-  str-vec.h \
-  sun-utils.h \
-  sysdir.h \
-  syswait.h \
-  $(MATRIX_INC)
-
-PRIVATE_INCS = \
-  oct-glob.h
-
-OTHER_INC = \
-  intNDArray.cc \
-  kpse.cc \
-  mx-inlines.cc
-
-include vx-op-inc.mk
-include mx-op-inc.mk
-include smx-op-inc.mk
-
-$(srcdir)/vx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/vx-ops
-	$(srcdir)/config-ops.sh $(top_srcdir) vx inc
-
-$(srcdir)/mx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/mx-ops
-	$(srcdir)/config-ops.sh $(top_srcdir) mx inc
-
-$(srcdir)/smx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/sparse-mk-ops.awk $(srcdir)/sparse-mx-ops
-	$(srcdir)/config-ops.sh $(top_srcdir) smx inc
+DISTCLEANFILES =
 
 BUILT_INCS = \
-  mx-ops.h \
+  operators/mx-ops.h \
   $(OPT_INC) \
   $(MX_OP_INC) \
   $(VX_OP_INC) \
@@ -287,233 +51,38 @@
 
 BUILT_SOURCES = $(BUILT_INCS)
 
-TEMPLATE_SRC = \
-  Array.cc \
-  DiagArray2.cc \
-  MArray.cc \
-  MDiagArray2.cc \
-  base-lu.cc \
-  base-qr.cc \
-  bsxfun-defs.cc \
-  eigs-base.cc \
-  oct-sort.cc \
-  sparse-base-chol.cc \
-  sparse-base-lu.cc \
-  sparse-dmsolve.cc
+octinclude_HEADERS = \
+  $(ARRAY_INC) \
+  $(NUMERIC_INC) \
+  $(OPERATORS_INC) \
+  $(SYSTEM_INC) \
+  $(UTIL_INC) \
+  $(OTHER_INC) \
+  $(TEMPLATE_SRC)
 
-TI_SRC = \
-  Array-C.cc \
-  Array-b.cc \
-  Array-ch.cc \
-  Array-d.cc \
-  Array-f.cc \
-  Array-fC.cc \
-  Array-i.cc \
-  Array-idx-vec.cc \
-  Array-s.cc \
-  Array-str.cc \
-  Array-voidp.cc \
-  MArray-C.cc \
-  MArray-d.cc \
-  MArray-f.cc \
-  MArray-fC.cc \
-  MArray-i.cc \
-  MArray-s.cc \
-  MSparse-C.cc \
-  MSparse-d.cc \
-  Sparse-C.cc \
-  Sparse-b.cc \
-  Sparse-d.cc \
-  oct-inttypes.cc
+nodist_octinclude_HEADERS = \
+  $(BUILT_INCS)
+
+noinst_LTLIBRARIES =
 
-MATRIX_SRC = \
-  Array-util.cc \
-  CColVector.cc \
-  CDiagMatrix.cc \
-  CMatrix.cc \
-  CNDArray.cc \
-  CRowVector.cc \
-  CSparse.cc \
-  CmplxAEPBAL.cc \
-  CmplxCHOL.cc \
-  CmplxGEPBAL.cc \
-  CmplxHESS.cc \
-  CmplxLU.cc \
-  CmplxQR.cc \
-  CmplxQRP.cc \
-  CmplxSCHUR.cc \
-  CmplxSVD.cc \
-  EIG.cc \
-  MSparse.cc \
-  MatrixType.cc \
-  PermMatrix.cc \
-  Sparse.cc \
-  SparseCmplxCHOL.cc \
-  SparseCmplxLU.cc \
-  SparseCmplxQR.cc \
-  SparseQR.cc \
-  SparsedbleCHOL.cc \
-  SparsedbleLU.cc \
-  boolMatrix.cc \
-  boolNDArray.cc \
-  boolSparse.cc \
-  chMatrix.cc \
-  chNDArray.cc \
-  dim-vector.cc \
-  dColVector.cc \
-  dDiagMatrix.cc \
-  dMatrix.cc \
-  dNDArray.cc \
-  dRowVector.cc \
-  dSparse.cc \
-  dbleAEPBAL.cc \
-  dbleCHOL.cc \
-  dbleGEPBAL.cc \
-  dbleHESS.cc \
-  dbleLU.cc \
-  dbleQR.cc \
-  dbleQRP.cc \
-  dbleSCHUR.cc \
-  dbleSVD.cc \
-  fCColVector.cc \
-  fCDiagMatrix.cc \
-  fCMatrix.cc \
-  fCNDArray.cc \
-  fCRowVector.cc \
-  fCmplxAEPBAL.cc \
-  fCmplxCHOL.cc \
-  fCmplxGEPBAL.cc \
-  fCmplxHESS.cc \
-  fCmplxLU.cc \
-  fCmplxQR.cc \
-  fCmplxQRP.cc \
-  fCmplxSCHUR.cc \
-  fCmplxSVD.cc \
-  fColVector.cc \
-  fDiagMatrix.cc \
-  fEIG.cc \
-  fMatrix.cc \
-  fNDArray.cc \
-  fRowVector.cc \
-  floatAEPBAL.cc \
-  floatCHOL.cc \
-  floatGEPBAL.cc \
-  floatHESS.cc \
-  floatLU.cc \
-  floatQR.cc \
-  floatQRP.cc \
-  floatSCHUR.cc \
-  floatSVD.cc \
-  int16NDArray.cc \
-  int32NDArray.cc \
-  int64NDArray.cc \
-  int8NDArray.cc \
-  uint16NDArray.cc \
-  uint32NDArray.cc \
-  uint64NDArray.cc \
-  uint8NDArray.cc
+## C++ files that are #included, not compiled
+OTHER_INC =
 
-octlib_LTLIBRARIES = liboctave.la
+## C++ files with templates that are #included, not compiled
+TEMPLATE_SRC =
 
-LIBOCTAVE_CXX_SOURCES = \
-  CollocWt.cc \
-  DASPK.cc \
-  DASRT.cc \
-  DASSL.cc \
-  LSODE.cc \
-  ODES.cc \
-  Quad.cc \
-  Range.cc \
-  data-conv.cc \
-  dir-ops.cc \
-  file-ops.cc \
-  file-stat.cc \
-  glob-match.cc \
-  idx-vector.cc \
-  lo-array-gripes.cc \
-  lo-ieee.cc \
-  lo-mappers.cc \
-  lo-specfun.cc \
-  lo-sysdep.cc \
-  lo-utils.cc \
-  mach-info.cc \
-  oct-alloc.cc \
-  oct-base64.cc \
-  oct-convn.cc \
-  oct-env.cc \
-  oct-fftw.cc \
-  oct-glob.cc \
-  oct-group.cc \
-  oct-locbuf.cc \
-  oct-md5.cc \
-  oct-mutex.cc \
-  oct-norm.cc \
-  oct-passwd.cc \
-  oct-rand.cc \
-  oct-shlib.cc \
-  oct-spparms.cc \
-  oct-syscalls.cc \
-  oct-time.cc \
-  oct-uname.cc \
-  pathsearch.cc \
-  regexp.cc \
-  singleton-cleanup.cc \
-  sparse-sort.cc \
-  sparse-util.cc \
-  str-vec.cc \
-  $(TI_SRC) \
-  $(MATRIX_SRC)
+include array/module.mk
+include numeric/module.mk
+include operators/module.mk
+include system/module.mk
+include util/module.mk
 
-include vx-op-src.mk
-include mx-op-src.mk
-include smx-op-src.mk
-
-$(srcdir)/vx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/vx-ops
-	$(srcdir)/config-ops.sh $(top_srcdir) vx src
-
-$(srcdir)/mx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/mx-ops
-	$(srcdir)/config-ops.sh $(top_srcdir) mx src
-
-$(srcdir)/smx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/sparse-mk-ops.awk $(srcdir)/sparse-mx-ops
-	$(srcdir)/config-ops.sh $(top_srcdir) smx src
-
-BUILT_LIBOCTAVE_CXX_SOURCES = \
-  $(MX_OP_SRC) \
-  $(VX_OP_SRC) \
-  $(SMX_OP_SRC)
+## liboctave merely collects a bunch of compiled convenience libraries.
+## It has no source code itself.
+liboctave_la_SOURCES = 
 
-LIBOCTAVE_C_SOURCES = \
-  f2c-main.c \
-  lo-cieee.c \
-  lo-cutils.c \
-  randgamma.c \
-  randmtzig.c \
-  randpoisson.c \
-  tempnam.c \
-  tempname.c
-
-LIBOCT_READLINE_CXX_SOURCES = cmd-edit.cc cmd-hist.cc
-
-LIBOCT_READLINE_C_SOURCES = oct-rl-edit.c oct-rl-hist.c
-
-LIBOCT_READLINE_SOURCES = $(LIBOCT_READLINE_CXX_SOURCES) $(LIBOCT_READLINE_C_SOURCES)
-
-liboctave_la_SOURCES = \
-  $(LIBOCTAVE_CXX_SOURCES) \
-  $(LIBOCTAVE_C_SOURCES) \
-  $(LIBOCTAVE_SOURCES) \
-  $(LIBOCT_READLINE_SOURCES) \
-  $(LIBOCT_PATHSEARCH_SOURCES)
-
-nodist_liboctave_la_SOURCES = \
-  $(BUILT_LIBOCTAVE_CXX_SOURCES)
-
-include link-deps.mk
-
-liboctave_la_LIBADD = \
-  ../libcruft/libcruft.la \
-  $(LIBOCTAVE_LINK_DEPS)
-
+## FIXME: SPARSE, FFTW, and ARPACK flags should probably only be in the
+##        particular convenience library that needs them.  
 liboctave_la_CPPFLAGS = \
   @OCTAVE_DLL_DEFS@ \
   $(SPARSE_XCPPFLAGS) \
@@ -521,8 +90,18 @@
   $(ARPACK_CPPFLAGS) \
   $(AM_CPPFLAGS)
 
-# Increment these as needed and according to the rules in the libtool
-# manual:
+include link-deps.mk
+
+liboctave_la_LIBADD = \
+  array/libarray.la \
+	cruft/libcruft.la \
+	numeric/libnumeric.la \
+	operators/liboperators.la \
+	system/libsystem.la \
+	util/libutil.la \
+  $(LIBOCTAVE_LINK_DEPS)
+
+# Increment these as needed and according to the rules in the libtool manual:
 liboctave_current = 1
 liboctave_revision = 1
 liboctave_age = 0
@@ -535,32 +114,5 @@
   -bindir $(bindir) \
   $(LIBOCTAVE_LINK_OPTS)
 
-octinclude_HEADERS = \
-  $(INCS) \
-  $(OTHER_INC) \
-  $(TEMPLATE_SRC) \
-  $(EXTRA_HEADERS)
-
-nodist_octinclude_HEADERS = \
-  $(BUILT_INCS)
-
-$(OPT_INC) : %.h : %.in $(top_srcdir)/build-aux/mk-opts.pl
-	@echo making $@ from $<
-	@$(PERL) $(top_srcdir)/build-aux/mk-opts.pl --opt-class-header $< > $@-t
-	mv $@-t $@
+DISTCLEANFILES += $(BUILT_INCS)
 
-$(VX_OP_INC) $(VX_OP_SRC) : $(srcdir)/mk-ops.awk vx-ops
-	$(AWK) -f $(srcdir)/mk-ops.awk prefix=vx $(srcdir)/vx-ops
-
-$(MX_OP_INC) $(MX_OP_SRC) : $(srcdir)/mk-ops.awk mx-ops
-	$(AWK) -f $(srcdir)/mk-ops.awk prefix=mx $(srcdir)/mx-ops
-
-$(SMX_OP_INC) $(SMX_OP_SRC) : $(srcdir)/sparse-mk-ops.awk sparse-mx-ops
-	$(AWK) -f $(srcdir)/sparse-mk-ops.awk prefix=smx $(srcdir)/sparse-mx-ops
-
-mx-ops.h : $(srcdir)/mk-ops.awk mx-ops
-	$(AWK) -f $(srcdir)/mk-ops.awk prefix=mx make_inclusive_header=mx-ops.h $(srcdir)/mx-ops > $@-t
-	mv $@-t $@
-
-DISTCLEANFILES = $(BUILT_INCS) $(BUILT_LIBOCTAVE_CXX_SOURCES)
-