From 3bd04e58ff924067991e9b19b3112c1b38fdb487 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Thu, 14 Dec 2006 18:46:00 +0000 Subject: [PATCH] solaris port CXX_DEPENDS variable addition --- ext/f2c_blas/Makefile.in | 2 +- ext/f2c_lapack/Makefile.in | 2 +- ext/f2c_libs/arith.h | 6 +- ext/f2c_libs/f2c.h | 162 ------------------------------------ ext/f2c_math/Makefile.in | 4 +- ext/f2c_recipes/Makefile.in | 2 +- ext/tpx/Makefile.in | 2 +- 7 files changed, 8 insertions(+), 172 deletions(-) diff --git a/ext/f2c_blas/Makefile.in b/ext/f2c_blas/Makefile.in index 377886734..a1912ad42 100755 --- a/ext/f2c_blas/Makefile.in +++ b/ext/f2c_blas/Makefile.in @@ -33,7 +33,7 @@ CXX_INCLUDES=-I../f2c_libs # How to compile the dependency file .c.d: - g++ -MM $(CXX_FLAGS) $(CXX_INCLUDES) $*.c > $*.d + @CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.c > $*.d # How to compile a C file .c.o: diff --git a/ext/f2c_lapack/Makefile.in b/ext/f2c_lapack/Makefile.in index 7764f1c7a..d700f9c67 100755 --- a/ext/f2c_lapack/Makefile.in +++ b/ext/f2c_lapack/Makefile.in @@ -28,7 +28,7 @@ CXX_INCLUDES=-I../f2c_libs # How to compile the dependency file .c.d: - g++ -MM $(CXX_FLAGS) $(CXX_INCLUDES) $*.c > $*.d + @CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.c > $*.d .c.o: @CC@ -c $< $(CXX_FLAGS) $(CXX_INCLUDES) diff --git a/ext/f2c_libs/arith.h b/ext/f2c_libs/arith.h index 508eb414f..76539f82b 100644 --- a/ext/f2c_libs/arith.h +++ b/ext/f2c_libs/arith.h @@ -1,4 +1,2 @@ -#define IEEE_MC68k -#define Arith_Kind_ASL 2 -#define Double_Align -#define NANCHECK +#define IEEE_8087 +#define Arith_Kind_ASL 1 diff --git a/ext/f2c_libs/f2c.h b/ext/f2c_libs/f2c.h index 2d21339ee..02751d051 100644 --- a/ext/f2c_libs/f2c.h +++ b/ext/f2c_libs/f2c.h @@ -247,165 +247,3 @@ typedef doublereal E_f; /* real function with -R not specified */ #undef vax #endif #endif -/* If you are using a C++ compiler, append the following to f2c.h - for compiling libF77 and libI77. */ - -#ifdef __cplusplus -extern "C" { -extern int abort_(void); -extern double c_abs(complex *); -extern void c_cos(complex *, complex *); -extern void c_div(complex *, complex *, complex *); -extern void c_exp(complex *, complex *); -extern void c_log(complex *, complex *); -extern void c_sin(complex *, complex *); -extern void c_sqrt(complex *, complex *); -extern double d_abs(double *); -extern double d_acos(double *); -extern double d_asin(double *); -extern double d_atan(double *); -extern double d_atn2(double *, double *); -extern void d_cnjg(doublecomplex *, doublecomplex *); -extern double d_cos(double *); -extern double d_cosh(double *); -extern double d_dim(double *, double *); -extern double d_exp(double *); -extern double d_imag(doublecomplex *); -extern double d_int(double *); -extern double d_lg10(double *); -extern double d_log(double *); -extern double d_mod(double *, double *); -extern double d_nint(double *); -extern double d_prod(float *, float *); -extern double d_sign(double *, double *); -extern double d_sin(double *); -extern double d_sinh(double *); -extern double d_sqrt(double *); -extern double d_tan(double *); -extern double d_tanh(double *); -extern double derf_(double *); -extern double derfc_(double *); -extern integer do_fio(ftnint *, char *, ftnlen); -extern integer do_lio(ftnint *, ftnint *, char *, ftnlen); -extern integer do_uio(ftnint *, char *, ftnlen); -extern integer e_rdfe(void); -extern integer e_rdue(void); -extern integer e_rsfe(void); -extern integer e_rsfi(void); -extern integer e_rsle(void); -extern integer e_rsli(void); -extern integer e_rsue(void); -extern integer e_wdfe(void); -extern integer e_wdue(void); -extern integer e_wsfe(void); -extern integer e_wsfi(void); -extern integer e_wsle(void); -extern integer e_wsli(void); -extern integer e_wsue(void); -extern int ef1asc_(ftnint *, ftnlen *, ftnint *, ftnlen *); -extern integer ef1cmc_(ftnint *, ftnlen *, ftnint *, ftnlen *); -extern double erf(double); -extern double erf_(float *); -extern double erfc(double); -extern double erfc_(float *); -extern integer f_back(alist *); -extern integer f_clos(cllist *); -extern integer f_end(alist *); -extern void f_exit(void); -extern integer f_inqu(inlist *); -extern integer f_open(olist *); -extern integer f_rew(alist *); -extern int flush_(void); -extern void getarg_(integer *, char *, ftnlen); -extern void getenv_(char *, char *, ftnlen, ftnlen); -extern short h_abs(short *); -extern short h_dim(short *, short *); -extern short h_dnnt(double *); -extern short h_indx(char *, char *, ftnlen, ftnlen); -extern short h_len(char *, ftnlen); -extern short h_mod(short *, short *); -extern short h_nint(float *); -extern short h_sign(short *, short *); -extern short hl_ge(char *, char *, ftnlen, ftnlen); -extern short hl_gt(char *, char *, ftnlen, ftnlen); -extern short hl_le(char *, char *, ftnlen, ftnlen); -extern short hl_lt(char *, char *, ftnlen, ftnlen); -extern integer i_abs(integer *); -extern integer i_dim(integer *, integer *); -extern integer i_dnnt(double *); -extern integer i_indx(char *, char *, ftnlen, ftnlen); -extern integer i_len(char *, ftnlen); -extern integer i_mod(integer *, integer *); -extern integer i_nint(float *); -extern integer i_sign(integer *, integer *); -extern integer iargc_(void); -extern ftnlen l_ge(char *, char *, ftnlen, ftnlen); -extern ftnlen l_gt(char *, char *, ftnlen, ftnlen); -extern ftnlen l_le(char *, char *, ftnlen, ftnlen); -extern ftnlen l_lt(char *, char *, ftnlen, ftnlen); -extern void pow_ci(complex *, complex *, integer *); -extern double pow_dd(double *, double *); -extern double pow_di(double *, integer *); -extern short pow_hh(short *, shortint *); -extern integer pow_ii(integer *, integer *); -extern double pow_ri(float *, integer *); -extern void pow_zi(doublecomplex *, doublecomplex *, integer *); -extern void pow_zz(doublecomplex *, doublecomplex *, doublecomplex *); -extern double r_abs(float *); -extern double r_acos(float *); -extern double r_asin(float *); -extern double r_atan(float *); -extern double r_atn2(float *, float *); -extern void r_cnjg(complex *, complex *); -extern double r_cos(float *); -extern double r_cosh(float *); -extern double r_dim(float *, float *); -extern double r_exp(float *); -extern double r_imag(complex *); -extern double r_int(float *); -extern double r_lg10(float *); -extern double r_log(float *); -extern double r_mod(float *, float *); -extern double r_nint(float *); -extern double r_sign(float *, float *); -extern double r_sin(float *); -extern double r_sinh(float *); -extern double r_sqrt(float *); -extern double r_tan(float *); -extern double r_tanh(float *); -extern void s_cat(char *, char **, integer *, integer *, ftnlen); -extern integer s_cmp(char *, char *, ftnlen, ftnlen); -extern void s_copy(char *, char *, ftnlen, ftnlen); -extern int s_paus(char *, ftnlen); -extern integer s_rdfe(cilist *); -extern integer s_rdue(cilist *); -extern integer s_rnge(char *, integer, char *, integer); -extern integer s_rsfe(cilist *); -extern integer s_rsfi(icilist *); -extern integer s_rsle(cilist *); -extern integer s_rsli(icilist *); -extern integer s_rsne(cilist *); -extern integer s_rsni(icilist *); -extern integer s_rsue(cilist *); -extern int s_stop(char *, ftnlen); -extern integer s_wdfe(cilist *); -extern integer s_wdue(cilist *); -extern integer s_wsfe(cilist *); -extern integer s_wsfi(icilist *); -extern integer s_wsle(cilist *); -extern integer s_wsli(icilist *); -extern integer s_wsne(cilist *); -extern integer s_wsni(icilist *); -extern integer s_wsue(cilist *); -extern void sig_die(char *, int); -extern integer signal_(integer *, void (*)(int)); -extern integer system_(char *, ftnlen); -extern double z_abs(doublecomplex *); -extern void z_cos(doublecomplex *, doublecomplex *); -extern void z_div(doublecomplex *, doublecomplex *, doublecomplex *); -extern void z_exp(doublecomplex *, doublecomplex *); -extern void z_log(doublecomplex *, doublecomplex *); -extern void z_sin(doublecomplex *, doublecomplex *); -extern void z_sqrt(doublecomplex *, doublecomplex *); - } -#endif diff --git a/ext/f2c_math/Makefile.in b/ext/f2c_math/Makefile.in index 12f053ed5..ea788a59e 100644 --- a/ext/f2c_math/Makefile.in +++ b/ext/f2c_math/Makefile.in @@ -30,10 +30,10 @@ CXX_INCLUDES=-I../f2c_libs # How to compile the dependency file .c.d: - g++ -MM $(CXX_FLAGS) $(CXX_INCLUDES) $*.c > $*.d + @CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.c > $*.d .cpp.d: - g++ -MM $(CXX_FLAGS) $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.cpp > $*.d # How to compile a C file .c.o: diff --git a/ext/f2c_recipes/Makefile.in b/ext/f2c_recipes/Makefile.in index 947efa912..cd87e3682 100644 --- a/ext/f2c_recipes/Makefile.in +++ b/ext/f2c_recipes/Makefile.in @@ -31,7 +31,7 @@ CXX_INCLUDES=-I../f2c_libs # How to compile the dependency file .c.d: - g++ -MM $(CXX_FLAGS) $(CXX_INCLUDES) $*.c > $*.d + @CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.c > $*.d # How to compile a C file .c.o: diff --git a/ext/tpx/Makefile.in b/ext/tpx/Makefile.in index 4f52d4ea2..8ee71d733 100755 --- a/ext/tpx/Makefile.in +++ b/ext/tpx/Makefile.in @@ -21,7 +21,7 @@ DEPENDS = $(COBJS:.o=.d) all: $(TPLIB) %.d: - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d .cpp.o: @CXX@ -c $< @DEFS@ $(CXX_FLAGS) $(CXX_INCLUDES)