Fix import and build dependencies

base/modules/Makefile

@@ -305,9 +305,9 @@ desc/psb_desc_mod.o: psb_penv_mod.o psb_realloc_mod.o\
 	  desc/psb_indx_map_mod.o serial/psb_i_vect_mod.o
 
 psi_i_mod.o: desc/psb_desc_mod.o serial/psb_i_vect_mod.o comm/psi_e_comm_a_mod.o \
-	comm/psi_m_comm_a_mod.o comm/psi_i_comm_v_mod.o
+	comm/psi_m_comm_a_mod.o comm/psi_i_comm_v_mod.o comm/psi_i2_comm_a_mod.o 
 psi_l_mod.o: desc/psb_desc_mod.o serial/psb_l_vect_mod.o comm/psi_e_comm_a_mod.o \
-	comm/psi_m_comm_a_mod.o comm/psi_l_comm_v_mod.o
+	comm/psi_m_comm_a_mod.o comm/psi_l_comm_v_mod.o comm/psi_i2_comm_a_mod.o 
 psi_s_mod.o: desc/psb_desc_mod.o serial/psb_s_vect_mod.o comm/psi_s_comm_a_mod.o \
 	comm/psi_s_comm_v_mod.o
 psi_d_mod.o: desc/psb_desc_mod.o serial/psb_d_vect_mod.o comm/psi_d_comm_a_mod.o \

base/modules/comm/psi_c_comm_a_mod.f90

@@ -31,7 +31,8 @@
 !    
 module psi_c_comm_a_mod
   use psi_penv_mod, only : psb_ctxt_type
-  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_spk_, psb_i_base_vect_type
+  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, &
+       & psb_spk_, psb_i_base_vect_type
 
   interface psi_swapdata
     module subroutine psi_cswapdatam(flag,n,beta,y,desc_a,work,info,data)

base/modules/comm/psi_d_comm_a_mod.f90

@@ -31,7 +31,8 @@
 !    
 module psi_d_comm_a_mod
   use psi_penv_mod, only : psb_ctxt_type
-  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_dpk_, psb_i_base_vect_type
+  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, &
+       & psb_dpk_, psb_i_base_vect_type
 
   interface psi_swapdata
     module subroutine psi_dswapdatam(flag,n,beta,y,desc_a,work,info,data)

base/modules/comm/psi_e_comm_a_mod.f90

@@ -31,7 +31,8 @@
 !    
 module psi_e_comm_a_mod
   use psi_penv_mod, only : psb_ctxt_type
-  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_epk_
+  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, &
+       & psb_epk_, psb_i2pk_
 
   interface psi_swapdata
     module subroutine psi_eswapdatam(flag,n,beta,y,desc_a,work,info,data)

base/modules/comm/psi_i2_comm_a_mod.f90

@@ -31,7 +31,8 @@
 !    
 module psi_i2_comm_a_mod
   use psi_penv_mod, only : psb_ctxt_type
-  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_epk_, psb_i2pk_
+  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, &
+       & psb_epk_, psb_i2pk_
 
   interface psi_swapdata
     module subroutine psi_i2swapdatam(flag,n,beta,y,desc_a,work,info,data)

base/modules/comm/psi_m_comm_a_mod.f90

@@ -31,7 +31,8 @@
 !    
 module psi_m_comm_a_mod
   use psi_penv_mod, only : psb_ctxt_type
-  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_epk_
+  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, &
+       & psb_epk_, psb_i2pk_
 
   interface psi_swapdata
     module subroutine psi_mswapdatam(flag,n,beta,y,desc_a,work,info,data)

base/modules/comm/psi_s_comm_a_mod.f90

@@ -31,7 +31,8 @@
 !    
 module psi_s_comm_a_mod
   use psi_penv_mod, only : psb_ctxt_type
-  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_spk_, psb_i_base_vect_type
+  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, &
+       & psb_spk_, psb_i_base_vect_type
 
   interface psi_swapdata
     module subroutine psi_sswapdatam(flag,n,beta,y,desc_a,work,info,data)

base/modules/comm/psi_z_comm_a_mod.f90

@@ -31,7 +31,8 @@
 !    
 module psi_z_comm_a_mod
   use psi_penv_mod, only : psb_ctxt_type
-  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, psb_dpk_, psb_i_base_vect_type
+  use psb_desc_mod, only : psb_desc_type, psb_mpk_, psb_ipk_, &
+       & psb_dpk_, psb_i_base_vect_type
 
   interface psi_swapdata
     module subroutine psi_zswapdatam(flag,n,beta,y,desc_a,work,info,data)