Rename base/internals into base/auxil. Fix aplusat in CMakeLists

base/CMakeLists.txt

@@ -122,25 +122,25 @@ set(PSB_base_source_files
   comm/psb_mgather_a.f90
   comm/psb_dgather.f90
   comm/psb_lhalo.f90
-  internals/psi_bld_glb_dep_list.F90
-  internals/psi_graph_fnd_owner.F90
-  internals/psi_sort_dl.f90
-  internals/psi_indx_map_fnd_owner.F90
-  internals/psi_fnd_owner.F90
-  internals/psi_bld_tmpovrl.f90
-  internals/psi_symm_dep_list.F90
-  internals/psi_desc_impl.f90
-###  internals/psi_compute_size.f90
-  internals/psi_hash_impl.f90
-  internals/psi_crea_ovr_elem.f90
-  internals/psi_a2a_fnd_owner.F90
-  internals/psi_bld_tmphalo.f90
-  internals/psi_crea_bnd_elem.f90
-  internals/psi_desc_index.F90
-  internals/psi_xtr_loc_dl.F90
-  internals/psi_crea_index.f90
-  internals/psi_srtlist.f90
-  internals/psi_adjcncy_fnd_owner.F90
+  auxil/psi_bld_glb_dep_list.F90
+  auxil/psi_graph_fnd_owner.F90
+  auxil/psi_sort_dl.f90
+  auxil/psi_indx_map_fnd_owner.F90
+  auxil/psi_fnd_owner.F90
+  auxil/psi_bld_tmpovrl.f90
+  auxil/psi_symm_dep_list.F90
+  auxil/psi_desc_impl.f90
+###  auxil/psi_compute_size.f90
+  auxil/psi_hash_impl.f90
+  auxil/psi_crea_ovr_elem.f90
+  auxil/psi_a2a_fnd_owner.F90
+  auxil/psi_bld_tmphalo.f90
+  auxil/psi_crea_bnd_elem.f90
+  auxil/psi_desc_index.F90
+  auxil/psi_xtr_loc_dl.F90
+  auxil/psi_crea_index.f90
+  auxil/psi_srtlist.f90
+  auxil/psi_adjcncy_fnd_owner.F90
   tools/psb_sins.f90
   tools/psb_zspasb.f90
   tools/psb_zspalloc.f90
@@ -271,7 +271,11 @@ set(PSB_base_source_files
   tools/psb_dasb_a.f90
   tools/psb_zsprn.f90
   tools/psb_get_overlap.f90
-  serial/psb_crwextd.f90
+  serial/psb_saplusat.f90
+  serial/psb_daplusat.f90	
+  serial/psb_caplusat.f90
+  serial/psb_zaplusat.f90	
+  serial/psb_crwextd.f90	
   serial/psb_zspspmm.F90
   serial/psb_drwextd.f90
   serial/psb_dnumbmm.f90

base/Makefile

@@ -6,18 +6,18 @@ INCDIR=../include
 MODDIR=../modules
 LIBNAME=$(BASELIBNAME)
 
-objs:  mods sr cm in pb tl
+objs:  mods sr cm ax pb tl
 
 lib:  objs
 	$(MAKE) -C modules lib LIBNAME=$(BASELIBNAME) F90="$(MPF90)" F90COPT="$(F90COPT) $(MPI_OPT)"
 	$(MAKE) -C serial lib LIBNAME=$(BASELIBNAME)
 	$(MAKE) -C comm lib LIBNAME=$(BASELIBNAME)
-	$(MAKE) -C internals lib LIBNAME=$(BASELIBNAME)
+	$(MAKE) -C auxil lib LIBNAME=$(BASELIBNAME)
 	$(MAKE) -C psblas lib LIBNAME=$(BASELIBNAME)
 	$(MAKE) -C tools lib LIBNAME=$(BASELIBNAME)
 	/bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR)
 
-sr cm in pb tl: mods
+sr cm ax pb tl: mods
 
 mods:
 	$(MAKE) -C modules objs F90="$(MPF90)" F90COPT="$(F90COPT) $(MPI_OPT)"
@@ -25,8 +25,8 @@ sr:
 	$(MAKE) -C serial objs 
 cm:
 	$(MAKE) -C comm objs 
-in:
-	$(MAKE) -C internals objs 
+ax:
+	$(MAKE) -C auxil objs 
 pb:
 	$(MAKE) -C psblas objs 
 tl:
@@ -35,7 +35,7 @@ tl:
 clean: 
 	($(MAKE) -C modules clean)
 	($(MAKE) -C comm clean)
-	($(MAKE) -C internals clean)
+	($(MAKE) -C auxil clean)
 	($(MAKE) -C tools clean)
 	($(MAKE) -C serial clean)
 	($(MAKE) -C psblas clean)