Fixed INTENT of ictxt in psb_exit.
Fix makefiles and configure to get rid of spurious m2c rules.
psblas3-type-indexed
Salvatore Filippone 15 years ago
parent 8503f02789
commit b30b8300ec

@ -5,7 +5,8 @@
# These lines are quite portable. # These lines are quite portable.
.mod=@MODEXT@ .mod=@MODEXT@
.fh=.fh .fh=.fh
.SUFFIXES: .f90 $(.mod) .F90 .F .f03 .F03 .SUFFIXES:
.SUFFIXES: .f90 .F90 .f .F .f03 .F03 .c .o
# The following ones are the variables used by the PSBLAS make scripts. # The following ones are the variables used by the PSBLAS make scripts.

@ -36,7 +36,7 @@ lib: $(BASIC_MODS) penvmod $(UTIL_MODS) $(OBJS) $(LIBMOD)
psi_penv_mod.o: psi_comm_buffers_mod.o psb_const_mod.o psb_realloc_mod.o psi_penv_mod.o: psi_comm_buffers_mod.o psb_const_mod.o psb_realloc_mod.o
psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o penvmod.o: psi_penv_mod.o psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o: psi_penv_mod.o
psb_penv_mod.o: psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o psb_penv_mod.o: psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o
psb_base_mat_mod.o: psb_string_mod.o psb_sort_mod.o psb_ip_reord_mod.o\ psb_base_mat_mod.o: psb_string_mod.o psb_sort_mod.o psb_ip_reord_mod.o\

@ -246,7 +246,7 @@ contains
#ifdef MPI_H #ifdef MPI_H
include 'mpif.h' include 'mpif.h'
#endif #endif
integer, intent(in) :: ictxt integer, intent(inout) :: ictxt
logical, intent(in), optional :: close logical, intent(in), optional :: close
logical :: close_ logical :: close_
integer :: info integer :: info

18
configure vendored

@ -10551,34 +10551,20 @@ CDEFINES=$(PSBCDEFINES)
FDEFINES=$(PSBFDEFINES) FDEFINES=$(PSBFDEFINES)
$(.mod).o:
# These should be portable rules, arent they? # These should be portable rules, arent they?
.c.o: .c.o:
$(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $< $(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $<
.f.o: .f.o:
$(FC) $(FCOPT) $(FINCLUDES) -c $< $(FC) $(FCOPT) $(FINCLUDES) -c $<
.f$(.mod):
$(F90) $(FCOPT) $(FINCLUDES) -c $<
.f90$(.mod):
$(F90) $(F90COPT) $(FINCLUDES) -c $<
.f90.o: .f90.o:
$(F90) $(F90COPT) $(FINCLUDES) -c $< $(F90) $(F90COPT) $(FINCLUDES) -c $<
.f03.o:
$(F03) $(F03COPT) $(FINCLUDES) -c $<
.F.o: .F.o:
$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $< $(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $<
.F$(.mod):
$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $<
.F90.o: .F90.o:
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $< $(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
.F90$(.mod):
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
.f03$(.mod):
$(F03) $(F03COPT) $(FINCLUDES) -c $<
.f03.o:
$(F03) $(F03COPT) $(FINCLUDES) -c $<
.F03.o: .F03.o:
$(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<
.F03$(.mod):
$(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<' $(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<'

@ -723,34 +723,20 @@ CDEFINES=$(PSBCDEFINES)
FDEFINES=$(PSBFDEFINES) FDEFINES=$(PSBFDEFINES)
$(.mod).o:
# These should be portable rules, arent they? # These should be portable rules, arent they?
.c.o: .c.o:
$(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $< $(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $<
.f.o: .f.o:
$(FC) $(FCOPT) $(FINCLUDES) -c $< $(FC) $(FCOPT) $(FINCLUDES) -c $<
.f$(.mod):
$(F90) $(FCOPT) $(FINCLUDES) -c $<
.f90$(.mod):
$(F90) $(F90COPT) $(FINCLUDES) -c $<
.f90.o: .f90.o:
$(F90) $(F90COPT) $(FINCLUDES) -c $< $(F90) $(F90COPT) $(FINCLUDES) -c $<
.f03.o:
$(F03) $(F03COPT) $(FINCLUDES) -c $<
.F.o: .F.o:
$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $< $(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $<
.F$(.mod):
$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $<
.F90.o: .F90.o:
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $< $(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
.F90$(.mod):
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
.f03$(.mod):
$(F03) $(F03COPT) $(FINCLUDES) -c $<
.f03.o:
$(F03) $(F03COPT) $(FINCLUDES) -c $<
.F03.o: .F03.o:
$(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<
.F03$(.mod):
$(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<' $(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<'

Loading…
Cancel
Save