Mercurial > octave-nkf
changeset 6360:6f3902d56db8
[project @ 2007-02-26 21:08:49 by jwe]
| author | jwe |
|---|---|
| date | Mon, 26 Feb 2007 21:08:50 +0000 |
| parents | 069ea93b3c45 |
| children | 776e657c9422 |
| files | libcruft/ChangeLog libcruft/misc/Makefile.in src/ChangeLog src/DLD-FUNCTIONS/getrusage.cc |
| diffstat | 4 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libcruft/ChangeLog Mon Feb 26 20:54:11 2007 +0000 +++ b/libcruft/ChangeLog Mon Feb 26 21:08:50 2007 +0000 @@ -1,3 +1,8 @@ +2007-02-26 John W. Eaton <jwe@octave.org> + + * misc/Makefile.in (CPICDEP): Also set if CPICFLAG is not defined. + (CXXPICDEP): Also set if CXXPICFLAG is not defined. + 2007-02-26 From Michael Goffioul <michael.goffioul@swing.be> * Makefile.in, Makerules.in: Use $(LN_S) instead of ln or ln -s.
--- a/libcruft/misc/Makefile.in Mon Feb 26 20:54:11 2007 +0000 +++ b/libcruft/misc/Makefile.in Mon Feb 26 21:08:50 2007 +0000 @@ -36,11 +36,13 @@ INCLUDES := f77-fcn.h lo-error.h oct-dlldefs.h quit.h ifeq ($(SHARED_LIBS), true) + CPICDEP = f77-fcn.o lo-error.o cquit.o ifdef CPICFLAG - CPICDEP := pic/machar.o pic/f77-fcn.o pic/lo-error.o pic/cquit.o + CPICDEP := $(addprefix pic/, $(CPICDEP)) endif + CXXPICDEP := f77-extern.o quit.o ifdef CXXPICFLAG - CXXPICDEP := pic/f77-extern.o pic/quit.o + CXXPICDEP := $(addprefix pic/, $(CXXPICDEP)) endif SPECIAL_PICDEPEND := $(CPICDEP) $(CXXPICDEP) endif
--- a/src/ChangeLog Mon Feb 26 20:54:11 2007 +0000 +++ b/src/ChangeLog Mon Feb 26 21:08:50 2007 +0000 @@ -2,6 +2,8 @@ * Makefile.in: Use $(LN_S) instead of ln or ln -s. + * DLD-FUNCTIONS/getrusage.cc: Undef min after including windows.h. + 2007-02-25 John W. Eaton <jwe@octave.org> * DLD-FUNCTIONS/interpn.cc: Include dNDArray.h, not dMatrix.cc.