Mercurial > octave-nkf
changeset 3049:4d275e0a0576
[project @ 1997-06-07 02:57:30 by jwe]
| author | jwe |
|---|---|
| date | Sat, 07 Jun 1997 02:58:41 +0000 |
| parents | c8716e8782d7 |
| children | 8ae394247559 |
| files | ChangeLog libcruft/ChangeLog libcruft/Makefile.in libcruft/slatec-fn/xdgamma.f liboctave/ChangeLog liboctave/lo-mappers.cc mkoctfile.in |
| diffstat | 7 files changed, 23 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jun 06 22:24:11 1997 +0000 +++ b/ChangeLog Sat Jun 07 02:58:41 1997 +0000 @@ -1,5 +1,8 @@ Fri Jun 6 15:20:42 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + * mkoctfile.in: Use eval to invoke compilation and linking + commands. + * octMakefile.in (dist, binary-dist): Don't worry about npsol or qpsol. * configure.in: Don't create libcruft/fsqp/Makefile, libcruft/npsol/Makefile, or libcruft/qpsol/Makefile.
--- a/libcruft/ChangeLog Fri Jun 06 22:24:11 1997 +0000 +++ b/libcruft/ChangeLog Sat Jun 07 02:58:41 1997 +0000 @@ -1,5 +1,7 @@ Fri Jun 6 16:49:22 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + * slatec-fn/xdgamma.f: New file. + * fsqp, npsol, qpsol: Delete directories. * Makefile.in (CRUFT_DIRS): Delete fsqp, npsol, and qpsol from list.
--- a/libcruft/Makefile.in Fri Jun 06 22:24:11 1997 +0000 +++ b/libcruft/Makefile.in Sat Jun 07 02:58:41 1997 +0000 @@ -76,7 +76,7 @@ .PHONY: shared-lib libcruft.$(SHLEXT): libcruft.$(SHLEXT_VER) - rm -f $! + rm -f $@ $(LN_S) $< $@ libcruft.$(SHLEXT_VER): $(CRUFT_PICOBJ)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libcruft/slatec-fn/xdgamma.f Sat Jun 07 02:58:41 1997 +0000 @@ -0,0 +1,5 @@ + subroutine xdgamma (x, result) + double precision x, result, dgamma + result = dgamma (x) + return + end
--- a/liboctave/ChangeLog Fri Jun 06 22:24:11 1997 +0000 +++ b/liboctave/ChangeLog Sat Jun 07 02:58:41 1997 +0000 @@ -1,5 +1,8 @@ Fri Jun 6 04:27:40 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + * lo-mappers.cc (xlgamma): Use F77_XFCN function to call dlgams. + (xgamma): Likewise, for calling xdgamma. + * FSQP.h, NPSOL.h, QPSOL.h, FSQP.cc, NPSOL.cc, QPSOL.cc: Delete * Makefile.in (INCLUDES, SOURCES): Remove them from the lists.
--- a/liboctave/lo-mappers.cc Fri Jun 06 22:24:11 1997 +0000 +++ b/liboctave/lo-mappers.cc Sat Jun 07 02:58:41 1997 +0000 @@ -42,7 +42,7 @@ extern "C" { - double F77_FCN (dgamma, DGAMMA) (const double&); + int F77_FCN (xdgamma, XDGAMMA) (const double&, double&); int F77_FCN (dlgams, DLGAMS) (const double&, double&, double&); } @@ -171,7 +171,11 @@ double xgamma (double x) { - return F77_FCN (dgamma, DGAMMA) (x); + double result; + + F77_XFCN (xdgamma, XDGAMMA, (x, result)); + + return result; } double @@ -192,7 +196,7 @@ double result; double sgngam; - F77_FCN (dlgams, DLGAMS) (x, result, sgngam); + F77_XFCN (dlgams, DLGAMS, (x, result, sgngam)); return result; }
--- a/mkoctfile.in Fri Jun 06 22:24:11 1997 +0000 +++ b/mkoctfile.in Sat Jun 07 02:58:41 1997 +0000 @@ -35,8 +35,8 @@ echo "making $objfile from $srcfile" -$CXX -c $CPPFLAGS $CXXPICFLAG $ALL_CXXFLAGS $srcfile -o $objfile +eval $CXX -c $CPPFLAGS $CXXPICFLAG $ALL_CXXFLAGS $srcfile -o $objfile echo "making $octfile from $objfile" -$SH_LD $SH_LDFLAGS -o $octfile $objfile +eval $SH_LD $SH_LDFLAGS -o $octfile $objfile