From 7dea81e732e8d210d0647c4bb3108e50a73575a4 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 18 Jan 2008 13:57:37 +0000 Subject: [PATCH] --- base/modules/Makefile | 16 ++++++++-------- base/modules/psb_const_mod.f90 | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/base/modules/Makefile b/base/modules/Makefile index 7156ad99..5ca562f1 100644 --- a/base/modules/Makefile +++ b/base/modules/Makefile @@ -18,11 +18,17 @@ CINCLUDES=-I. FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). $(FIFLAG). +lib: mpfobjs $(MODULES) $(OBJS) + $(AR) $(LIBDIR)/$(LIBNAME) $(MODULES) $(OBJS) $(MPFOBJS) + $(RANLIB) $(LIBDIR)/$(LIBNAME) + /bin/cp -p $(LIBMOD) $(LIBDIR) + /bin/cp -p *$(.mod) $(LIBDIR) + psb_realloc_mod.o : psb_error_mod.o psb_spmat_type.o : psb_realloc_mod.o psb_error_mod.o psb_const_mod.o psb_string_mod.o psb_error_mod.o: psb_const_mod.o psb_penv_mod.o: psb_const_mod.o psb_error_mod.o psb_realloc_mod.o -psi_mod.o: psb_penv_mod.o psb_error_mod.o psb_desc_type.o +psi_mod.o: psb_penv_mod.o psb_error_mod.o psb_desc_type.o psb_const_mod.o psb_desc_type.o: psb_const_mod.o psb_error_mod.o psb_penv_mod.o psb_check_mod.o: psb_desc_type.o psb_serial_mod: psb_spmat_type.o psb_string_mod.o psb_sort_mod.o @@ -30,15 +36,9 @@ psb_sort_mod.o: psb_error_mod.o psb_realloc_mod.o psb_methd_mod.o: psb_serial_mod.o psb_desc_type.o psb_prec_type.o psb_tools_mod.o: psb_spmat_type.o psb_desc_type.o psi_mod.o psb_gps_mod.o psb_gps_mod.o: psb_realloc_mod.o -psb_base_mod.o: $(MODULES) $(MPFOBJS) +psb_base_mod.o: $(MODULES) mpfobjs -lib: mpfobjs $(MODULES) $(OBJS) - $(AR) $(LIBDIR)/$(LIBNAME) $(MODULES) $(OBJS) $(MPFOBJS) - $(RANLIB) $(LIBDIR)/$(LIBNAME) - /bin/cp -p $(LIBMOD) $(LIBDIR) - /bin/cp -p *$(.mod) $(LIBDIR) - mpfobjs: (make $(MPFOBJS) F90="$(MPF90)" FC="$(MPF90)" FCOPT="$(F90COPT)") diff --git a/base/modules/psb_const_mod.f90 b/base/modules/psb_const_mod.f90 index 64f3755b..067c2eed 100644 --- a/base/modules/psb_const_mod.f90 +++ b/base/modules/psb_const_mod.f90 @@ -39,7 +39,6 @@ module psb_const_mod complex(kind(1.d0)), parameter :: zzero=(0.d0,0.0d0) complex(kind(1.d0)), parameter :: zone=(1.d0,0.0d0) real(kind(1.d0)), parameter :: epstol=1.d-32, psb_percent_=0.7 - - character, parameter :: psb_all_='A', psb_topdef_=' ' + character, parameter :: psb_all_='A', psb_topdef_=' ' end module psb_const_mod