From 1ec86693c4cd9c386a94ed7dbf32ad0222a33491 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 21 Mar 2011 16:14:50 +0000 Subject: [PATCH] psblas3: base/modules/Makefile base/modules/psb_base_mod.f90 base/modules/psb_sparse_mod.f90 base/serial/impl/Makefile Changed psb_sparse_mod into psb_base_mod, added psb_csprt. This allows the cbind stuff to be shared between version 2 and version 3. Step 2. --- base/modules/Makefile | 4 ++-- base/modules/{psb_sparse_mod.f90 => psb_base_mod.f90} | 0 base/serial/impl/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename base/modules/{psb_sparse_mod.f90 => psb_base_mod.f90} (100%) diff --git a/base/modules/Makefile b/base/modules/Makefile index e977a0f7..e8801da1 100644 --- a/base/modules/Makefile +++ b/base/modules/Makefile @@ -26,7 +26,7 @@ UTIL_MODS = psb_string_mod.o psb_desc_const_mod.o psb_indx_map_mod.o\ MODULES=$(BASIC_MODS) $(UTIL_MODS) LIBMOD=psb_base_mod$(.mod) -OBJS = error.o psb_sparse_mod.o $(EXTRA_COBJS) cutil.o +OBJS = error.o psb_base_mod.o $(EXTRA_COBJS) cutil.o LIBDIR=.. CINCLUDES=-I. FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). $(FIFLAG). @@ -90,7 +90,7 @@ psb_s_psblas_mod.o psb_c_psblas_mod.o psb_d_psblas_mod.o psb_z_psblas_mod.o: psb psb_gps_mod.o: psb_realloc_mod.o psb_hash_mod.o: psb_const_mod.o psb_realloc_mod.o -psb_sparse_mod.o: $(MODULES) +psb_base_mod.o: $(MODULES) penvmod: $(BASIC_MODS) diff --git a/base/modules/psb_sparse_mod.f90 b/base/modules/psb_base_mod.f90 similarity index 100% rename from base/modules/psb_sparse_mod.f90 rename to base/modules/psb_base_mod.f90 diff --git a/base/serial/impl/Makefile b/base/serial/impl/Makefile index 68d82f50..9e1e2260 100644 --- a/base/serial/impl/Makefile +++ b/base/serial/impl/Makefile @@ -33,7 +33,7 @@ lib: $(OBJS) $(RANLIB) $(LIBDIR)/$(LIBNAME) # A bit excessive, but safe -$(OBJS): $(MODDIR)/psb_sparse_mod.o +$(OBJS): $(MODDIR)/psb_base_mod.o clean: cleanobjs