Do not assume a naming scheme for MODULE files in the Makefile, as

they change across compilers.

cbind/base/Makefile

@@ -24,23 +24,13 @@ CMOD=psb_base_cbind.h psb_c_base.h psb_c_sbase.h  psb_c_dbase.h  psb_c_cbase.h
 	psb_c_scomm.h psb_c_dcomm.h psb_c_ccomm.h psb_c_zcomm.h
 OBJS=$(FOBJS) $(COBJS)
 
-LIBMOD=psb_base_cbind_mod$(.mod) psb_cpenv_mod$(.mod)  psb_objhandle_mod$(.mod)\
-       psb_base_tools_cbind_mod$(.mod) psb_base_string_cbind_mod$(.mod) psb_base_psblas_cbind_mod$(.mod)\
-       psb_s_tools_cbind_mod$(.mod) psb_s_serial_cbind_mod$(.mod) psb_s_psblas_cbind_mod$(.mod) \
-       psb_d_tools_cbind_mod$(.mod) psb_d_serial_cbind_mod$(.mod) psb_d_psblas_cbind_mod$(.mod) \
-       psb_c_tools_cbind_mod$(.mod) psb_c_serial_cbind_mod$(.mod) psb_c_psblas_cbind_mod$(.mod) \
-       psb_z_tools_cbind_mod$(.mod) psb_z_serial_cbind_mod$(.mod) psb_z_psblas_cbind_mod$(.mod) \
-       psb_s_comm_cbind_mod$(.mod) psb_d_comm_cbind_mod$(.mod) \
-       psb_c_comm_cbind_mod$(.mod) psb_z_comm_cbind_mod$(.mod) 
-
-LOCAL_MODS=$(LIBMOD) 
 LIBNAME=$(CBINDLIBNAME)	
 
 
 lib:  $(OBJS) $(CMOD)
 	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
 	$(RANLIB) $(HERE)/$(LIBNAME)
-	/bin/cp -p $(LIBMOD) $(CMOD) $(HERE)
+	/bin/cp -p  *$(.mod) $(CMOD) $(HERE)
 
 $(COBJS): $(CMOD)
 
@@ -71,6 +61,6 @@ veryclean: clean
 	/bin/rm -f $(HERE)/$(LIBNAME)
 
 clean:
-	/bin/rm -f $(OBJS) $(LOCAL_MODS)
+	/bin/rm -f $(OBJS) *$(.mod)
 
 veryclean: clean

cbind/krylov/Makefile

@@ -13,11 +13,6 @@ psb_skrylov_cbind_mod.o psb_dkrylov_cbind_mod.o psb_ckrylov_cbind_mod.o psb_zkry
 CMOD=psb_krylov_cbind.h
 
 
-LIBMOD=psb_base_krylov_cbind_mod$(.mod)  \
-psb_skrylov_cbind_mod$(.mod) psb_dkrylov_cbind_mod$(.mod) \
-psb_ckrylov_cbind_mod$(.mod) psb_zkrylov_cbind_mod$(.mod) 
-
-LOCAL_MODS=$(LIBMOD)
 LIBNAME=$(CKRYLOVLIBNAME)	
 
 
@@ -25,13 +20,13 @@ lib:  $(OBJS) $(CMOD)
 	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
 	$(RANLIB) $(HERE)/$(LIBNAME)
 	/bin/cp -p $(HERE)/$(LIBNAME) $(LIBDIR)
-	/bin/cp -p $(LIBMOD) $(CMOD) $(HERE)
+	/bin/cp -p *$(.mod) $(CMOD) $(HERE)
 
 psb_skrylov_cbind_mod.o psb_dkrylov_cbind_mod.o psb_ckrylov_cbind_mod.o psb_zkrylov_cbind_mod.o: psb_base_krylov_cbind_mod.o
 veryclean: clean
 	/bin/rm -f $(HERE)/$(LIBNAME)
 
 clean:
-	/bin/rm -f $(OBJS) $(LOCAL_MODS)
+	/bin/rm -f $(OBJS) *$(.mod)
 
 veryclean: clean

cbind/prec/Makefile

@@ -14,11 +14,7 @@ psb_c_sprec.o psb_c_dprec.o psb_c_cprec.o psb_c_zprec.o
 CMOD=psb_prec_cbind.h psb_c_sprec.h psb_c_dprec.h psb_c_cprec.h psb_c_zprec.h
 
 
-LIBMOD=psb_prec_cbind_mod$(.mod)  \
-psb_sprec_cbind_mod$(.mod) psb_dprec_cbind_mod$(.mod) \
-psb_cprec_cbind_mod$(.mod) psb_zprec_cbind_mod$(.mod) 
 
-LOCAL_MODS=$(LIBMOD)
 LIBNAME=$(CPRECLIBNAME)	
 
 
@@ -26,13 +22,13 @@ lib:  $(OBJS) $(CMOD)
 	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
 	$(RANLIB) $(HERE)/$(LIBNAME)
 	/bin/cp -p $(HERE)/$(LIBNAME) $(LIBDIR)
-	/bin/cp -p $(LIBMOD) $(CMOD) $(HERE)
+	/bin/cp -p  *$(.mod) $(CMOD) $(HERE)
 
 psb_prec_cbind_mod.o: psb_sprec_cbind_mod.o psb_dprec_cbind_mod.o psb_cprec_cbind_mod.o psb_zprec_cbind_mod.o
 veryclean: clean
 	/bin/rm -f $(HERE)/$(LIBNAME)
 
 clean:
-	/bin/rm -f $(OBJS) $(LOCAL_MODS)
+	/bin/rm -f $(OBJS)  *$(.mod)
 
 veryclean: clean