# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1411311098 14400
# Node ID 3087dc835497c067f2084c71138b2be49e5b9e6a
# Parent  c8f03ccdc9ee69e50157e8764c9b901ebf89a1d1
eliminate recursive build in liboctave/cruft directory

* liboctave/cruft/module.mk: New file, adapted from Makefile.am.
* liboctave/cruft/Makefile.am: Delete.
* configure.ac (AC_OUTPUT): Don't generate liboctave/cruft/Makefile.

* liboctave/array/module.mk, liboctave/numeric/module.mk,
liboctave/operators/module.mk, liboctave/system/module.mk,
liboctave/util/module.mk: Append convenience library name to
liboctave_la_LIBADD here.
* liboctave/Makefile.am: Initialize liboctave_la_LIBADD to empty
string here.

* liboctave/cruft/Faddeeva/module.mk, liboctave/cruft/amos/module.mk,
liboctave/cruft/blas-xtra/module.mk, liboctave/cruft/daspk/module.mk,
liboctave/cruft/dasrt/module.mk, liboctave/cruft/dassl/module.mk,
liboctave/cruft/fftpack/module.mk,
liboctave/cruft/lapack-xtra/module.mk, liboctave/cruft/misc/module.mk,
liboctave/cruft/odepack/module.mk,
liboctave/cruft/ordered-qz/module.mk,
liboctave/cruft/quadpack/module.mk, liboctave/cruft/ranlib/module.mk,
liboctave/cruft/slatec-err/module.mk,
liboctave/cruft/slatec-fn/module.mk: Adapt for non-recursive build.

diff -r c8f03ccdc9ee -r 3087dc835497 configure.ac
--- a/configure.ac	Sat Sep 20 22:04:01 2014 -0700
+++ b/configure.ac	Sun Sep 21 10:51:38 2014 -0400
@@ -2888,7 +2888,6 @@
   libgui/Makefile
   libinterp/Makefile
   liboctave/Makefile
-  liboctave/cruft/Makefile
   liboctave/cruft/mkf77def
   scripts/Makefile
   src/Makefile
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/Makefile.am
--- a/liboctave/Makefile.am	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/Makefile.am	Sun Sep 21 10:51:38 2014 -0400
@@ -20,10 +20,6 @@
 
 include $(top_srcdir)/build-aux/common.mk
 
-## 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$(srcdir)/array \
@@ -55,6 +51,7 @@
 
 octinclude_HEADERS = \
   $(ARRAY_INC) \
+  $(CRUFT_INC) \
   $(NUMERIC_INC) \
   $(OPERATORS_INC) \
   $(SYSTEM_INC) \
@@ -75,7 +72,10 @@
 
 ## A list of all files that could include tests
 
+liboctave_la_LIBADD =
+
 include array/module.mk
+include cruft/module.mk
 include numeric/module.mk
 include operators/module.mk
 include system/module.mk
@@ -92,14 +92,7 @@
 # Dummy C++ source to force C++ linking.
 nodist_EXTRA_liboctave_la_SOURCES = dummy.cc
 
-liboctave_la_LIBADD = \
-  array/libarray.la \
-  cruft/libcruft.la \
-  cruft/ranlib/libranlib.la \
-  numeric/libnumeric.la \
-  operators/liboperators.la \
-  system/libsystem.la \
-  util/libutil.la \
+liboctave_la_LIBADD += \
   $(top_builddir)/libgnu/libgnu.la \
   $(LIBOCTAVE_LINK_DEPS)
 
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/array/module.mk
--- a/liboctave/array/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/array/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -141,3 +141,4 @@
   $(liboctave_la_CPPFLAGS) \
   $(SPARSE_XCPPFLAGS)
 
+liboctave_la_LIBADD += array/libarray.la
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/Faddeeva/module.mk
--- a/liboctave/cruft/Faddeeva/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/Faddeeva/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,3 +1,5 @@
-EXTRA_DIST += Faddeeva/module.mk
+EXTRA_DIST += cruft/Faddeeva/module.mk
 
-libcruft_la_SOURCES += Faddeeva/Faddeeva.cc Faddeeva/Faddeeva.hh
+CRUFT_SOURCES += \
+  cruft/Faddeeva/Faddeeva.cc \
+  cruft/Faddeeva/Faddeeva.hh
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/Makefile.am
--- a/liboctave/cruft/Makefile.am	Sat Sep 20 22:04:01 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-# Makefile for Octave's liboctave/cruft directory
-#
-# Copyright (C) 1993-2013 John W. Eaton
-#
-# This file is part of Octave.
-#
-# Octave is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at
-# your option) any later version.
-#
-# Octave is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Octave; see the file COPYING.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-include $(top_srcdir)/build-aux/common.mk
-
-## Search local directories before those specified by the user.
-AM_CPPFLAGS = \
-  -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
-
-EXTRA_DIST = mkf77def.in
-
-noinst_LTLIBRARIES = libcruft.la
-
-libcruft_la_SOURCES =
-
-nodist_libcruft_la_SOURCES =
-
-libcruft_la_FFLAGS = $(F77_INTEGER_8_FLAG)
-
-libcruft_la_CPPFLAGS = @CRUFT_DLL_DEFS@ $(AM_CPPFLAGS)
-
-libcruft_la_DEPENDENCIES = cruft.def
-
-octinclude_HEADERS =
-
-include amos/module.mk
-include blas-xtra/module.mk
-include daspk/module.mk
-include dasrt/module.mk
-include dassl/module.mk
-include Faddeeva/module.mk
-include fftpack/module.mk
-include lapack-xtra/module.mk
-include misc/module.mk
-include odepack/module.mk
-include ordered-qz/module.mk
-include quadpack/module.mk
-include ranlib/module.mk
-include slatec-err/module.mk
-include slatec-fn/module.mk
-
-## Special rules for files which must be built before compilation
-cruft.def: $(libcruft_la_SOURCES) mkf77def
-	chmod a+rx mkf77def
-	./mkf77def $(srcdir) $(libcruft_la_SOURCES) > $@-t
-	mv $@-t $@
-
-DISTCLEANFILES = \
-  cruft.def \
-  ranlib/ranlib.def \
-  $(nodist_libcruft_la_SOURCES)
-
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/amos/module.mk
--- a/liboctave/cruft/amos/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/amos/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,69 +1,69 @@
-EXTRA_DIST += amos/module.mk
+EXTRA_DIST += cruft/amos/module.mk
 
-libcruft_la_SOURCES += \
-  amos/cacai.f \
-  amos/cacon.f \
-  amos/cbesh.f \
-  amos/cbesi.f \
-  amos/cbesj.f \
-  amos/cbesk.f \
-  amos/cbesy.f \
-  amos/cbinu.f \
-  amos/cbuni.f \
-  amos/cbunk.f \
-  amos/cunk1.f \
-  amos/cunk2.f \
-  amos/crati.f \
-  amos/cshch.f \
-  amos/cuni1.f \
-  amos/cuoik.f \
-  amos/cairy.f \
-  amos/cbiry.f \
-  amos/ckscl.f \
-  amos/cs1s2.f \
-  amos/cuchk.f \
-  amos/cuni2.f \
-  amos/cwrsk.f \
-  amos/casyi.f \
-  amos/cbknu.f \
-  amos/cmlri.f \
-  amos/cseri.f \
-  amos/cunhj.f \
-  amos/cunik.f \
-  amos/dgamln.f \
-  amos/gamln.f \
-  amos/xzabs.f \
-  amos/xzexp.f \
-  amos/xzlog.f \
-  amos/xzsqrt.f \
-  amos/zacai.f \
-  amos/zacon.f \
-  amos/zairy.f \
-  amos/zasyi.f \
-  amos/zbesh.f \
-  amos/zbesi.f \
-  amos/zbesj.f \
-  amos/zbesk.f \
-  amos/zbesy.f \
-  amos/zbinu.f \
-  amos/zbiry.f \
-  amos/zbknu.f \
-  amos/zbuni.f \
-  amos/zbunk.f \
-  amos/zdiv.f \
-  amos/zkscl.f \
-  amos/zmlri.f \
-  amos/zmlt.f \
-  amos/zrati.f \
-  amos/zs1s2.f \
-  amos/zseri.f \
-  amos/zshch.f \
-  amos/zuchk.f \
-  amos/zunhj.f \
-  amos/zuni1.f \
-  amos/zuni2.f \
-  amos/zunik.f \
-  amos/zunk1.f \
-  amos/zunk2.f \
-  amos/zuoik.f \
-  amos/zwrsk.f
+CRUFT_SOURCES += \
+  cruft/amos/cacai.f \
+  cruft/amos/cacon.f \
+  cruft/amos/cbesh.f \
+  cruft/amos/cbesi.f \
+  cruft/amos/cbesj.f \
+  cruft/amos/cbesk.f \
+  cruft/amos/cbesy.f \
+  cruft/amos/cbinu.f \
+  cruft/amos/cbuni.f \
+  cruft/amos/cbunk.f \
+  cruft/amos/cunk1.f \
+  cruft/amos/cunk2.f \
+  cruft/amos/crati.f \
+  cruft/amos/cshch.f \
+  cruft/amos/cuni1.f \
+  cruft/amos/cuoik.f \
+  cruft/amos/cairy.f \
+  cruft/amos/cbiry.f \
+  cruft/amos/ckscl.f \
+  cruft/amos/cs1s2.f \
+  cruft/amos/cuchk.f \
+  cruft/amos/cuni2.f \
+  cruft/amos/cwrsk.f \
+  cruft/amos/casyi.f \
+  cruft/amos/cbknu.f \
+  cruft/amos/cmlri.f \
+  cruft/amos/cseri.f \
+  cruft/amos/cunhj.f \
+  cruft/amos/cunik.f \
+  cruft/amos/dgamln.f \
+  cruft/amos/gamln.f \
+  cruft/amos/xzabs.f \
+  cruft/amos/xzexp.f \
+  cruft/amos/xzlog.f \
+  cruft/amos/xzsqrt.f \
+  cruft/amos/zacai.f \
+  cruft/amos/zacon.f \
+  cruft/amos/zairy.f \
+  cruft/amos/zasyi.f \
+  cruft/amos/zbesh.f \
+  cruft/amos/zbesi.f \
+  cruft/amos/zbesj.f \
+  cruft/amos/zbesk.f \
+  cruft/amos/zbesy.f \
+  cruft/amos/zbinu.f \
+  cruft/amos/zbiry.f \
+  cruft/amos/zbknu.f \
+  cruft/amos/zbuni.f \
+  cruft/amos/zbunk.f \
+  cruft/amos/zdiv.f \
+  cruft/amos/zkscl.f \
+  cruft/amos/zmlri.f \
+  cruft/amos/zmlt.f \
+  cruft/amos/zrati.f \
+  cruft/amos/zs1s2.f \
+  cruft/amos/zseri.f \
+  cruft/amos/zshch.f \
+  cruft/amos/zuchk.f \
+  cruft/amos/zunhj.f \
+  cruft/amos/zuni1.f \
+  cruft/amos/zuni2.f \
+  cruft/amos/zunik.f \
+  cruft/amos/zunk1.f \
+  cruft/amos/zunk2.f \
+  cruft/amos/zuoik.f \
+  cruft/amos/zwrsk.f
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/blas-xtra/module.mk
--- a/liboctave/cruft/blas-xtra/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/blas-xtra/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,28 +1,28 @@
-EXTRA_DIST += blas-xtra/module.mk
+EXTRA_DIST += cruft/blas-xtra/module.mk
 
-libcruft_la_SOURCES += \
-  blas-xtra/ddot3.f \
-  blas-xtra/zdotc3.f \
-  blas-xtra/sdot3.f \
-  blas-xtra/cdotc3.f \
-  blas-xtra/dmatm3.f \
-  blas-xtra/zmatm3.f \
-  blas-xtra/smatm3.f \
-  blas-xtra/cmatm3.f \
-  blas-xtra/xddot.f \
-  blas-xtra/xdnrm2.f \
-  blas-xtra/xdznrm2.f \
-  blas-xtra/xzdotc.f \
-  blas-xtra/xzdotu.f \
-  blas-xtra/xsdot.f \
-  blas-xtra/xsnrm2.f \
-  blas-xtra/xscnrm2.f \
-  blas-xtra/xcdotc.f \
-  blas-xtra/xcdotu.f \
-  blas-xtra/xerbla.f \
-  blas-xtra/cconv2.f \
-  blas-xtra/csconv2.f \
-  blas-xtra/dconv2.f \
-  blas-xtra/sconv2.f \
-  blas-xtra/zconv2.f \
-  blas-xtra/zdconv2.f
+CRUFT_SOURCES += \
+  cruft/blas-xtra/ddot3.f \
+  cruft/blas-xtra/zdotc3.f \
+  cruft/blas-xtra/sdot3.f \
+  cruft/blas-xtra/cdotc3.f \
+  cruft/blas-xtra/dmatm3.f \
+  cruft/blas-xtra/zmatm3.f \
+  cruft/blas-xtra/smatm3.f \
+  cruft/blas-xtra/cmatm3.f \
+  cruft/blas-xtra/xddot.f \
+  cruft/blas-xtra/xdnrm2.f \
+  cruft/blas-xtra/xdznrm2.f \
+  cruft/blas-xtra/xzdotc.f \
+  cruft/blas-xtra/xzdotu.f \
+  cruft/blas-xtra/xsdot.f \
+  cruft/blas-xtra/xsnrm2.f \
+  cruft/blas-xtra/xscnrm2.f \
+  cruft/blas-xtra/xcdotc.f \
+  cruft/blas-xtra/xcdotu.f \
+  cruft/blas-xtra/xerbla.f \
+  cruft/blas-xtra/cconv2.f \
+  cruft/blas-xtra/csconv2.f \
+  cruft/blas-xtra/dconv2.f \
+  cruft/blas-xtra/sconv2.f \
+  cruft/blas-xtra/zconv2.f \
+  cruft/blas-xtra/zdconv2.f
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/daspk/module.mk
--- a/liboctave/cruft/daspk/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/daspk/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,31 +1,31 @@
-EXTRA_DIST += daspk/module.mk
+EXTRA_DIST += cruft/daspk/module.mk
 
-libcruft_la_SOURCES += \
-  daspk/datv.f \
-  daspk/dcnst0.f \
-  daspk/dcnstr.f \
-  daspk/ddasic.f \
-  daspk/ddasid.f \
-  daspk/ddasik.f \
-  daspk/ddaspk.f \
-  daspk/ddstp.f \
-  daspk/ddwnrm.f \
-  daspk/dfnrmd.f \
-  daspk/dfnrmk.f \
-  daspk/dhels.f \
-  daspk/dheqr.f \
-  daspk/dinvwt.f \
-  daspk/dlinsd.f \
-  daspk/dlinsk.f \
-  daspk/dmatd.f \
-  daspk/dnedd.f \
-  daspk/dnedk.f \
-  daspk/dnsd.f \
-  daspk/dnsid.f \
-  daspk/dnsik.f \
-  daspk/dnsk.f \
-  daspk/dorth.f \
-  daspk/dslvd.f \
-  daspk/dslvk.f \
-  daspk/dspigm.f \
-  daspk/dyypnw.f
+CRUFT_SOURCES += \
+  cruft/daspk/datv.f \
+  cruft/daspk/dcnst0.f \
+  cruft/daspk/dcnstr.f \
+  cruft/daspk/ddasic.f \
+  cruft/daspk/ddasid.f \
+  cruft/daspk/ddasik.f \
+  cruft/daspk/ddaspk.f \
+  cruft/daspk/ddstp.f \
+  cruft/daspk/ddwnrm.f \
+  cruft/daspk/dfnrmd.f \
+  cruft/daspk/dfnrmk.f \
+  cruft/daspk/dhels.f \
+  cruft/daspk/dheqr.f \
+  cruft/daspk/dinvwt.f \
+  cruft/daspk/dlinsd.f \
+  cruft/daspk/dlinsk.f \
+  cruft/daspk/dmatd.f \
+  cruft/daspk/dnedd.f \
+  cruft/daspk/dnedk.f \
+  cruft/daspk/dnsd.f \
+  cruft/daspk/dnsid.f \
+  cruft/daspk/dnsik.f \
+  cruft/daspk/dnsk.f \
+  cruft/daspk/dorth.f \
+  cruft/daspk/dslvd.f \
+  cruft/daspk/dslvk.f \
+  cruft/daspk/dspigm.f \
+  cruft/daspk/dyypnw.f
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/dasrt/module.mk
--- a/liboctave/cruft/dasrt/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/dasrt/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,6 +1,6 @@
-EXTRA_DIST += dasrt/module.mk
+EXTRA_DIST += cruft/dasrt/module.mk
 
-libcruft_la_SOURCES += \
-  dasrt/ddasrt.f \
-  dasrt/drchek.f \
-  dasrt/droots.f
+CRUFT_SOURCES += \
+  cruft/dasrt/ddasrt.f \
+  cruft/dasrt/drchek.f \
+  cruft/dasrt/droots.f
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/dassl/module.mk
--- a/liboctave/cruft/dassl/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/dassl/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,11 +1,11 @@
-EXTRA_DIST += dassl/module.mk
+EXTRA_DIST += cruft/dassl/module.mk
 
-libcruft_la_SOURCES += \
-  dassl/ddaini.f \
-  dassl/ddajac.f \
-  dassl/ddanrm.f \
-  dassl/ddaslv.f \
-  dassl/ddassl.f \
-  dassl/ddastp.f \
-  dassl/ddatrp.f \
-  dassl/ddawts.f
+CRUFT_SOURCES += \
+  cruft/dassl/ddaini.f \
+  cruft/dassl/ddajac.f \
+  cruft/dassl/ddanrm.f \
+  cruft/dassl/ddaslv.f \
+  cruft/dassl/ddassl.f \
+  cruft/dassl/ddastp.f \
+  cruft/dassl/ddatrp.f \
+  cruft/dassl/ddawts.f
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/fftpack/module.mk
--- a/liboctave/cruft/fftpack/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/fftpack/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,43 +1,43 @@
 EXTRA_DIST += \
-  fftpack/module.mk \
-  fftpack/fftpack.doc
+  cruft/fftpack/module.mk \
+  cruft/fftpack/fftpack.doc
 
 FFTPACK_SRC = \
-  fftpack/cfftb.f \
-  fftpack/cfftb1.f \
-  fftpack/cfftf.f \
-  fftpack/cfftf1.f \
-  fftpack/cffti.f \
-  fftpack/cffti1.f \
-  fftpack/passb.f \
-  fftpack/passb2.f \
-  fftpack/passb3.f \
-  fftpack/passb4.f \
-  fftpack/passb5.f \
-  fftpack/passf.f \
-  fftpack/passf2.f \
-  fftpack/passf3.f \
-  fftpack/passf4.f \
-  fftpack/passf5.f \
-  fftpack/zfftb.f \
-  fftpack/zfftb1.f \
-  fftpack/zfftf.f \
-  fftpack/zfftf1.f \
-  fftpack/zffti.f \
-  fftpack/zffti1.f \
-  fftpack/zpassb.f \
-  fftpack/zpassb2.f \
-  fftpack/zpassb3.f \
-  fftpack/zpassb4.f \
-  fftpack/zpassb5.f \
-  fftpack/zpassf.f \
-  fftpack/zpassf2.f \
-  fftpack/zpassf3.f \
-  fftpack/zpassf4.f \
-  fftpack/zpassf5.f
+  cruft/fftpack/cfftb.f \
+  cruft/fftpack/cfftb1.f \
+  cruft/fftpack/cfftf.f \
+  cruft/fftpack/cfftf1.f \
+  cruft/fftpack/cffti.f \
+  cruft/fftpack/cffti1.f \
+  cruft/fftpack/passb.f \
+  cruft/fftpack/passb2.f \
+  cruft/fftpack/passb3.f \
+  cruft/fftpack/passb4.f \
+  cruft/fftpack/passb5.f \
+  cruft/fftpack/passf.f \
+  cruft/fftpack/passf2.f \
+  cruft/fftpack/passf3.f \
+  cruft/fftpack/passf4.f \
+  cruft/fftpack/passf5.f \
+  cruft/fftpack/zfftb.f \
+  cruft/fftpack/zfftb1.f \
+  cruft/fftpack/zfftf.f \
+  cruft/fftpack/zfftf1.f \
+  cruft/fftpack/zffti.f \
+  cruft/fftpack/zffti1.f \
+  cruft/fftpack/zpassb.f \
+  cruft/fftpack/zpassb2.f \
+  cruft/fftpack/zpassb3.f \
+  cruft/fftpack/zpassb4.f \
+  cruft/fftpack/zpassb5.f \
+  cruft/fftpack/zpassf.f \
+  cruft/fftpack/zpassf2.f \
+  cruft/fftpack/zpassf3.f \
+  cruft/fftpack/zpassf4.f \
+  cruft/fftpack/zpassf5.f
 
 if AMCOND_HAVE_FFTW
   EXTRA_DIST += $(FFTPACK_SRC)
 else
-  libcruft_la_SOURCES += $(FFTPACK_SRC)
+  CRUFT_SOURCES += $(FFTPACK_SRC)
 endif
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/lapack-xtra/module.mk
--- a/liboctave/cruft/lapack-xtra/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/lapack-xtra/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,12 +1,12 @@
-EXTRA_DIST += lapack-xtra/module.mk
+EXTRA_DIST += cruft/lapack-xtra/module.mk
 
-libcruft_la_SOURCES += \
-  lapack-xtra/xclange.f \
-  lapack-xtra/xdlamch.f \
-  lapack-xtra/xdlange.f \
-  lapack-xtra/xilaenv.f \
-  lapack-xtra/xslamch.f \
-  lapack-xtra/xslange.f \
-  lapack-xtra/xzlange.f \
-  lapack-xtra/zrsf2csf.f \
-  lapack-xtra/crsf2csf.f
+CRUFT_SOURCES += \
+  cruft/lapack-xtra/xclange.f \
+  cruft/lapack-xtra/xdlamch.f \
+  cruft/lapack-xtra/xdlange.f \
+  cruft/lapack-xtra/xilaenv.f \
+  cruft/lapack-xtra/xslamch.f \
+  cruft/lapack-xtra/xslange.f \
+  cruft/lapack-xtra/xzlange.f \
+  cruft/lapack-xtra/zrsf2csf.f \
+  cruft/lapack-xtra/crsf2csf.f
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/misc/module.mk
--- a/liboctave/cruft/misc/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/misc/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,19 +1,19 @@
 EXTRA_DIST += \
-  misc/module.mk \
-  misc/d1mach-tst.for 
+  cruft/misc/module.mk \
+  cruft/misc/d1mach-tst.for 
 
-libcruft_la_SOURCES += \
-  misc/blaswrap.c \
-  misc/cquit.c \
-  misc/d1mach.f \
-  misc/f77-extern.cc \
-  misc/f77-fcn.c \
-  misc/i1mach.f \
-  misc/lo-error.c \
-  misc/quit.cc \
-  misc/r1mach.f
+CRUFT_SOURCES += \
+  cruft/misc/blaswrap.c \
+  cruft/misc/cquit.c \
+  cruft/misc/d1mach.f \
+  cruft/misc/f77-extern.cc \
+  cruft/misc/f77-fcn.c \
+  cruft/misc/i1mach.f \
+  cruft/misc/lo-error.c \
+  cruft/misc/quit.cc \
+  cruft/misc/r1mach.f
 
-octinclude_HEADERS += \
-  misc/f77-fcn.h \
-  misc/lo-error.h \
-  misc/quit.h
+CRUFT_INC += \
+  cruft/misc/f77-fcn.h \
+  cruft/misc/lo-error.h \
+  cruft/misc/quit.h
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/odepack/module.mk
--- a/liboctave/cruft/odepack/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/odepack/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,19 +1,19 @@
-EXTRA_DIST += odepack/module.mk
+EXTRA_DIST += cruft/odepack/module.mk
 
-libcruft_la_SOURCES += \
-  odepack/cfode.f \
-  odepack/dlsode.f \
-  odepack/ewset.f \
-  odepack/intdy.f \
-  odepack/prepj.f \
-  odepack/solsy.f \
-  odepack/stode.f \
-  odepack/vnorm.f \
-  odepack/scfode.f \
-  odepack/sewset.f \
-  odepack/sintdy.f \
-  odepack/slsode.f \
-  odepack/sprepj.f \
-  odepack/ssolsy.f \
-  odepack/sstode.f \
-  odepack/svnorm.f
+CRUFT_SOURCES += \
+  cruft/odepack/cfode.f \
+  cruft/odepack/dlsode.f \
+  cruft/odepack/ewset.f \
+  cruft/odepack/intdy.f \
+  cruft/odepack/prepj.f \
+  cruft/odepack/solsy.f \
+  cruft/odepack/stode.f \
+  cruft/odepack/vnorm.f \
+  cruft/odepack/scfode.f \
+  cruft/odepack/sewset.f \
+  cruft/odepack/sintdy.f \
+  cruft/odepack/slsode.f \
+  cruft/odepack/sprepj.f \
+  cruft/odepack/ssolsy.f \
+  cruft/odepack/sstode.f \
+  cruft/odepack/svnorm.f
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/ordered-qz/module.mk
--- a/liboctave/cruft/ordered-qz/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/ordered-qz/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,7 +1,7 @@
-EXTRA_DIST += ordered-qz/module.mk
+EXTRA_DIST += cruft/ordered-qz/module.mk
 
-libcruft_la_SOURCES += \
-  ordered-qz/dsubsp.f \
-  ordered-qz/exchqz.f \
-  ordered-qz/ssubsp.f \
-  ordered-qz/sexchqz.f
+CRUFT_SOURCES += \
+  cruft/ordered-qz/dsubsp.f \
+  cruft/ordered-qz/exchqz.f \
+  cruft/ordered-qz/ssubsp.f \
+  cruft/ordered-qz/sexchqz.f
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/quadpack/module.mk
--- a/liboctave/cruft/quadpack/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/quadpack/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,20 +1,20 @@
-EXTRA_DIST += quadpack/module.mk
+EXTRA_DIST += cruft/quadpack/module.mk
 
-libcruft_la_SOURCES += \
-  quadpack/dqagi.f \
-  quadpack/dqagie.f \
-  quadpack/dqagp.f \
-  quadpack/dqagpe.f \
-  quadpack/dqelg.f \
-  quadpack/dqk15i.f \
-  quadpack/dqk21.f \
-  quadpack/dqpsrt.f \
-  quadpack/qagie.f \
-  quadpack/qagi.f \
-  quadpack/qagpe.f \
-  quadpack/qagp.f \
-  quadpack/qelg.f \
-  quadpack/qk15i.f \
-  quadpack/qk21.f \
-  quadpack/qpsrt.f \
-  quadpack/xerror.f
+CRUFT_SOURCES += \
+  cruft/quadpack/dqagi.f \
+  cruft/quadpack/dqagie.f \
+  cruft/quadpack/dqagp.f \
+  cruft/quadpack/dqagpe.f \
+  cruft/quadpack/dqelg.f \
+  cruft/quadpack/dqk15i.f \
+  cruft/quadpack/dqk21.f \
+  cruft/quadpack/dqpsrt.f \
+  cruft/quadpack/qagie.f \
+  cruft/quadpack/qagi.f \
+  cruft/quadpack/qagpe.f \
+  cruft/quadpack/qagp.f \
+  cruft/quadpack/qelg.f \
+  cruft/quadpack/qk15i.f \
+  cruft/quadpack/qk21.f \
+  cruft/quadpack/qpsrt.f \
+  cruft/quadpack/xerror.f
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/ranlib/module.mk
--- a/liboctave/cruft/ranlib/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/ranlib/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,64 +1,65 @@
 EXTRA_DIST += \
-  ranlib/module.mk \
-  ranlib/Basegen.doc \
-  ranlib/HOWTOGET \
-  ranlib/README \
-  ranlib/randlib.chs \
-  ranlib/randlib.fdoc \
-  ranlib/tstbot.for \
-  ranlib/tstgmn.for \
-  ranlib/tstmid.for
+  cruft/ranlib/module.mk \
+  cruft/ranlib/Basegen.doc \
+  cruft/ranlib/HOWTOGET \
+  cruft/ranlib/README \
+  cruft/ranlib/randlib.chs \
+  cruft/ranlib/randlib.fdoc \
+  cruft/ranlib/tstbot.for \
+  cruft/ranlib/tstgmn.for \
+  cruft/ranlib/tstmid.for
 
 RANLIB_SRC = \
-  ranlib/advnst.f \
-  ranlib/genbet.f \
-  ranlib/genchi.f \
-  ranlib/genexp.f \
-  ranlib/genf.f \
-  ranlib/gengam.f \
-  ranlib/genmn.f \
-  ranlib/genmul.f \
-  ranlib/gennch.f \
-  ranlib/gennf.f \
-  ranlib/gennor.f \
-  ranlib/genprm.f \
-  ranlib/genunf.f \
-  ranlib/getcgn.f \
-  ranlib/getsd.f \
-  ranlib/ignbin.f \
-  ranlib/ignlgi.f \
-  ranlib/ignnbn.f \
-  ranlib/ignpoi.f \
-  ranlib/ignuin.f \
-  ranlib/initgn.f \
-  ranlib/inrgcm.f \
-  ranlib/lennob.f \
-  ranlib/mltmod.f \
-  ranlib/phrtsd.f \
-  ranlib/qrgnin.f \
-  ranlib/ranf.f \
-  ranlib/setall.f \
-  ranlib/setant.f \
-  ranlib/setgmn.f \
-  ranlib/setsd.f \
-  ranlib/sexpo.f \
-  ranlib/sgamma.f \
-  ranlib/snorm.f \
-  ranlib/wrap.f
+  cruft/ranlib/advnst.f \
+  cruft/ranlib/genbet.f \
+  cruft/ranlib/genchi.f \
+  cruft/ranlib/genexp.f \
+  cruft/ranlib/genf.f \
+  cruft/ranlib/gengam.f \
+  cruft/ranlib/genmn.f \
+  cruft/ranlib/genmul.f \
+  cruft/ranlib/gennch.f \
+  cruft/ranlib/gennf.f \
+  cruft/ranlib/gennor.f \
+  cruft/ranlib/genprm.f \
+  cruft/ranlib/genunf.f \
+  cruft/ranlib/getcgn.f \
+  cruft/ranlib/getsd.f \
+  cruft/ranlib/ignbin.f \
+  cruft/ranlib/ignlgi.f \
+  cruft/ranlib/ignnbn.f \
+  cruft/ranlib/ignpoi.f \
+  cruft/ranlib/ignuin.f \
+  cruft/ranlib/initgn.f \
+  cruft/ranlib/inrgcm.f \
+  cruft/ranlib/lennob.f \
+  cruft/ranlib/mltmod.f \
+  cruft/ranlib/phrtsd.f \
+  cruft/ranlib/qrgnin.f \
+  cruft/ranlib/ranf.f \
+  cruft/ranlib/setall.f \
+  cruft/ranlib/setant.f \
+  cruft/ranlib/setgmn.f \
+  cruft/ranlib/setsd.f \
+  cruft/ranlib/sexpo.f \
+  cruft/ranlib/sgamma.f \
+  cruft/ranlib/snorm.f \
+  cruft/ranlib/wrap.f
 
-noinst_LTLIBRARIES += ranlib/libranlib.la
+noinst_LTLIBRARIES += cruft/ranlib/libranlib.la
 
-ranlib_libranlib_la_SOURCES = $(RANLIB_SRC)
+cruft_ranlib_libranlib_la_SOURCES = $(RANLIB_SRC)
 
-ranlib_libranlib_la_DEPENDENCIES = ranlib/ranlib.def
+cruft_ranlib_libranlib_la_DEPENDENCIES = cruft/ranlib/ranlib.def
 
 ## Special rules for files which must be built before compilation
 ## ranlib directory may not exist in VPATH build; create it if necessary.
-ranlib/ranlib.def: $(RANLIB_SRC) mkf77def
-	@-if ! test -d ranlib; then \
-		mkdir ranlib ; \
+cruft/ranlib/ranlib.def: $(RANLIB_SRC) cruft/mkf77def
+	@-if ! test -d cruft/ranlib; then \
+		mkdir cruft/ranlib ; \
 	fi
-	chmod a+rx mkf77def
-	./mkf77def $(srcdir) $(RANLIB_SRC) > $@-t
+	chmod a+rx cruft/mkf77def
+	./cruft/mkf77def $(srcdir) $(RANLIB_SRC) > $@-t
 	mv $@-t $@
 
+liboctave_la_LIBADD += cruft/ranlib/libranlib.la
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/slatec-err/module.mk
--- a/liboctave/cruft/slatec-err/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/slatec-err/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,17 +1,17 @@
-EXTRA_DIST += slatec-err/module.mk
+EXTRA_DIST += cruft/slatec-err/module.mk
 
-libcruft_la_SOURCES += \
-  slatec-err/fdump.f \
-  slatec-err/ixsav.f \
-  slatec-err/j4save.f \
-  slatec-err/xerclr.f \
-  slatec-err/xercnt.f \
-  slatec-err/xerhlt.f \
-  slatec-err/xermsg.f \
-  slatec-err/xerprn.f \
-  slatec-err/xerrwd.f \
-  slatec-err/xersve.f \
-  slatec-err/xgetf.f \
-  slatec-err/xgetua.f \
-  slatec-err/xsetf.f \
-  slatec-err/xsetua.f
+CRUFT_SOURCES += \
+  cruft/slatec-err/fdump.f \
+  cruft/slatec-err/ixsav.f \
+  cruft/slatec-err/j4save.f \
+  cruft/slatec-err/xerclr.f \
+  cruft/slatec-err/xercnt.f \
+  cruft/slatec-err/xerhlt.f \
+  cruft/slatec-err/xermsg.f \
+  cruft/slatec-err/xerprn.f \
+  cruft/slatec-err/xerrwd.f \
+  cruft/slatec-err/xersve.f \
+  cruft/slatec-err/xgetf.f \
+  cruft/slatec-err/xgetua.f \
+  cruft/slatec-err/xsetf.f \
+  cruft/slatec-err/xsetua.f
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/cruft/slatec-fn/module.mk
--- a/liboctave/cruft/slatec-fn/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/cruft/slatec-fn/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -1,88 +1,88 @@
 EXTRA_DIST += \
-  slatec-fn/module.mk \
-  slatec-fn/derfc.in.f \
-  slatec-fn/erfc.in.f
+  cruft/slatec-fn/module.mk \
+  cruft/slatec-fn/derfc.in.f \
+  cruft/slatec-fn/erfc.in.f
 
-libcruft_la_SOURCES += \
-  slatec-fn/albeta.f \
-  slatec-fn/alngam.f \
-  slatec-fn/alnrel.f \
-  slatec-fn/algams.f \
-  slatec-fn/acosh.f \
-  slatec-fn/asinh.f \
-  slatec-fn/atanh.f \
-  slatec-fn/betai.f \
-  slatec-fn/csevl.f \
-  slatec-fn/d9gmit.f \
-  slatec-fn/d9lgic.f \
-  slatec-fn/d9lgit.f \
-  slatec-fn/d9lgmc.f \
-  slatec-fn/dacosh.f \
-  slatec-fn/dasinh.f \
-  slatec-fn/datanh.f \
-  slatec-fn/dbetai.f \
-  slatec-fn/dcsevl.f \
-  slatec-fn/derf.f \
-  slatec-fn/dgami.f \
-  slatec-fn/dgamit.f \
-  slatec-fn/dgamlm.f \
-  slatec-fn/dgamma.f \
-  slatec-fn/dgamr.f \
-  slatec-fn/dlbeta.f \
-  slatec-fn/dlgams.f \
-  slatec-fn/dlngam.f \
-  slatec-fn/dlnrel.f \
-  slatec-fn/dpchim.f \
-  slatec-fn/dpchst.f \
-  slatec-fn/erf.f \
-  slatec-fn/gami.f \
-  slatec-fn/gamit.f \
-  slatec-fn/gamlim.f \
-  slatec-fn/gamma.f \
-  slatec-fn/gamr.f \
-  slatec-fn/initds.f \
-  slatec-fn/inits.f \
-  slatec-fn/pchim.f \
-  slatec-fn/pchst.f \
-  slatec-fn/r9lgmc.f \
-  slatec-fn/r9lgit.f \
-  slatec-fn/r9gmit.f \
-  slatec-fn/r9lgic.f \
-  slatec-fn/xdacosh.f \
-  slatec-fn/xdasinh.f \
-  slatec-fn/xdatanh.f \
-  slatec-fn/xdbetai.f \
-  slatec-fn/xderf.f \
-  slatec-fn/xderfc.f \
-  slatec-fn/xdgami.f \
-  slatec-fn/xdgamit.f \
-  slatec-fn/xdgamma.f \
-  slatec-fn/xgmainc.f \
-  slatec-fn/xacosh.f \
-  slatec-fn/xasinh.f \
-  slatec-fn/xatanh.f \
-  slatec-fn/xerf.f \
-  slatec-fn/xerfc.f \
-  slatec-fn/xsgmainc.f \
-  slatec-fn/xgamma.f \
-  slatec-fn/xbetai.f
+CRUFT_SOURCES += \
+  cruft/slatec-fn/albeta.f \
+  cruft/slatec-fn/alngam.f \
+  cruft/slatec-fn/alnrel.f \
+  cruft/slatec-fn/algams.f \
+  cruft/slatec-fn/acosh.f \
+  cruft/slatec-fn/asinh.f \
+  cruft/slatec-fn/atanh.f \
+  cruft/slatec-fn/betai.f \
+  cruft/slatec-fn/csevl.f \
+  cruft/slatec-fn/d9gmit.f \
+  cruft/slatec-fn/d9lgic.f \
+  cruft/slatec-fn/d9lgit.f \
+  cruft/slatec-fn/d9lgmc.f \
+  cruft/slatec-fn/dacosh.f \
+  cruft/slatec-fn/dasinh.f \
+  cruft/slatec-fn/datanh.f \
+  cruft/slatec-fn/dbetai.f \
+  cruft/slatec-fn/dcsevl.f \
+  cruft/slatec-fn/derf.f \
+  cruft/slatec-fn/dgami.f \
+  cruft/slatec-fn/dgamit.f \
+  cruft/slatec-fn/dgamlm.f \
+  cruft/slatec-fn/dgamma.f \
+  cruft/slatec-fn/dgamr.f \
+  cruft/slatec-fn/dlbeta.f \
+  cruft/slatec-fn/dlgams.f \
+  cruft/slatec-fn/dlngam.f \
+  cruft/slatec-fn/dlnrel.f \
+  cruft/slatec-fn/dpchim.f \
+  cruft/slatec-fn/dpchst.f \
+  cruft/slatec-fn/erf.f \
+  cruft/slatec-fn/gami.f \
+  cruft/slatec-fn/gamit.f \
+  cruft/slatec-fn/gamlim.f \
+  cruft/slatec-fn/gamma.f \
+  cruft/slatec-fn/gamr.f \
+  cruft/slatec-fn/initds.f \
+  cruft/slatec-fn/inits.f \
+  cruft/slatec-fn/pchim.f \
+  cruft/slatec-fn/pchst.f \
+  cruft/slatec-fn/r9lgmc.f \
+  cruft/slatec-fn/r9lgit.f \
+  cruft/slatec-fn/r9gmit.f \
+  cruft/slatec-fn/r9lgic.f \
+  cruft/slatec-fn/xdacosh.f \
+  cruft/slatec-fn/xdasinh.f \
+  cruft/slatec-fn/xdatanh.f \
+  cruft/slatec-fn/xdbetai.f \
+  cruft/slatec-fn/xderf.f \
+  cruft/slatec-fn/xderfc.f \
+  cruft/slatec-fn/xdgami.f \
+  cruft/slatec-fn/xdgamit.f \
+  cruft/slatec-fn/xdgamma.f \
+  cruft/slatec-fn/xgmainc.f \
+  cruft/slatec-fn/xacosh.f \
+  cruft/slatec-fn/xasinh.f \
+  cruft/slatec-fn/xatanh.f \
+  cruft/slatec-fn/xerf.f \
+  cruft/slatec-fn/xerfc.f \
+  cruft/slatec-fn/xsgmainc.f \
+  cruft/slatec-fn/xgamma.f \
+  cruft/slatec-fn/xbetai.f
 
-nodist_libcruft_la_SOURCES += \
-  slatec-fn/derfc.f \
-  slatec-fn/erfc.f
+nodist_cruft_libcruft_la_SOURCES += \
+  cruft/slatec-fn/derfc.f \
+  cruft/slatec-fn/erfc.f
 
 ## slatec-fn directory may not exist in VPATH build; create it if necessary.
 
-slatec-fn/erfc.f: slatec-fn/erfc.in.f Makefile
-	@-if ! test -d slatec-fn; then \
-		mkdir slatec-fn ; \
+cruft/slatec-fn/erfc.f: cruft/slatec-fn/erfc.in.f Makefile
+	@-if ! test -d cruft/slatec-fn; then \
+		mkdir cruft/slatec-fn ; \
 	fi
 	$(SED) -e "${F77_ISNAN_MACRO}" < $< > $@-t
 	mv $@-t $@
 
-slatec-fn/derfc.f: slatec-fn/derfc.in.f Makefile
-	@-if ! test -d slatec-fn; then \
-		mkdir slatec-fn ; \
+cruft/slatec-fn/derfc.f: cruft/slatec-fn/derfc.in.f Makefile
+	@-if ! test -d cruft/slatec-fn; then \
+		mkdir cruft/slatec-fn ; \
 	fi
 	$(SED) -e "${F77_ISNAN_MACRO}" < $< > $@-t
 	mv $@-t $@
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/numeric/module.mk
--- a/liboctave/numeric/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/numeric/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -185,3 +185,4 @@
   $(FFTW_XCPPFLAGS) \
   $(SPARSE_XCPPFLAGS)
 
+liboctave_la_LIBADD += numeric/libnumeric.la
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/operators/module.mk
--- a/liboctave/operators/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/operators/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -67,3 +67,4 @@
 
 DISTCLEANFILES += $(BUILT_LIBOPERATORS_SOURCES)
 
+liboctave_la_LIBADD += operators/liboperators.la
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/system/module.mk
--- a/liboctave/system/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/system/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -36,3 +36,4 @@
 system_libsystem_la_SOURCES = $(SYSTEM_SRC)
 system_libsystem_la_CPPFLAGS = $(liboctave_la_CPPFLAGS)
 
+liboctave_la_LIBADD += system/libsystem.la
diff -r c8f03ccdc9ee -r 3087dc835497 liboctave/util/module.mk
--- a/liboctave/util/module.mk	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/util/module.mk	Sun Sep 21 10:51:38 2014 -0400
@@ -91,3 +91,4 @@
   $(PCRE_CPPFLAGS) \
   $(SPARSE_XCPPFLAGS)
 
+liboctave_la_LIBADD += util/libutil.la