Mercurial > hg > octave-terminal
changeset 15271:648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
* array/Array-C.cc, array/Array-b.cc, array/Array-ch.cc, array/Array-d.cc,
array/Array-f.cc, array/Array-fC.cc, array/Array-i.cc, array/Array-idx-vec.cc,
array/Array-s.cc, array/Array-str.cc, array/Array-util.cc, array/Array-util.h,
array/Array-voidp.cc, array/Array.cc, array/Array.h, array/Array2.h,
array/Array3.h, array/ArrayN.h, array/CColVector.cc, array/CColVector.h,
array/CDiagMatrix.cc, array/CDiagMatrix.h, array/CMatrix.cc, array/CMatrix.h,
array/CNDArray.cc, array/CNDArray.h, array/CRowVector.cc, array/CRowVector.h,
array/CSparse.cc, array/CSparse.h, array/DiagArray2.cc, array/DiagArray2.h,
array/MArray-C.cc, array/MArray-d.cc, array/MArray-decl.h, array/MArray-defs.h,
array/MArray-f.cc, array/MArray-fC.cc, array/MArray-i.cc, array/MArray-s.cc,
array/MArray.cc, array/MArray.h, array/MArray2.h, array/MArrayN.h,
array/MDiagArray2.cc, array/MDiagArray2.h, array/MSparse-C.cc,
array/MSparse-d.cc, array/MSparse-defs.h, array/MSparse.cc, array/MSparse.h,
array/Matrix.h, array/MatrixType.cc, array/MatrixType.h, array/PermMatrix.cc,
array/PermMatrix.h, array/Range.cc, array/Range.h, array/Sparse-C.cc,
array/Sparse-b.cc, array/Sparse-d.cc, array/Sparse.cc, array/Sparse.h,
array/boolMatrix.cc, array/boolMatrix.h, array/boolNDArray.cc,
array/boolNDArray.h, array/boolSparse.cc, array/boolSparse.h,
array/chMatrix.cc, array/chMatrix.h, array/chNDArray.cc, array/chNDArray.h,
array/dColVector.cc, array/dColVector.h, array/dDiagMatrix.cc,
array/dDiagMatrix.h, array/dMatrix.cc, array/dMatrix.h, array/dNDArray.cc,
array/dNDArray.h, array/dRowVector.cc, array/dRowVector.h, array/dSparse.cc,
array/dSparse.h, array/dim-vector.cc, array/dim-vector.h, array/fCColVector.cc,
array/fCColVector.h, array/fCDiagMatrix.cc, array/fCDiagMatrix.h,
array/fCMatrix.cc, array/fCMatrix.h, array/fCNDArray.cc, array/fCNDArray.h,
array/fCRowVector.cc, array/fCRowVector.h, array/fColVector.cc,
array/fColVector.h, array/fDiagMatrix.cc, array/fDiagMatrix.h,
array/fMatrix.cc, array/fMatrix.h, array/fNDArray.cc, array/fNDArray.h,
array/fRowVector.cc, array/fRowVector.h, array/idx-vector.cc,
array/idx-vector.h, array/int16NDArray.cc, array/int16NDArray.h,
array/int32NDArray.cc, array/int32NDArray.h, array/int64NDArray.cc,
array/int64NDArray.h, array/int8NDArray.cc, array/int8NDArray.h,
array/intNDArray.cc, array/intNDArray.h, array/module.mk,
array/uint16NDArray.cc, array/uint16NDArray.h, array/uint32NDArray.cc,
array/uint32NDArray.h, array/uint64NDArray.cc, array/uint64NDArray.h,
array/uint8NDArray.cc, array/uint8NDArray.h:
Moved from liboctave dir to array subdirectory.
* cruft/Makefile.am, cruft/amos/README, cruft/amos/cacai.f, cruft/amos/cacon.f,
cruft/amos/cairy.f, cruft/amos/casyi.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/cbiry.f, cruft/amos/cbknu.f, cruft/amos/cbuni.f, cruft/amos/cbunk.f,
cruft/amos/ckscl.f, cruft/amos/cmlri.f, cruft/amos/crati.f, cruft/amos/cs1s2.f,
cruft/amos/cseri.f, cruft/amos/cshch.f, cruft/amos/cuchk.f, cruft/amos/cunhj.f,
cruft/amos/cuni1.f, cruft/amos/cuni2.f, cruft/amos/cunik.f, cruft/amos/cunk1.f,
cruft/amos/cunk2.f, cruft/amos/cuoik.f, cruft/amos/cwrsk.f,
cruft/amos/dgamln.f, cruft/amos/gamln.f, cruft/amos/module.mk,
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, cruft/blas-xtra/cconv2.f, cruft/blas-xtra/cdotc3.f,
cruft/blas-xtra/cmatm3.f, cruft/blas-xtra/csconv2.f, cruft/blas-xtra/dconv2.f,
cruft/blas-xtra/ddot3.f, cruft/blas-xtra/dmatm3.f, cruft/blas-xtra/module.mk,
cruft/blas-xtra/sconv2.f, cruft/blas-xtra/sdot3.f, cruft/blas-xtra/smatm3.f,
cruft/blas-xtra/xcdotc.f, cruft/blas-xtra/xcdotu.f, cruft/blas-xtra/xddot.f,
cruft/blas-xtra/xdnrm2.f, cruft/blas-xtra/xdznrm2.f, cruft/blas-xtra/xerbla.f,
cruft/blas-xtra/xscnrm2.f, cruft/blas-xtra/xsdot.f, cruft/blas-xtra/xsnrm2.f,
cruft/blas-xtra/xzdotc.f, cruft/blas-xtra/xzdotu.f, cruft/blas-xtra/zconv2.f,
cruft/blas-xtra/zdconv2.f, cruft/blas-xtra/zdotc3.f, cruft/blas-xtra/zmatm3.f,
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, cruft/daspk/module.mk, cruft/dasrt/ddasrt.f,
cruft/dasrt/drchek.f, cruft/dasrt/droots.f, cruft/dasrt/module.mk,
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, cruft/dassl/module.mk,
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/fftpack.doc, cruft/fftpack/module.mk, 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, cruft/lapack-xtra/crsf2csf.f,
cruft/lapack-xtra/module.mk, 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/link-deps.mk, cruft/misc/blaswrap.c,
cruft/misc/cquit.c, cruft/misc/d1mach-tst.for, cruft/misc/d1mach.f,
cruft/misc/f77-extern.cc, cruft/misc/f77-fcn.c, cruft/misc/f77-fcn.h,
cruft/misc/i1mach.f, cruft/misc/lo-error.c, cruft/misc/lo-error.h,
cruft/misc/module.mk, cruft/misc/quit.cc, cruft/misc/quit.h,
cruft/misc/r1mach.f, cruft/mkf77def.in, cruft/odepack/cfode.f,
cruft/odepack/dlsode.f, cruft/odepack/ewset.f, cruft/odepack/intdy.f,
cruft/odepack/module.mk, cruft/odepack/prepj.f, cruft/odepack/scfode.f,
cruft/odepack/sewset.f, cruft/odepack/sintdy.f, cruft/odepack/slsode.f,
cruft/odepack/solsy.f, cruft/odepack/sprepj.f, cruft/odepack/ssolsy.f,
cruft/odepack/sstode.f, cruft/odepack/stode.f, cruft/odepack/svnorm.f,
cruft/odepack/vnorm.f, cruft/ordered-qz/README, cruft/ordered-qz/dsubsp.f,
cruft/ordered-qz/exchqz.f, cruft/ordered-qz/module.mk,
cruft/ordered-qz/sexchqz.f, cruft/ordered-qz/ssubsp.f, 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/module.mk, cruft/quadpack/qagi.f,
cruft/quadpack/qagie.f, cruft/quadpack/qagp.f, cruft/quadpack/qagpe.f,
cruft/quadpack/qelg.f, cruft/quadpack/qk15i.f, cruft/quadpack/qk21.f,
cruft/quadpack/qpsrt.f, cruft/quadpack/xerror.f, cruft/ranlib/Basegen.doc,
cruft/ranlib/HOWTOGET, cruft/ranlib/README, 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/module.mk,
cruft/ranlib/phrtsd.f, cruft/ranlib/qrgnin.f, cruft/ranlib/randlib.chs,
cruft/ranlib/randlib.fdoc, 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/tstbot.for, cruft/ranlib/tstgmn.for, cruft/ranlib/tstmid.for,
cruft/ranlib/wrap.f, cruft/slatec-err/fdump.f, cruft/slatec-err/ixsav.f,
cruft/slatec-err/j4save.f, cruft/slatec-err/module.mk,
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, cruft/slatec-fn/acosh.f,
cruft/slatec-fn/albeta.f, cruft/slatec-fn/algams.f, cruft/slatec-fn/alngam.f,
cruft/slatec-fn/alnrel.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/derfc.in.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/erfc.in.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/module.mk, cruft/slatec-fn/pchim.f, cruft/slatec-fn/pchst.f,
cruft/slatec-fn/r9gmit.f, cruft/slatec-fn/r9lgic.f, cruft/slatec-fn/r9lgit.f,
cruft/slatec-fn/r9lgmc.f, cruft/slatec-fn/xacosh.f, cruft/slatec-fn/xasinh.f,
cruft/slatec-fn/xatanh.f, cruft/slatec-fn/xbetai.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/xerf.f, cruft/slatec-fn/xerfc.f, cruft/slatec-fn/xgamma.f,
cruft/slatec-fn/xgmainc.f, cruft/slatec-fn/xsgmainc.f:
Moved from top-level libcruft to cruft directory below liboctave.
* numeric/CmplxAEPBAL.cc, numeric/CmplxAEPBAL.h, numeric/CmplxCHOL.cc,
numeric/CmplxCHOL.h, numeric/CmplxGEPBAL.cc, numeric/CmplxGEPBAL.h,
numeric/CmplxHESS.cc, numeric/CmplxHESS.h, numeric/CmplxLU.cc,
numeric/CmplxLU.h, numeric/CmplxQR.cc, numeric/CmplxQR.h, numeric/CmplxQRP.cc,
numeric/CmplxQRP.h, numeric/CmplxSCHUR.cc, numeric/CmplxSCHUR.h,
numeric/CmplxSVD.cc, numeric/CmplxSVD.h, numeric/CollocWt.cc,
numeric/CollocWt.h, numeric/DAE.h, numeric/DAEFunc.h, numeric/DAERT.h,
numeric/DAERTFunc.h, numeric/DASPK-opts.in, numeric/DASPK.cc, numeric/DASPK.h,
numeric/DASRT-opts.in, numeric/DASRT.cc, numeric/DASRT.h,
numeric/DASSL-opts.in, numeric/DASSL.cc, numeric/DASSL.h, numeric/DET.h,
numeric/EIG.cc, numeric/EIG.h, numeric/LSODE-opts.in, numeric/LSODE.cc,
numeric/LSODE.h, numeric/ODE.h, numeric/ODEFunc.h, numeric/ODES.cc,
numeric/ODES.h, numeric/ODESFunc.h, numeric/Quad-opts.in, numeric/Quad.cc,
numeric/Quad.h, numeric/SparseCmplxCHOL.cc, numeric/SparseCmplxCHOL.h,
numeric/SparseCmplxLU.cc, numeric/SparseCmplxLU.h, numeric/SparseCmplxQR.cc,
numeric/SparseCmplxQR.h, numeric/SparseQR.cc, numeric/SparseQR.h,
numeric/SparsedbleCHOL.cc, numeric/SparsedbleCHOL.h, numeric/SparsedbleLU.cc,
numeric/SparsedbleLU.h, numeric/base-aepbal.h, numeric/base-dae.h,
numeric/base-de.h, numeric/base-lu.cc, numeric/base-lu.h, numeric/base-min.h,
numeric/base-qr.cc, numeric/base-qr.h, numeric/bsxfun-decl.h,
numeric/bsxfun-defs.cc, numeric/bsxfun.h, numeric/dbleAEPBAL.cc,
numeric/dbleAEPBAL.h, numeric/dbleCHOL.cc, numeric/dbleCHOL.h,
numeric/dbleGEPBAL.cc, numeric/dbleGEPBAL.h, numeric/dbleHESS.cc,
numeric/dbleHESS.h, numeric/dbleLU.cc, numeric/dbleLU.h, numeric/dbleQR.cc,
numeric/dbleQR.h, numeric/dbleQRP.cc, numeric/dbleQRP.h, numeric/dbleSCHUR.cc,
numeric/dbleSCHUR.h, numeric/dbleSVD.cc, numeric/dbleSVD.h,
numeric/eigs-base.cc, numeric/fCmplxAEPBAL.cc, numeric/fCmplxAEPBAL.h,
numeric/fCmplxCHOL.cc, numeric/fCmplxCHOL.h, numeric/fCmplxGEPBAL.cc,
numeric/fCmplxGEPBAL.h, numeric/fCmplxHESS.cc, numeric/fCmplxHESS.h,
numeric/fCmplxLU.cc, numeric/fCmplxLU.h, numeric/fCmplxQR.cc,
numeric/fCmplxQR.h, numeric/fCmplxQRP.cc, numeric/fCmplxQRP.h,
numeric/fCmplxSCHUR.cc, numeric/fCmplxSCHUR.h, numeric/fCmplxSVD.cc,
numeric/fCmplxSVD.h, numeric/fEIG.cc, numeric/fEIG.h, numeric/floatAEPBAL.cc,
numeric/floatAEPBAL.h, numeric/floatCHOL.cc, numeric/floatCHOL.h,
numeric/floatGEPBAL.cc, numeric/floatGEPBAL.h, numeric/floatHESS.cc,
numeric/floatHESS.h, numeric/floatLU.cc, numeric/floatLU.h, numeric/floatQR.cc,
numeric/floatQR.h, numeric/floatQRP.cc, numeric/floatQRP.h,
numeric/floatSCHUR.cc, numeric/floatSCHUR.h, numeric/floatSVD.cc,
numeric/floatSVD.h, numeric/lo-mappers.cc, numeric/lo-mappers.h,
numeric/lo-specfun.cc, numeric/lo-specfun.h, numeric/module.mk,
numeric/oct-convn.cc, numeric/oct-convn.h, numeric/oct-fftw.cc,
numeric/oct-fftw.h, numeric/oct-norm.cc, numeric/oct-norm.h,
numeric/oct-rand.cc, numeric/oct-rand.h, numeric/oct-spparms.cc,
numeric/oct-spparms.h, numeric/randgamma.c, numeric/randgamma.h,
numeric/randmtzig.c, numeric/randmtzig.h, numeric/randpoisson.c,
numeric/randpoisson.h, numeric/sparse-base-chol.cc, numeric/sparse-base-chol.h,
numeric/sparse-base-lu.cc, numeric/sparse-base-lu.h, numeric/sparse-dmsolve.cc:
Moved from liboctave dir to numeric subdirectory.
* operators/Sparse-diag-op-defs.h, operators/Sparse-op-defs.h,
operators/Sparse-perm-op-defs.h, operators/config-ops.sh, operators/mk-ops.awk,
operators/module.mk, operators/mx-base.h, operators/mx-defs.h,
operators/mx-ext.h, operators/mx-inlines.cc, operators/mx-op-decl.h,
operators/mx-op-defs.h, operators/mx-ops, operators/sparse-mk-ops.awk,
operators/sparse-mx-ops, operators/vx-ops:
Moved from liboctave dir to operators subdirectory.
* system/dir-ops.cc, system/dir-ops.h, system/file-ops.cc, system/file-ops.h,
system/file-stat.cc, system/file-stat.h, system/lo-sysdep.cc,
system/lo-sysdep.h, system/mach-info.cc, system/mach-info.h, system/module.mk,
system/oct-env.cc, system/oct-env.h, system/oct-group.cc, system/oct-group.h,
system/oct-openmp.h, system/oct-passwd.cc, system/oct-passwd.h,
system/oct-syscalls.cc, system/oct-syscalls.h, system/oct-time.cc,
system/oct-time.h, system/oct-uname.cc, system/oct-uname.h, system/pathlen.h,
system/sysdir.h, system/syswait.h, system/tempnam.c, system/tempname.c:
Moved from liboctave dir to system subdirectory.
* util/base-list.h, util/byte-swap.h, util/caseless-str.h, util/cmd-edit.cc,
util/cmd-edit.h, util/cmd-hist.cc, util/cmd-hist.h, util/data-conv.cc,
util/data-conv.h, util/f2c-main.c, util/functor.h, util/glob-match.cc,
util/glob-match.h, util/kpse.cc, util/lo-array-gripes.cc,
util/lo-array-gripes.h, util/lo-cieee.c, util/lo-cutils.c, util/lo-cutils.h,
util/lo-ieee.cc, util/lo-ieee.h, util/lo-macros.h, util/lo-math.h,
util/lo-traits.h, util/lo-utils.cc, util/lo-utils.h, util/module.mk,
util/oct-alloc.cc, util/oct-alloc.h, util/oct-base64.cc, util/oct-base64.h,
util/oct-binmap.h, util/oct-cmplx.h, util/oct-glob.cc, util/oct-glob.h,
util/oct-inttypes.cc, util/oct-inttypes.h, util/oct-locbuf.cc,
util/oct-locbuf.h, util/oct-md5.cc, util/oct-md5.h, util/oct-mem.h,
util/oct-mutex.cc, util/oct-mutex.h, util/oct-refcount.h, util/oct-rl-edit.c,
util/oct-rl-edit.h, util/oct-rl-hist.c, util/oct-rl-hist.h, util/oct-shlib.cc,
util/oct-shlib.h, util/oct-sort.cc, util/oct-sort.h, util/oct-sparse.h,
util/pathsearch.cc, util/pathsearch.h, util/regexp.cc, util/regexp.h,
util/singleton-cleanup.cc, util/singleton-cleanup.h, util/sparse-sort.cc,
util/sparse-sort.h, util/sparse-util.cc, util/sparse-util.h, util/statdefs.h,
util/str-vec.cc, util/str-vec.h, util/sun-utils.h:
Moved from liboctave dir to util subdirectory.
* Makefile.am: Eliminate reference to top-level liboctave directory.
* autogen.sh: cd to new liboctave/operators directory to run config-ops.sh.
* build-aux/common.mk: Eliminate LIBCRUFT references.
* configure.ac: Eliminate libcruft top-level references. Switch test
programs to find files in liboctave/cruft subdirectory.
* OctaveFAQ.texi, install.txi, mkoctfile.1: Eliminate references to libcruft in
docs.
* libgui/src/Makefile.am, libinterp/Makefile.am, src/Makefile.am: Update
include file locations. Stop linking against libcruft.
* libinterp/corefcn/module.mk: Update location of OPT_INC files which are
now in numeric/ subdirectory.
* libinterp/dldfcn/config-module.awk: Stop linking against libcruft.
* libinterp/interpfcn/toplev.cc: Remove reference to LIBCRUFT.
* libinterp/link-deps.mk, liboctave/link-deps.mk:
Add GNULIB_LINK_DEPS to link dependencies.
* libinterp/oct-conf.in.h: Remove reference to OCTAVE_CONF_LIBCRUFT.
* liboctave/Makefile.am: Overhaul to use convenience libraries in
subdirectories.
* scripts/miscellaneous/mkoctfile.m: Eliminate reference to LIBCRUFT.
* src/mkoctfile.in.cc, src/mkoctfile.in.sh: Stop linking againt libcruft.
Eliminate references to LIBCRUFT.
line wrap: on
line diff
--- 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) -
new file mode 100644 --- /dev/null +++ b/liboctave/array/module.mk @@ -0,0 +1,143 @@ +EXTRA_DIST += \ + array/module.mk + +ARRAY_INC = \ + array/Array2.h \ + array/Array3.h \ + array/Array.h \ + array/ArrayN.h \ + array/Array-util.h \ + array/boolMatrix.h \ + array/boolNDArray.h \ + array/boolSparse.h \ + array/CColVector.h \ + array/CDiagMatrix.h \ + array/chMatrix.h \ + array/chNDArray.h \ + array/CMatrix.h \ + array/CNDArray.h \ + array/CRowVector.h \ + array/CSparse.h \ + array/dColVector.h \ + array/dDiagMatrix.h \ + array/DiagArray2.h \ + array/dim-vector.h \ + array/dMatrix.h \ + array/dNDArray.h \ + array/dRowVector.h \ + array/dSparse.h \ + array/fCColVector.h \ + array/fCDiagMatrix.h \ + array/fCMatrix.h \ + array/fCNDArray.h \ + array/fColVector.h \ + array/fCRowVector.h \ + array/fDiagMatrix.h \ + array/fMatrix.h \ + array/fNDArray.h \ + array/fRowVector.h \ + array/idx-vector.h \ + array/int16NDArray.h \ + array/int32NDArray.h \ + array/int64NDArray.h \ + array/int8NDArray.h \ + array/intNDArray.h \ + array/MArray2.h \ + array/MArray-decl.h \ + array/MArray-defs.h \ + array/MArray.h \ + array/MArrayN.h \ + array/Matrix.h \ + array/MatrixType.h \ + array/MDiagArray2.h \ + array/MSparse-defs.h \ + array/MSparse.h \ + array/PermMatrix.h \ + array/Range.h \ + array/Sparse.h \ + array/uint16NDArray.h \ + array/uint32NDArray.h \ + array/uint64NDArray.h \ + array/uint8NDArray.h + +ARRAY_SRC = \ + array/Array-b.cc \ + array/Array-C.cc \ + array/Array-ch.cc \ + array/Array-d.cc \ + array/Array-f.cc \ + array/Array-fC.cc \ + array/Array-i.cc \ + array/Array-idx-vec.cc \ + array/Array-s.cc \ + array/Array-str.cc \ + array/Array-util.cc \ + array/Array-voidp.cc \ + array/boolMatrix.cc \ + array/boolNDArray.cc \ + array/boolSparse.cc \ + array/CColVector.cc \ + array/CDiagMatrix.cc \ + array/chMatrix.cc \ + array/chNDArray.cc \ + array/CMatrix.cc \ + array/CNDArray.cc \ + array/CRowVector.cc \ + array/CSparse.cc \ + array/dColVector.cc \ + array/dDiagMatrix.cc \ + array/dim-vector.cc \ + array/dMatrix.cc \ + array/dNDArray.cc \ + array/dRowVector.cc \ + array/dSparse.cc \ + array/fCColVector.cc \ + array/fCDiagMatrix.cc \ + array/fCMatrix.cc \ + array/fCNDArray.cc \ + array/fColVector.cc \ + array/fCRowVector.cc \ + array/fDiagMatrix.cc \ + array/fMatrix.cc \ + array/fNDArray.cc \ + array/fRowVector.cc \ + array/idx-vector.cc \ + array/int16NDArray.cc \ + array/int32NDArray.cc \ + array/int64NDArray.cc \ + array/int8NDArray.cc \ + array/MArray-C.cc \ + array/MArray-d.cc \ + array/MArray-f.cc \ + array/MArray-fC.cc \ + array/MArray-i.cc \ + array/MArray-s.cc \ + array/MatrixType.cc \ + array/MSparse.cc \ + array/MSparse-C.cc \ + array/MSparse-d.cc \ + array/PermMatrix.cc \ + array/Range.cc \ + array/Sparse-b.cc \ + array/Sparse.cc \ + array/Sparse-C.cc \ + array/Sparse-d.cc \ + array/uint16NDArray.cc \ + array/uint32NDArray.cc \ + array/uint64NDArray.cc \ + array/uint8NDArray.cc + +TEMPLATE_SRC += \ + array/Array.cc \ + array/DiagArray2.cc \ + array/MArray.cc \ + array/MDiagArray2.cc + +OTHER_INC += \ + array/intNDArray.cc + +noinst_LTLIBRARIES += array/libarray.la + +array_libarray_la_SOURCES = $(ARRAY_SRC) +array_libarray_la_CPPFLAGS = $(liboctave_la_CPPFLAGS) +
rename from libcruft/Makefile.am rename to liboctave/cruft/Makefile.am --- a/libcruft/Makefile.am +++ b/liboctave/cruft/Makefile.am @@ -1,4 +1,4 @@ -# Makefile for Octave's libcruft directory +# Makefile for Octave's liboctave/cruft directory # # Copyright (C) 1993-2012 John W. Eaton # @@ -45,8 +45,7 @@ $(top_builddir)/libgnu/libgnu.la \ $(LIBCRUFT_LINK_DEPS) -# Increment these as needed and according to the rules in the libtool -# manual: +# Increment these as needed and according to the rules in the libtool manual: libcruft_current = 1 libcruft_revision = 0 libcruft_age = 0
rename from libcruft/link-deps.mk rename to liboctave/cruft/link-deps.mk --- a/libcruft/link-deps.mk +++ b/liboctave/cruft/link-deps.mk @@ -1,30 +1,23 @@ -## The following libraries may be needed to satisfy gnulib dependencies: -## -## $(COPYSIGN_LIBM) -## $(FLOOR_LIBM) -## $(GETHOSTNAME_LIB) -## $(LIBSOCKET) -## $(LIB_NANOSLEEP) -## $(LTLIBINTL) -## $(ROUNDF_LIBM) -## $(ROUND_LIBM) -## $(TRUNCF_LIBM) -## $(TRUNC_LIBM) +GNULIB_LINK_DEPS = \ + $(COPYSIGNF_LIBM)\ + $(COPYSIGN_LIBM)\ + $(FLOOR_LIBM)\ + $(GETHOSTNAME_LIB)\ + $(LIBSOCKET)\ + $(LIB_NANOSLEEP)\ + $(LIB_SELECT)\ + $(LTLIBINTL)\ + $(ROUNDF_LIBM)\ + $(ROUND_LIBM)\ + $(TRUNCF_LIBM)\ + $(TRUNC_LIBM) LIBCRUFT_LINK_DEPS = \ - $(COPYSIGN_LIBM) \ - $(FLOOR_LIBM) \ - $(GETHOSTNAME_LIB) \ - $(LIBSOCKET) \ - $(LIB_NANOSLEEP) \ - $(LTLIBINTL) \ - $(ROUNDF_LIBM) \ - $(ROUND_LIBM) \ - $(TRUNCF_LIBM) \ - $(TRUNC_LIBM) \ + $(GNULIB_LINK_DEPS) \ $(LAPACK_LIBS) \ $(BLAS_LIBS) \ $(FLIBS) \ $(LIBS) LIBCRUFT_LINK_OPTS = +
--- a/liboctave/link-deps.mk +++ b/liboctave/link-deps.mk @@ -1,6 +1,7 @@ -include $(top_srcdir)/libcruft/link-deps.mk +include $(top_srcdir)/liboctave/cruft/link-deps.mk LIBOCTAVE_LINK_DEPS = \ + $(GNULIB_LINK_DEPS) \ $(SPARSE_XLIBS) \ $(ARPACK_LIBS) \ $(QRUPDATE_LIBS) \
new file mode 100644 --- /dev/null +++ b/liboctave/numeric/module.mk @@ -0,0 +1,180 @@ +EXTRA_DIST += \ + numeric/module.mk \ + $(OPT_IN) + +OPT_INC = \ + numeric/DASPK-opts.h \ + numeric/DASRT-opts.h \ + numeric/DASSL-opts.h \ + numeric/LSODE-opts.h \ + numeric/Quad-opts.h + +OPT_IN = $(OPT_INC:.h=.in) + +NUMERIC_INC = \ + numeric/base-aepbal.h \ + numeric/base-dae.h \ + numeric/base-de.h \ + numeric/base-lu.h \ + numeric/base-min.h \ + numeric/base-qr.h \ + numeric/bsxfun-decl.h \ + numeric/bsxfun.h \ + numeric/CmplxAEPBAL.h \ + numeric/CmplxCHOL.h \ + numeric/CmplxGEPBAL.h \ + numeric/CmplxHESS.h \ + numeric/CmplxLU.h \ + numeric/CmplxQR.h \ + numeric/CmplxQRP.h \ + numeric/CmplxSCHUR.h \ + numeric/CmplxSVD.h \ + numeric/CollocWt.h \ + numeric/DAEFunc.h \ + numeric/DAE.h \ + numeric/DAERTFunc.h \ + numeric/DAERT.h \ + numeric/DASPK.h \ + numeric/DASRT.h \ + numeric/DASSL.h \ + numeric/dbleAEPBAL.h \ + numeric/dbleCHOL.h \ + numeric/dbleGEPBAL.h \ + numeric/dbleHESS.h \ + numeric/dbleLU.h \ + numeric/dbleQR.h \ + numeric/dbleQRP.h \ + numeric/dbleSCHUR.h \ + numeric/dbleSVD.h \ + numeric/DET.h \ + numeric/EIG.h \ + numeric/fCmplxAEPBAL.h \ + numeric/fCmplxCHOL.h \ + numeric/fCmplxGEPBAL.h \ + numeric/fCmplxHESS.h \ + numeric/fCmplxLU.h \ + numeric/fCmplxQR.h \ + numeric/fCmplxQRP.h \ + numeric/fCmplxSCHUR.h \ + numeric/fCmplxSVD.h \ + numeric/fEIG.h \ + numeric/floatAEPBAL.h \ + numeric/floatCHOL.h \ + numeric/floatGEPBAL.h \ + numeric/floatHESS.h \ + numeric/floatLU.h \ + numeric/floatQR.h \ + numeric/floatQRP.h \ + numeric/floatSCHUR.h \ + numeric/floatSVD.h \ + numeric/lo-mappers.h \ + numeric/lo-specfun.h \ + numeric/LSODE.h \ + numeric/oct-convn.h \ + numeric/oct-fftw.h \ + numeric/oct-norm.h \ + numeric/oct-rand.h \ + numeric/oct-spparms.h \ + numeric/ODEFunc.h \ + numeric/ODE.h \ + numeric/ODESFunc.h \ + numeric/ODES.h \ + numeric/Quad.h \ + numeric/randgamma.h \ + numeric/randmtzig.h \ + numeric/randpoisson.h \ + numeric/sparse-base-chol.h \ + numeric/sparse-base-lu.h \ + numeric/SparseCmplxCHOL.h \ + numeric/SparseCmplxLU.h \ + numeric/SparseCmplxQR.h \ + numeric/SparsedbleCHOL.h \ + numeric/SparsedbleLU.h \ + numeric/SparseQR.h + +NUMERIC_C_SRC = \ + numeric/randgamma.c \ + numeric/randmtzig.c \ + numeric/randpoisson.c + +NUMERIC_SRC = \ + numeric/CmplxAEPBAL.cc \ + numeric/CmplxCHOL.cc \ + numeric/CmplxGEPBAL.cc \ + numeric/CmplxHESS.cc \ + numeric/CmplxLU.cc \ + numeric/CmplxQR.cc \ + numeric/CmplxQRP.cc \ + numeric/CmplxSCHUR.cc \ + numeric/CmplxSVD.cc \ + numeric/CollocWt.cc \ + numeric/DASPK.cc \ + numeric/DASRT.cc \ + numeric/DASSL.cc \ + numeric/dbleAEPBAL.cc \ + numeric/dbleCHOL.cc \ + numeric/dbleGEPBAL.cc \ + numeric/dbleHESS.cc \ + numeric/dbleLU.cc \ + numeric/dbleQR.cc \ + numeric/dbleQRP.cc \ + numeric/dbleSCHUR.cc \ + numeric/dbleSVD.cc \ + numeric/EIG.cc \ + numeric/fCmplxAEPBAL.cc \ + numeric/fCmplxCHOL.cc \ + numeric/fCmplxGEPBAL.cc \ + numeric/fCmplxHESS.cc \ + numeric/fCmplxLU.cc \ + numeric/fCmplxQR.cc \ + numeric/fCmplxQRP.cc \ + numeric/fCmplxSCHUR.cc \ + numeric/fCmplxSVD.cc \ + numeric/fEIG.cc \ + numeric/floatAEPBAL.cc \ + numeric/floatCHOL.cc \ + numeric/floatGEPBAL.cc \ + numeric/floatHESS.cc \ + numeric/floatLU.cc \ + numeric/floatQR.cc \ + numeric/floatQRP.cc \ + numeric/floatSCHUR.cc \ + numeric/floatSVD.cc \ + numeric/lo-mappers.cc \ + numeric/lo-specfun.cc \ + numeric/LSODE.cc \ + numeric/oct-convn.cc \ + numeric/oct-fftw.cc \ + numeric/oct-norm.cc \ + numeric/oct-rand.cc \ + numeric/oct-spparms.cc \ + numeric/ODES.cc \ + numeric/Quad.cc \ + numeric/SparseCmplxCHOL.cc \ + numeric/SparseCmplxLU.cc \ + numeric/SparseCmplxQR.cc \ + numeric/SparsedbleCHOL.cc \ + numeric/SparsedbleLU.cc \ + numeric/SparseQR.cc \ + $(NUMERIC_C_SRC) + +TEMPLATE_SRC += \ + numeric/base-lu.cc \ + numeric/base-qr.cc \ + numeric/bsxfun-defs.cc \ + numeric/eigs-base.cc \ + numeric/sparse-base-chol.cc \ + numeric/sparse-base-lu.cc \ + numeric/sparse-dmsolve.cc + +## Special rules for sources which must be built before rest of compilation. +$(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 $@ + +noinst_LTLIBRARIES += numeric/libnumeric.la + +numeric_libnumeric_la_SOURCES = $(NUMERIC_SRC) +numeric_libnumeric_la_CPPFLAGS = $(liboctave_la_CPPFLAGS) +
rename from liboctave/config-ops.sh rename to liboctave/operators/config-ops.sh --- a/liboctave/config-ops.sh +++ b/liboctave/operators/config-ops.sh @@ -17,14 +17,14 @@ fi if [ $# -lt 1 ]; then - top_srcdir=".." + top_srcdir="../.." else top_srcdir="$1" fi move_if_change="$top_srcdir/build-aux/move-if-change" -liboctave_dir="$top_srcdir/liboctave" +liboctave_dir="$top_srcdir/liboctave/operators" mk_ops="$liboctave_dir/mk-ops.awk" sparse_mk_ops="$liboctave_dir/sparse-mk-ops.awk"
rename from liboctave/mk-ops.awk rename to liboctave/operators/mk-ops.awk --- a/liboctave/mk-ops.awk +++ b/liboctave/operators/mk-ops.awk @@ -93,13 +93,13 @@ if (list_cc_files) { - printf (" %s", cc_file); + printf (" operators/%s", cc_file); next; } if (list_h_files) { - printf (" %s", h_file); + printf (" operators/%s", h_file); next; }
new file mode 100644 --- /dev/null +++ b/liboctave/operators/module.mk @@ -0,0 +1,69 @@ +EXTRA_DIST += \ + operators/module.mk \ + operators/config-ops.sh \ + operators/mk-ops.awk \ + operators/mx-op-inc.mk \ + operators/mx-op-src.mk \ + operators/mx-ops \ + operators/smx-op-inc.mk \ + operators/smx-op-src.mk \ + operators/sparse-mk-ops.awk \ + operators/sparse-mx-ops \ + operators/vx-op-inc.mk \ + operators/vx-op-src.mk \ + operators/vx-ops + +include operators/vx-op-inc.mk +include operators/mx-op-inc.mk +include operators/smx-op-inc.mk + +include operators/vx-op-src.mk +include operators/mx-op-src.mk +include operators/smx-op-src.mk + +BUILT_LIBOPERATORS_SOURCES = \ + $(MX_OP_SRC) \ + $(VX_OP_SRC) \ + $(SMX_OP_SRC) + +OPERATORS_INC = \ + operators/mx-base.h \ + operators/mx-defs.h \ + operators/mx-ext.h \ + operators/mx-op-decl.h \ + operators/mx-op-defs.h \ + operators/Sparse-diag-op-defs.h \ + operators/Sparse-op-defs.h \ + operators/Sparse-perm-op-defs.h + +## There are no distributed source files in this directory +OPERATORS_SRC = + +OTHER_INC += \ + operators/mx-inlines.cc + +OP_SRCDIR = $(srcdir)/operators + +## Special rules for sources which must be built before rest of compilation. +$(VX_OP_INC) $(VX_OP_SRC) : $(OP_SRCDIR)/mk-ops.awk operators/vx-ops + (cd operators; $(AWK) -f ../$(OP_SRCDIR)/mk-ops.awk prefix=vx ../$(OP_SRCDIR)/vx-ops) + +$(MX_OP_INC) $(MX_OP_SRC) : $(OP_SRCDIR)/mk-ops.awk operators/mx-ops + (cd operators; $(AWK) -f ../$(OP_SRCDIR)/mk-ops.awk prefix=mx ../$(OP_SRCDIR)/mx-ops) + +$(SMX_OP_INC) $(SMX_OP_SRC) : $(OP_SRCDIR)/sparse-mk-ops.awk operators/sparse-mx-ops + (cd operators; $(AWK) -f ../$(OP_SRCDIR)/sparse-mk-ops.awk prefix=smx ../$(OP_SRCDIR)/sparse-mx-ops) + +operators/mx-ops.h : $(OP_SRCDIR)/mk-ops.awk operators/mx-ops + $(AWK) -f $(OP_SRCDIR)/mk-ops.awk prefix=mx make_inclusive_header=mx-ops.h $(OP_SRCDIR)/mx-ops > $@-t + mv $@-t $@ + +noinst_LTLIBRARIES += operators/liboperators.la + +operators_liboperators_la_SOURCES = $(OPERATORS_SRC) +nodist_operators_liboperators_la_SOURCES = $(BUILT_LIBOPERATORS_SOURCES) + +operators_liboperators_la_CPPFLAGS = $(liboctave_la_CPPFLAGS) + +DISTCLEANFILES += $(BUILT_LIBOPERATORS_SOURCES) +
rename from liboctave/sparse-mk-ops.awk rename to liboctave/operators/sparse-mk-ops.awk --- a/liboctave/sparse-mk-ops.awk +++ b/liboctave/operators/sparse-mk-ops.awk @@ -92,13 +92,13 @@ if (list_cc_files) { - printf (" %s", cc_file); + printf (" operators/%s", cc_file); next; } if (list_h_files) { - printf (" %s", h_file); + printf (" operators/%s", h_file); next; }
new file mode 100644 --- /dev/null +++ b/liboctave/system/module.mk @@ -0,0 +1,43 @@ +EXTRA_DIST += \ + system/module.mk + +SYSTEM_INC = \ + system/dir-ops.h \ + system/file-ops.h \ + system/file-stat.h \ + system/lo-sysdep.h \ + system/mach-info.h \ + system/oct-env.h \ + system/oct-group.h \ + system/oct-openmp.h \ + system/oct-passwd.h \ + system/oct-syscalls.h \ + system/oct-time.h \ + system/oct-uname.h \ + system/pathlen.h \ + system/sysdir.h \ + system/syswait.h + +SYSTEM_C_SRC = \ + system/tempnam.c \ + system/tempname.c + +SYSTEM_SRC = \ + system/dir-ops.cc \ + system/file-ops.cc \ + system/file-stat.cc \ + system/lo-sysdep.cc \ + system/mach-info.cc \ + system/oct-env.cc \ + system/oct-group.cc \ + system/oct-passwd.cc \ + system/oct-syscalls.cc \ + system/oct-time.cc \ + system/oct-uname.cc \ + $(SYSTEM_C_SRC) + +noinst_LTLIBRARIES += system/libsystem.la + +system_libsystem_la_SOURCES = $(SYSTEM_SRC) +system_libsystem_la_CPPFLAGS = $(liboctave_la_CPPFLAGS) +
new file mode 100644 --- /dev/null +++ b/liboctave/util/module.mk @@ -0,0 +1,88 @@ +EXTRA_DIST += \ + util/module.mk + +UTIL_INC = \ + util/base-list.h \ + util/byte-swap.h \ + util/caseless-str.h \ + util/cmd-edit.h \ + util/cmd-hist.h \ + util/data-conv.h \ + util/functor.h \ + util/glob-match.h \ + util/lo-array-gripes.h \ + util/lo-cutils.h \ + util/lo-ieee.h \ + util/lo-macros.h \ + util/lo-math.h \ + util/lo-traits.h \ + util/lo-utils.h \ + util/oct-alloc.h \ + util/oct-base64.h \ + util/oct-binmap.h \ + util/oct-cmplx.h \ + util/oct-glob.h \ + util/oct-inttypes.h \ + util/oct-locbuf.h \ + util/oct-md5.h \ + util/oct-mem.h \ + util/oct-mutex.h \ + util/oct-refcount.h \ + util/oct-rl-edit.h \ + util/oct-rl-hist.h \ + util/oct-shlib.h \ + util/oct-sort.h \ + util/oct-sparse.h \ + util/pathsearch.h \ + util/regexp.h \ + util/singleton-cleanup.h \ + util/sparse-sort.h \ + util/sparse-util.h \ + util/statdefs.h \ + util/str-vec.h \ + util/sun-utils.h + +UTIL_C_SRC = \ + util/f2c-main.c \ + util/lo-cieee.c \ + util/lo-cutils.c \ + util/oct-rl-edit.c \ + util/oct-rl-hist.c + +UTIL_SRC = \ + util/cmd-edit.cc \ + util/cmd-hist.cc \ + util/data-conv.cc \ + util/glob-match.cc \ + util/kpse.cc \ + util/lo-array-gripes.cc \ + util/lo-ieee.cc \ + util/lo-utils.cc \ + util/oct-alloc.cc \ + util/oct-base64.cc \ + util/oct-glob.cc \ + util/oct-inttypes.cc \ + util/oct-locbuf.cc \ + util/oct-md5.cc \ + util/oct-mutex.cc \ + util/oct-shlib.cc \ + util/oct-sort.cc \ + util/pathsearch.cc \ + util/regexp.cc \ + util/singleton-cleanup.cc \ + util/sparse-sort.cc \ + util/sparse-util.cc \ + util/str-vec.cc \ + $(UTIL_C_SRC) + +TEMPLATE_SRC += \ + util/oct-sort.cc + +OTHER_INC += \ + util/kpse.cc + +noinst_LTLIBRARIES += util/libutil.la + +util_libutil_la_SOURCES = $(UTIL_SRC) +util_libutil_la_CPPFLAGS = $(liboctave_la_CPPFLAGS) +
--- a/scripts/miscellaneous/mkoctfile.m +++ b/scripts/miscellaneous/mkoctfile.m @@ -87,18 +87,18 @@ ## 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 +## 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 ##
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,8 +69,7 @@ OCTAVE_CORE_LIBS = \ ../libinterp/liboctinterp.la \ - ../liboctave/liboctave.la \ - ../libcruft/libcruft.la + ../liboctave/liboctave.la include ../libgui/src/link-deps.mk
--- a/src/mkoctfile.in.cc +++ b/src/mkoctfile.in.cc @@ -223,7 +223,6 @@ vars["LIBOCTAVE"] = "-loctave"; vars["LIBOCTINTERP"] = "-loctinterp"; vars["READLINE_LIBS"] = "-lreadline"; - vars["LIBCRUFT"] = "-lcruft"; vars["LAPACK_LIBS"] = get_variable ("LAPACK_LIBS", %OCTAVE_CONF_LAPACK_LIBS%); vars["BLAS_LIBS"] = get_variable ("BLAS_LIBS", %OCTAVE_CONF_BLAS_LIBS%); vars["FFTW3_LDFLAGS"] = get_variable ("FFTW3_LDFLAGS", %OCTAVE_CONF_FFTW3_LDFLAGS%); @@ -254,7 +253,7 @@ + " " + vars["LDFLAGS"]; vars["OCTAVE_LIBS"] = vars["LIBOCTINTERP"] + " " + vars["LIBOCTAVE"] - + " " + vars["SPECIAL_MATH_LIB"] + " " + vars["LIBCRUFT"]; + + " " + vars["SPECIAL_MATH_LIB"]; vars["FFTW_LIBS"] = vars["FFTW3_LDFLAGS"] + " " + vars["FFTW3_LIBS"] + " " + vars["FFTW3F_LDFLAGS"] + " " + vars["FFTW3F_LIBS"]; @@ -307,20 +306,20 @@ " CC LD_CXX\n" " CFLAGS LD_STATIC_FLAG\n" " CPICFLAG LFLAGS\n" -" CPPFLAGS LIBCRUFT\n" -" CXX LIBOCTAVE\n" -" CXXFLAGS LIBOCTINTERP\n" -" CXXPICFLAG LIBS\n" -" DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS\n" -" DEPEND_FLAGS OCTAVE_LINK_DEPS\n" -" DL_LD OCTAVE_LINK_OPTS\n" -" DL_LDFLAGS OCT_LINK_DEPS\n" -" EXEEXT OCT_LINK_OPTS\n" -" F77 RDYNAMIC_FLAG\n" -" F77_INTEGER_8_FLAG READLINE_LIBS\n" -" FFLAGS SED\n" -" FFTW3_LDFLAGS XTRA_CFLAGS\n" -" FFTW3_LIBS XTRA_CXXFLAGS\n" +" CPPFLAGS LIBOCTAVE\n" +" CXX LIBOCTINTERP\n" +" CXXFLAGS LIBS\n" +" CXXPICFLAG OCTAVE_LIBS\n" +" DEPEND_EXTRA_SED_PATTERN OCTAVE_LINK_DEPS\n" +" DEPEND_FLAGS OCTAVE_LINK_OPTS\n" +" DL_LD OCT_LINK_DEPS\n" +" DL_LDFLAGS OCT_LINK_OPTS\n" +" EXEEXT RDYNAMIC_FLAG\n" +" F77 READLINE_LIBS\n" +" F77_INTEGER_8_FLAG SED\n" +" FFLAGS XTRA_CFLAGS\n" +" FFTW3_LDFLAGS XTRA_CXXFLAGS\n" +" FFTW3_LIBS " FFTW3F_LDFLAGS\n" " FFTW3F_LIBS\n" "\n" @@ -751,7 +750,7 @@ + " " + vars["ALL_LDFLAGS"] + " " + pass_on_options + " " + output_option + " " + objfiles + " " + libfiles + " " + ldflags + " " + vars["LFLAGS"] - + " -loctinterp -loctave -lcruft " + + " -loctinterp -loctave " + " " + vars["OCT_LINK_OPTS"] + " " + vars["OCTAVE_LINK_DEPS"]; result = run_command (cmd); @@ -768,7 +767,7 @@ string cmd = vars["DL_LD"] + " " + vars["DL_LDFLAGS"] + " " + pass_on_options + " -o " + octfile + " " + objfiles + " " + libfiles + " " + ldflags + " " + vars["LFLAGS"] - + " -loctinterp -loctave -lcruft " + + " -loctinterp -loctave " + vars["OCT_LINK_OPTS"] + " " + vars["OCT_LINK_DEPS"]; result = run_command (cmd); }
--- a/src/mkoctfile.in.sh +++ b/src/mkoctfile.in.sh @@ -89,7 +89,6 @@ : ${LIBOCTAVE=-loctave} : ${LIBOCTINTERP=-loctinterp} : ${READLINE_LIBS=-lreadline} -: ${LIBCRUFT=-lcruft} : ${LAPACK_LIBS=%OCTAVE_CONF_LAPACK_LIBS%} : ${BLAS_LIBS=%OCTAVE_CONF_BLAS_LIBS%} : ${FFTW3_LDFLAGS=%OCTAVE_CONF_FFTW3_LDFLAGS%} @@ -116,7 +115,7 @@ : ${ALL_LDFLAGS="$LD_STATIC_FLAG $CPICFLAG $LDFLAGS"} -: ${OCTAVE_LIBS="$LIBOCTINTERP $LIBOCTAVE $SPECIAL_MATH_LIB $LIBCRUFT"} +: ${OCTAVE_LIBS="$LIBOCTINTERP $LIBOCTAVE $SPECIAL_MATH_LIB"} # Local variables. @@ -243,18 +242,18 @@ 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 + 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 @@ -533,7 +532,7 @@ if $link && [ -n "$objfiles" ]; then if $link_stand_alone; then if [ -n "$LD_CXX" ]; then - cmd="$LD_CXX $CPPFLAGS $ALL_CXXFLAGS $RDYNAMIC_FLAG $ALL_LDFLAGS $pass_on_options $output_option $objfiles $libfiles $ldflags $LFLAGS -loctinterp -loctave -lcruft $OCTAVE_LINK_OPTS $OCTAVE_LINK_DEPS" + cmd="$LD_CXX $CPPFLAGS $ALL_CXXFLAGS $RDYNAMIC_FLAG $ALL_LDFLAGS $pass_on_options $output_option $objfiles $libfiles $ldflags $LFLAGS -loctinterp -loctave $OCTAVE_LINK_OPTS $OCTAVE_LINK_DEPS" $dbg $cmd eval $cmd else @@ -541,7 +540,7 @@ exit 1 fi else - cmd="$DL_LD $DL_LDFLAGS $pass_on_options -o $octfile $objfiles $libfiles $ldflags $LFLAGS -loctinterp -loctave -lcruft $OCT_LINK_OPTS $OCT_LINK_DEPS" + cmd="$DL_LD $DL_LDFLAGS $pass_on_options -o $octfile $objfiles $libfiles $ldflags $LFLAGS -loctinterp -loctave $OCT_LINK_OPTS $OCT_LINK_DEPS" $dbg $cmd eval $cmd fi