psblas3:

base/comm/Makefile
 base/comm/internals
 base/comm/internals/Makefile
 base/comm/internals/psi_covrl_restr.f90
 base/comm/internals/psi_covrl_save.f90
 base/comm/internals/psi_covrl_upd.f90
 base/comm/internals/psi_cswapdata.F90
 base/comm/internals/psi_cswaptran.F90
 base/comm/internals/psi_dovrl_restr.f90
 base/comm/internals/psi_dovrl_save.f90
 base/comm/internals/psi_dovrl_upd.f90
 base/comm/internals/psi_dswapdata.F90
 base/comm/internals/psi_dswaptran.F90
 base/comm/internals/psi_iovrl_restr.f90
 base/comm/internals/psi_iovrl_save.f90
 base/comm/internals/psi_iovrl_upd.f90
 base/comm/internals/psi_iswapdata.F90
 base/comm/internals/psi_iswaptran.F90
 base/comm/internals/psi_sovrl_restr.f90
 base/comm/internals/psi_sovrl_save.f90
 base/comm/internals/psi_sovrl_upd.f90
 base/comm/internals/psi_sswapdata.F90
 base/comm/internals/psi_sswaptran.F90
 base/comm/internals/psi_zovrl_restr.f90
 base/comm/internals/psi_zovrl_save.f90
 base/comm/internals/psi_zovrl_upd.f90
 base/comm/internals/psi_zswapdata.F90
 base/comm/internals/psi_zswaptran.F90
 base/internals/Makefile
 base/internals/psi_covrl_restr.f90
 base/internals/psi_covrl_save.f90
 base/internals/psi_covrl_upd.f90
 base/internals/psi_cswapdata.F90
 base/internals/psi_cswaptran.F90
 base/internals/psi_dovrl_restr.f90
 base/internals/psi_dovrl_save.f90
 base/internals/psi_dovrl_upd.f90
 base/internals/psi_dswapdata.F90
 base/internals/psi_dswaptran.F90
 base/internals/psi_iovrl_restr.f90
 base/internals/psi_iovrl_save.f90
 base/internals/psi_iovrl_upd.f90
 base/internals/psi_iswapdata.F90
 base/internals/psi_iswaptran.F90
 base/internals/psi_sovrl_restr.f90
 base/internals/psi_sovrl_save.f90
 base/internals/psi_sovrl_upd.f90
 base/internals/psi_sswapdata.F90
 base/internals/psi_sswaptran.F90
 base/internals/psi_zovrl_restr.f90
 base/internals/psi_zovrl_save.f90
 base/internals/psi_zovrl_upd.f90
 base/internals/psi_zswapdata.F90
 base/internals/psi_zswaptran.F90

Changed grouping of source files, more consistent now.

base/comm/Makefile

@@ -14,16 +14,18 @@ INCDIR=..
 MODDIR=../modules
 FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) 
 
-lib: mpfobjs $(OBJS) 
+lib: interns mpfobjs $(OBJS) 
 	$(AR) $(LIBDIR)/$(LIBNAME) $(MPFOBJS) $(OBJS)
 	$(RANLIB) $(LIBDIR)/$(LIBNAME)
 
-
+interns:
+	cd internals && $(MAKE) lib
 mpfobjs: 
 	$(MAKE) $(MPFOBJS) F90="$(MPF90)" FC="$(MPF90)" FCOPT="$(F90COPT)"
 
 
 clean:
+	cd internals && $(MAKE) clean
 	/bin/rm -f $(MPFOBJS) $(OBJS)
 
 veryclean: clean

base/comm/internals/Makefile

@@ -0,0 +1,31 @@
+include ../../../Make.inc
+
+FOBJS = psi_iovrl_restr.o psi_iovrl_save.o psi_iovrl_upd.o \
+	psi_sovrl_restr.o psi_sovrl_save.o psi_sovrl_upd.o \
+	psi_dovrl_restr.o psi_dovrl_save.o psi_dovrl_upd.o \
+	psi_covrl_restr.o psi_covrl_save.o psi_covrl_upd.o \
+	psi_zovrl_restr.o psi_zovrl_save.o psi_zovrl_upd.o 
+
+MPFOBJS = psi_dswapdata.o psi_dswaptran.o\
+	psi_sswapdata.o  psi_sswaptran.o \
+	psi_iswapdata.o psi_iswaptran.o \
+	psi_cswapdata.o psi_cswaptran.o  \
+	psi_zswapdata.o psi_zswaptran.o  
+LIBDIR=../..
+INCDIR=../..
+MODDIR=../../modules
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR)
+CINCLUDES=-I. 
+
+lib: mpfobjs $(FOBJS) $(MPFOBJS) 
+	$(AR) $(LIBDIR)/$(LIBNAME) $(MPFOBJS) $(MPFOBJS2) $(FOBJS) $(FOBJS2) $(COBJS)
+	$(RANLIB) $(LIBDIR)/$(LIBNAME)
+
+$(FOBJS) $(FBOJS2): $(MODDIR)/psi_mod.o
+mpfobjs: 
+	(make $(MPFOBJS) F90="$(MPF90)" FC="$(MPF90)" FCOPT="$(F90COPT)")	
+
+clean:
+	/bin/rm -f $(MPFOBJS) $(FOBJS) $(COBJS) $(FOBJS2) $(MPFOBJS2) *$(.mod)
+
+veryclean: clean

base/internals/Makefile

@@ -5,23 +5,27 @@ FOBJS = psi_compute_size.o psi_crea_bnd_elem.o psi_crea_index.o \
 	psi_sort_dl.o \
 	psi_bld_tmphalo.o\
 	psi_sort_dl.o \
-        psi_desc_impl.o \
-	psi_iovrl_restr.o psi_iovrl_save.o psi_iovrl_upd.o \
-	psi_sovrl_restr.o psi_sovrl_save.o psi_sovrl_upd.o \
-	psi_dovrl_restr.o psi_dovrl_save.o psi_dovrl_upd.o \
-	psi_covrl_restr.o psi_covrl_save.o psi_covrl_upd.o \
+        psi_desc_impl.o
+
+#\
+#	psi_iovrl_restr.o psi_iovrl_save.o psi_iovrl_upd.o \
+#	psi_sovrl_restr.o psi_sovrl_save.o psi_sovrl_upd.o \
+#	psi_dovrl_restr.o psi_dovrl_save.o psi_dovrl_upd.o \
+#	psi_covrl_restr.o psi_covrl_save.o psi_covrl_upd.o \
 	psi_zovrl_restr.o psi_zovrl_save.o psi_zovrl_upd.o 
 
 FOBJS2 = psi_exist_ovr_elem.o psi_list_search.o srtlist.o 
 #COBJS = avltree.o srcht.o
 
-MPFOBJS = psi_dswapdata.o psi_dswaptran.o\
-	psi_sswapdata.o  psi_sswaptran.o \
-	psi_iswapdata.o psi_iswaptran.o \
-	psi_cswapdata.o psi_cswaptran.o  \
-	psi_zswapdata.o psi_zswaptran.o  \
-	psi_desc_index.o psi_extrct_dl.o \
+MPFOBJS = psi_desc_index.o psi_extrct_dl.o \
 	psi_fnd_owner.o psb_indx_map_fnd_owner.o
+
+#psi_dswapdata.o psi_dswaptran.o\
+#	psi_sswapdata.o  psi_sswaptran.o \
+#	psi_iswapdata.o psi_iswaptran.o \
+#	psi_cswapdata.o psi_cswaptran.o  \
+#	psi_zswapdata.o psi_zswaptran.o  \
+
 LIBDIR=..
 INCDIR=..
 MODDIR=../modules