# HG changeset patch # User John W. Eaton # Date 1454561089 18000 # Node ID 7f35125714b43aa57267974a48cec503ec93a773 # Parent c784207fe0b69db2e2eb183570372f92c716a09e don't install some internal headers and template sources * sparse-chol-inst.cc: Delete. Instantiate needed classes and functions in sparse-chol.cc. * sparse-lu-inst.cc: Delete. Instantiate needed classes and functions in sparse-lu.cc. * sparse-qr-inst.cc: Delete. Instantiate needed classes and functions in sparse-qr.cc. * sighandlers.h: Include sys/types.h. Don't include syswait.h or siglist.h * sparse-chol.h, sparse-qr.h: Don't include oct-sparse.h. * symbfact.cc, sparse-dmsolve.cc: Include oct-sparse.h. * octave.cc: Include siglist.h. * liboctave/numeric/module.mk: Don't install sparse-chol.cc, sparse-lu.cc, or sparse-qr.cc with header files. * liboctave/util/module.mk: Don't install oct-sparse.h. * liboctave/system/module.mk: Don't install pathlen.h, sysdir.h, or syswait.h header files. diff -r c784207fe0b6 -r 7f35125714b4 libinterp/corefcn/sighandlers.h --- a/libinterp/corefcn/sighandlers.h Wed Feb 03 23:49:09 2016 -0500 +++ b/libinterp/corefcn/sighandlers.h Wed Feb 03 23:44:49 2016 -0500 @@ -36,11 +36,9 @@ // Include signal.h, not csignal since the latter might only define // the ANSI standard C signal interface. +#include #include -#include "syswait.h" -#include "siglist.h" - #include "base-list.h" typedef void sig_handler (int); diff -r c784207fe0b6 -r 7f35125714b4 libinterp/dldfcn/symbfact.cc --- a/libinterp/dldfcn/symbfact.cc Wed Feb 03 23:49:09 2016 -0500 +++ b/libinterp/dldfcn/symbfact.cc Wed Feb 03 23:44:49 2016 -0500 @@ -25,10 +25,11 @@ #include #endif -#include "sparse-chol.h" +#include "oct-locbuf.h" +#include "oct-sparse.h" #include "oct-spparms.h" +#include "sparse-chol.h" #include "sparse-util.h" -#include "oct-locbuf.h" #include "ov-re-sparse.h" #include "ov-cx-sparse.h" diff -r c784207fe0b6 -r 7f35125714b4 libinterp/octave.cc --- a/libinterp/octave.cc Wed Feb 03 23:49:09 2016 -0500 +++ b/libinterp/octave.cc Wed Feb 03 23:44:49 2016 -0500 @@ -74,6 +74,7 @@ #include "parse.h" #include "procstream.h" #include "sighandlers.h" +#include "siglist.h" #include "sysdep.h" #include "unwind-prot.h" #include "utils.h" diff -r c784207fe0b6 -r 7f35125714b4 liboctave/numeric/module.mk --- a/liboctave/numeric/module.mk Wed Feb 03 23:49:09 2016 -0500 +++ b/liboctave/numeric/module.mk Wed Feb 03 23:44:49 2016 -0500 @@ -107,11 +107,14 @@ liboctave/numeric/dbleGEPBAL.cc \ liboctave/numeric/dbleHESS.cc \ liboctave/numeric/dbleLU.cc \ + liboctave/numeric/EIG.cc \ + liboctave/numeric/LSODE.cc \ + liboctave/numeric/ODES.cc \ + liboctave/numeric/Quad.cc \ liboctave/numeric/dbleQR.cc \ liboctave/numeric/dbleQRP.cc \ liboctave/numeric/dbleSCHUR.cc \ liboctave/numeric/dbleSVD.cc \ - liboctave/numeric/EIG.cc \ liboctave/numeric/fCmplxAEPBAL.cc \ liboctave/numeric/fCmplxCHOL.cc \ liboctave/numeric/fCmplxGEPBAL.cc \ @@ -133,17 +136,14 @@ liboctave/numeric/floatSVD.cc \ liboctave/numeric/lo-mappers.cc \ liboctave/numeric/lo-specfun.cc \ - liboctave/numeric/LSODE.cc \ liboctave/numeric/oct-convn.cc \ liboctave/numeric/oct-fftw.cc \ liboctave/numeric/oct-norm.cc \ liboctave/numeric/oct-rand.cc \ liboctave/numeric/oct-spparms.cc \ - liboctave/numeric/ODES.cc \ - liboctave/numeric/Quad.cc \ - liboctave/numeric/sparse-chol-inst.cc \ - liboctave/numeric/sparse-lu-inst.cc \ - liboctave/numeric/sparse-qr-inst.cc \ + liboctave/numeric/sparse-chol.cc \ + liboctave/numeric/sparse-lu.cc \ + liboctave/numeric/sparse-qr.cc \ $(NUMERIC_C_SRC) LIBOCTAVE_TEMPLATE_SRC += \ @@ -151,9 +151,6 @@ liboctave/numeric/base-qr.cc \ liboctave/numeric/bsxfun-defs.cc \ liboctave/numeric/eigs-base.cc \ - liboctave/numeric/sparse-chol.cc \ - liboctave/numeric/sparse-lu.cc \ - liboctave/numeric/sparse-qr.cc \ liboctave/numeric/sparse-dmsolve.cc ## Special rules for sources which must be built before rest of compilation. diff -r c784207fe0b6 -r 7f35125714b4 liboctave/numeric/sparse-chol-inst.cc --- a/liboctave/numeric/sparse-chol-inst.cc Wed Feb 03 23:49:09 2016 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2016 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 -. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "sparse-chol.h" -#include "sparse-chol.cc" - -template class sparse_chol; - -template class sparse_chol; - -template SparseMatrix -chol2inv (const SparseMatrix& r); - -template SparseComplexMatrix -chol2inv (const SparseComplexMatrix& r); diff -r c784207fe0b6 -r 7f35125714b4 liboctave/numeric/sparse-chol.cc --- a/liboctave/numeric/sparse-chol.cc Wed Feb 03 23:49:09 2016 -0500 +++ b/liboctave/numeric/sparse-chol.cc Wed Feb 03 23:44:49 2016 -0500 @@ -566,3 +566,15 @@ : rep (new typename sparse_chol::sparse_chol_rep (a, info, true, false)) { } + +// Instantiations we need. + +template class sparse_chol; + +template class sparse_chol; + +template SparseMatrix +chol2inv (const SparseMatrix& r); + +template SparseComplexMatrix +chol2inv (const SparseComplexMatrix& r); diff -r c784207fe0b6 -r 7f35125714b4 liboctave/numeric/sparse-chol.h --- a/liboctave/numeric/sparse-chol.h Wed Feb 03 23:49:09 2016 -0500 +++ b/liboctave/numeric/sparse-chol.h Wed Feb 03 23:44:49 2016 -0500 @@ -28,7 +28,6 @@ #include "CSparse.h" #include "dColVector.h" #include "dSparse.h" -#include "oct-sparse.h" // If the sparse matrix classes become templated on the element type // (i.e., sparse_matrix), then it might be best to make the diff -r c784207fe0b6 -r 7f35125714b4 liboctave/numeric/sparse-dmsolve.cc --- a/liboctave/numeric/sparse-dmsolve.cc Wed Feb 03 23:49:09 2016 -0500 +++ b/liboctave/numeric/sparse-dmsolve.cc Wed Feb 03 23:44:49 2016 -0500 @@ -29,11 +29,12 @@ #include "MArray.h" #include "MSparse.h" -#include "sparse-qr.h" #include "MatrixType.h" +#include "oct-inttypes.h" +#include "oct-locbuf.h" #include "oct-sort.h" -#include "oct-locbuf.h" -#include "oct-inttypes.h" +#include "oct-sparse.h" +#include "sparse-qr.h" template static MSparse diff -r c784207fe0b6 -r 7f35125714b4 liboctave/numeric/sparse-lu-inst.cc --- a/liboctave/numeric/sparse-lu-inst.cc Wed Feb 03 23:49:09 2016 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -/* - -Copyright (C) 2016 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 -. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "sparse-lu.h" -#include "sparse-lu.cc" - -template class sparse_lu; - -template class sparse_lu; diff -r c784207fe0b6 -r 7f35125714b4 liboctave/numeric/sparse-lu.cc --- a/liboctave/numeric/sparse-lu.cc Wed Feb 03 23:49:09 2016 -0500 +++ b/liboctave/numeric/sparse-lu.cc Wed Feb 03 23:44:49 2016 -0500 @@ -890,3 +890,9 @@ { return PermMatrix (Q, true); } + +// Instantiations we need. + +template class sparse_lu; + +template class sparse_lu; diff -r c784207fe0b6 -r 7f35125714b4 liboctave/numeric/sparse-qr-inst.cc --- a/liboctave/numeric/sparse-qr-inst.cc Wed Feb 03 23:49:09 2016 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -/* - -Copyright (C) 2016 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 -. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "sparse-qr.h" -#include "sparse-qr.cc" - -template class sparse_qr; - -template class sparse_qr; diff -r c784207fe0b6 -r 7f35125714b4 liboctave/numeric/sparse-qr.cc --- a/liboctave/numeric/sparse-qr.cc Wed Feb 03 23:49:09 2016 -0500 +++ b/liboctave/numeric/sparse-qr.cc Wed Feb 03 23:44:49 2016 -0500 @@ -26,8 +26,9 @@ #endif #include "lo-error.h" +#include "oct-locbuf.h" +#include "oct-sparse.h" #include "sparse-qr.h" -#include "oct-locbuf.h" template class @@ -2252,3 +2253,9 @@ { return sparse_qr::solve (a, b, info); } + +// Instantiations we need. + +template class sparse_qr; + +template class sparse_qr; diff -r c784207fe0b6 -r 7f35125714b4 liboctave/numeric/sparse-qr.h --- a/liboctave/numeric/sparse-qr.h Wed Feb 03 23:49:09 2016 -0500 +++ b/liboctave/numeric/sparse-qr.h Wed Feb 03 23:44:49 2016 -0500 @@ -28,7 +28,6 @@ #include "CMatrix.h" #include "dSparse.h" #include "CSparse.h" -#include "oct-sparse.h" // If the sparse matrix classes become templated on the element type // (i.e., sparse_matrix), then it might be best to make the diff -r c784207fe0b6 -r 7f35125714b4 liboctave/system/module.mk --- a/liboctave/system/module.mk Wed Feb 03 23:49:09 2016 -0500 +++ b/liboctave/system/module.mk Wed Feb 03 23:44:49 2016 -0500 @@ -10,7 +10,9 @@ liboctave/system/oct-passwd.h \ liboctave/system/oct-syscalls.h \ liboctave/system/oct-time.h \ - liboctave/system/oct-uname.h \ + liboctave/system/oct-uname.h + +NOINSTALL_SYSTEM_INC = \ liboctave/system/pathlen.h \ liboctave/system/sysdir.h \ liboctave/system/syswait.h @@ -26,7 +28,8 @@ liboctave/system/oct-passwd.cc \ liboctave/system/oct-syscalls.cc \ liboctave/system/oct-time.cc \ - liboctave/system/oct-uname.cc + liboctave/system/oct-uname.cc \ + $(NOINSTALL_SYSTEM_INC) noinst_LTLIBRARIES += liboctave/system/libsystem.la diff -r c784207fe0b6 -r 7f35125714b4 liboctave/util/module.mk --- a/liboctave/util/module.mk Wed Feb 03 23:49:09 2016 -0500 +++ b/liboctave/util/module.mk Wed Feb 03 23:44:49 2016 -0500 @@ -29,7 +29,6 @@ liboctave/util/oct-rl-hist.h \ liboctave/util/oct-shlib.h \ liboctave/util/oct-sort.h \ - liboctave/util/oct-sparse.h \ liboctave/util/pathsearch.h \ liboctave/util/lo-regexp.h \ liboctave/util/singleton-cleanup.h \ @@ -41,6 +40,9 @@ liboctave/util/unwind-prot.h \ liboctave/util/url-transfer.h +NOINSTALL_UTIL_INC = \ + liboctave/util/oct-sparse.h + UTIL_C_SRC = \ liboctave/util/f2c-main.c \ liboctave/util/lo-cutils.c \ @@ -70,7 +72,8 @@ liboctave/util/str-vec.cc \ liboctave/util/unwind-prot.cc \ liboctave/util/url-transfer.cc \ - $(UTIL_C_SRC) + $(UTIL_C_SRC) \ + $(NOINSTALL_UTIL_INC) LIBOCTAVE_TEMPLATE_SRC += \ liboctave/util/oct-sort.cc