psblas3:

Make.inc.in
 configure.ac
 configure
 krylov/Makefile
 opt/Makefile
 prec/Makefile
 util/Makefile

Reintroduce dependencies on module file name after parametrization in configure.

Make.inc.in

@@ -59,6 +59,11 @@ BASELIBNAME=@BASELIBNAME@
 PRECLIBNAME=@PRECLIBNAME@
 METHDLIBNAME=@METHDLIBNAME@
 UTILLIBNAME=@UTILLIBNAME@
+BASEMODNAME=@BASEMODNAME@
+PRECMODNAME=@PRECMODNAME@
+METHDMODNAME=@METHDMODNAME@
+UTILMODNAME=@UTILMODNAME@
+
 
 @PSBLASRULES@
 

configure.ac

@@ -466,15 +466,27 @@ fi
 if test "X$F90LINK" == "X" ; then
    F90LINK=${MPF90}
 fi
+
 ##############################################################################
+#
+#      Include flags and Module file names for dependencies.
+#
 ##############################################################################
-#			Include flags
-##############################################################################
+BASEMODNAME=psb_base_mod
+PRECMODNAME=psb_prec_mod
+METHDMODNAME=psb_krylov_mod
+UTILMODNAME=psb_util_mod
+
 if test "X$psblas_cv_fc" == X"cray" 
 then
    MODEXT=".mod"
    FMFLAG="-I"
    FIFLAG="-I"
+   BASEMODNAME=PSB_BASE_MOD
+   PRECMODNAME=PSB_PREC_MOD
+   METHDMODNAME=PSB_KRYLOV_MOD
+   UTILMODNAME=PSB_UTIL_MOD
+
 else 
    AX_F90_MODULE_EXTENSION
    AX_F90_MODULE_FLAG
@@ -719,17 +731,18 @@ LIBDIR=lib
 BASELIBNAME=libpsb_base.a
 PRECLIBNAME=libpsb_prec.a
 METHDLIBNAME=libpsb_krylov.a
-
-# Note: psb_util code will be compiled conditionally for METIS functionalities.. using HAVE_METIS
 UTILLIBNAME=libpsb_util.a
 
-
 ###############################################################################
 # Variable substitutions : the Make.inc.in will have these @VARIABLES@
 # substituted.
 
 AC_SUBST(FDEFINES)
 AC_SUBST(CDEFINES)
+AC_SUBST(BASEMODNAME)
+AC_SUBST(PRECMODNAME)
+AC_SUBST(METHDMODNAME)
+AC_SUBST(UTILMODNAME)
 AC_SUBST(BASELIBNAME)
 AC_SUBST(F90)
 AC_SUBST(F90COPT)

krylov/Makefile

@@ -18,7 +18,6 @@ F90OBJS=psb_dkrylov.o psb_skrylov.o psb_ckrylov.o psb_zkrylov.o \
 	psb_zbicg.o psb_zcgstabl.o psb_zrgmres.o
 OBJS=$(F90OBJS) $(MODOBJS)
 
-LIBMOD=psb_krylov_mod$(.mod)
 LOCAL_MODS=$(MODOBJS:.o=$(.mod))
 LIBNAME=$(METHDLIBNAME)	
 
@@ -28,13 +27,14 @@ lib: $(OBJS)
 	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
 	$(RANLIB) $(HERE)/$(LIBNAME)
 	/bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR)
-	/bin/cp -p $(CPUPDFLAG) $(LIBMOD) $(LIBDIR)
+	/bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR)
 
 
 psb_s_inner_krylov_mod.o psb_c_inner_krylov_mod.o psb_d_inner_krylov_mod.o psb_z_inner_krylov_mod.o:  psb_base_inner_krylov_mod.o
 psb_inner_krylov_mod.o: psb_s_inner_krylov_mod.o psb_c_inner_krylov_mod.o psb_d_inner_krylov_mod.o psb_z_inner_krylov_mod.o 
 $(F90OBJS): $(MODOBJS)
-$(OBJS): $(LIBDIR)/psb_prec_mod$(.mod)  $(LIBDIR)/psb_base_mod$(.mod)
+$(OBJS): $(LIBDIR)/$(PRECMODNAME)$(.mod)  $(LIBDIR)/$(BASEMODNAME)$(.mod)
+
 veryclean: clean
 	/bin/rm -f $(HERE)/$(LIBNAME)
 

opt/Makefile

@@ -32,6 +32,7 @@ lib: $(OBJS)
 libpsb_opt.a: $(OBJS)
 	ar cur libpsb_opt.a $(OBJS)
 
+$(OBJS): $(LIBDIR)/$(BASEMODNAME)$(.mod)
 psb_d_ell_impl.o: psb_d_ell_mat_mod.o
 
 

prec/Makefile

@@ -27,7 +27,7 @@ lib:  $(OBJS) impld
 impld: $(OBJS)
 	cd impl && $(MAKE)
 
-$(OBJS): $(LIBDIR)/psb_base_mod.o
+$(OBJS): $(LIBDIR)/$(BASEMODNAME)$(.mod)
 
 
 psb_s_base_prec_mod.o psb_d_base_prec_mod.o psb_c_base_prec_mod.o psb_z_base_prec_mod.o: psb_prec_const_mod.o

util/Makefile

@@ -19,7 +19,6 @@ IMPLOBJS= psb_s_hbio_impl.o psb_d_hbio_impl.o \
 MODOBJS=psb_util_mod.o $(BASEOBJS)
 COBJS=psb_amd_order.o
 OBJS=$(MODOBJS) $(IMPLOBJS) $(COBJS)
-LIBMOD=psb_util_mod$(.mod)
 LOCAL_MODS=$(MODOBJS:.o=$(.mod))
 LIBNAME=$(UTILLIBNAME)
 FINCLUDES=$(FMFLAG). $(FMFLAG)$(LIBDIR) 
@@ -27,12 +26,13 @@ FINCLUDES=$(FMFLAG). $(FMFLAG)$(LIBDIR)
 
 lib:  $(HERE)/$(LIBNAME) 
 	/bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR)
-	/bin/cp -p $(CPUPDFLAG) $(LIBMOD) $(LOCAL_MODS) $(LIBDIR)
+	/bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR)
 
 $(HERE)/$(LIBNAME): $(OBJS)
 	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
 	$(RANLIB) $(HERE)/$(LIBNAME)
 
+$(OBJS): $(LIBDIR)/$(BASEMODNAME)$(.mod)
 psb_util_mod.o: $(BASEOBJS)
 
 veryclean: clean