diff --git a/Makefile b/Makefile index eca49d87..4bf8cae5 100644 --- a/Makefile +++ b/Makefile @@ -12,15 +12,15 @@ kryld: precd based libd: (if test ! -d lib ; then mkdir lib; fi) based: - (cd base; $(MAKE) lib) + cd base && $(MAKE) lib precd: - (cd prec; $(MAKE) lib ) + cd prec && $(MAKE) lib kryld: - (cd krylov; $(MAKE) lib) + cd krylov && $(MAKE) lib utild: - (cd util; $(MAKE) lib ) + cd util&& $(MAKE) lib -install: +install: all (./mkdir.sh $(INSTALL_DIR) &&\ $(INSTALL_DATA) Make.inc $(INSTALL_DIR)) (./mkdir.sh $(INSTALL_LIBDIR) &&\ diff --git a/base/Makefile b/base/Makefile index d058f845..8e6f6b37 100644 --- a/base/Makefile +++ b/base/Makefile @@ -11,17 +11,17 @@ lib: mods sr cm in pb tl sr cm in pb tl: mods mods: - (cd modules; $(MAKE) lib LIBNAME=$(BASELIBNAME) F90="$(MPF90)" F90COPT="$(F90COPT) $(MPI_OPT)") + cd modules && $(MAKE) lib LIBNAME=$(BASELIBNAME) F90="$(MPF90)" F90COPT="$(F90COPT) $(MPI_OPT)" sr: - (cd serial; $(MAKE) lib LIBNAME=$(BASELIBNAME)) + cd serial && $(MAKE) lib LIBNAME=$(BASELIBNAME) cm: - (cd comm; $(MAKE) lib LIBNAME=$(BASELIBNAME)) + cd comm && $(MAKE) lib LIBNAME=$(BASELIBNAME) in: - (cd internals; $(MAKE) lib LIBNAME=$(BASELIBNAME)) + cd internals && $(MAKE) lib LIBNAME=$(BASELIBNAME) pb: - (cd psblas; $(MAKE) lib LIBNAME=$(BASELIBNAME)) + cd psblas && $(MAKE) lib LIBNAME=$(BASELIBNAME) tl: - (cd tools; $(MAKE) lib LIBNAME=$(BASELIBNAME)) + cd tools && $(MAKE) lib LIBNAME=$(BASELIBNAME) clean: (cd modules; $(MAKE) clean) diff --git a/base/modules/Makefile b/base/modules/Makefile index c5e183fd..757df638 100644 --- a/base/modules/Makefile +++ b/base/modules/Makefile @@ -40,7 +40,7 @@ CINCLUDES=-I. FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). $(FIFLAG). -lib: penvmod $(UTIL_MODS) $(OBJS) $(LIBDIR)/$(LIBNAME) +lib: psb_penv_mod.o $(UTIL_MODS) $(OBJS) $(LIBDIR)/$(LIBNAME) /bin/cp -p $(CPUPDFLAG) $(LIBMOD) $(LIBDIR) /bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR) @@ -54,6 +54,7 @@ psb_realloc_mod.o: psb_error_mod.o $(UTILS_MODS): $(BASIC_MODS) +psi_comm_buffers_mod.o: psb_const_mod.o psi_penv_mod.o: psi_comm_buffers_mod.o psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o: psi_penv_mod.o psb_penv_mod.o: psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o @@ -64,7 +65,7 @@ psb_s_base_mat_mod.o: psb_s_base_vect_mod.o psb_d_base_mat_mod.o: psb_d_base_vect_mod.o psb_c_base_mat_mod.o: psb_c_base_vect_mod.o psb_z_base_mat_mod.o: psb_z_base_vect_mod.o -psb_c_base_vect_mod.o psb_s_base_vect_mod.o psb_d_base_vect_mod.o psb_z_base_vect_mod.o: psi_serial_mod.o +psb_c_base_vect_mod.o psb_s_base_vect_mod.o psb_d_base_vect_mod.o psb_z_base_vect_mod.o: psi_serial_mod.o psb_realloc_mod.o psb_s_mat_mod.o: psb_s_base_mat_mod.o psb_s_csr_mat_mod.o psb_s_csc_mat_mod.o psb_s_vect_mod.o psb_d_mat_mod.o: psb_d_base_mat_mod.o psb_d_csr_mat_mod.o psb_d_csc_mat_mod.o psb_d_vect_mod.o psb_c_mat_mod.o: psb_c_base_mat_mod.o psb_c_csr_mat_mod.o psb_c_csc_mat_mod.o psb_c_vect_mod.o @@ -88,12 +89,13 @@ psb_desc_type.o: psb_penv_mod.o psb_realloc_mod.o\ psb_hash_mod.o psb_hash_map_mod.o psb_list_map_mod.o \ psb_repl_map_mod.o psb_gen_block_map_mod.o psb_desc_const_mod.o\ psb_indx_map_mod.o -psb_indx_map_mod.o: psb_desc_const_mod.o +psb_indx_map_mod.o: psb_desc_const_mod.o psb_error_mod.o psb_penv_mod.o psb_hash_map_mod.o psb_list_map_mod.o psb_repl_map_mod.o psb_gen_block_map_mod.o:\ psb_indx_map_mod.o psb_desc_const_mod.o \ psb_sort_mod.o psb_penv_mod.o psb_glist_map_mod.o: psb_list_map_mod.o psb_hash_map_mod.o: psb_hash_mod.o psb_sort_mod.o +psb_hash_mod.o: psb_realloc_mod.o psb_const_mod.o psb_linmap_mod.o: psb_s_linmap_mod.o psb_d_linmap_mod.o psb_c_linmap_mod.o psb_z_linmap_mod.o psb_s_linmap_mod.o: psb_linmap_type_mod.o psb_mat_mod.o psb_s_vect_mod.o psb_d_linmap_mod.o: psb_linmap_type_mod.o psb_mat_mod.o psb_d_vect_mod.o @@ -131,8 +133,8 @@ psb_z_comm_mod.o: psb_z_vect_mod.o psb_desc_type.o psb_mat_mod.o psb_base_mod.o: $(MODULES) -penvmod: $(BASIC_MODS) - ($(MAKE) psb_penv_mod.o F90COPT="$(F90COPT) $(EXTRA_OPT)") +psb_penv_mod.o: $(BASIC_MODS) psb_penv_mod.F90 + $(F90) -c psb_penv_mod.F90 $(FINCLUDES) $(FDEFINES) $(F90COPT) $(EXTRA_OPT) diff --git a/base/serial/Makefile b/base/serial/Makefile index 1222ba7e..3dce39fa 100644 --- a/base/serial/Makefile +++ b/base/serial/Makefile @@ -23,12 +23,12 @@ lib1: $(FOBJS) auxd: - (cd aux; $(MAKE) lib) + cd aux && $(MAKE) lib f77d: - (cd f77; $(MAKE) lib) + cd f77 && $(MAKE) lib impld: - (cd impl; $(MAKE) lib) + cd impl && $(MAKE) lib clean: /bin/rm -f $(FOBJS) *$(.mod) diff --git a/prec/Makefile b/prec/Makefile index 6f985b5b..39fb4983 100644 --- a/prec/Makefile +++ b/prec/Makefile @@ -44,10 +44,10 @@ psb_s_prec_type.o: psb_s_base_prec_mod.o psb_d_prec_type.o: psb_d_base_prec_mod.o psb_c_prec_type.o: psb_c_base_prec_mod.o psb_z_prec_type.o: psb_z_base_prec_mod.o -psb_s_prec_mod.o: psb_s_prec_type.o -psb_d_prec_mod.o: psb_d_prec_type.o -psb_c_prec_mod.o: psb_c_prec_type.o -psb_z_prec_mod.o: psb_z_prec_type.o +psb_s_prec_mod.o: psb_prec_type.o +psb_d_prec_mod.o: psb_prec_type.o +psb_c_prec_mod.o: psb_prec_type.o +psb_z_prec_mod.o: psb_prec_type.o psb_prec_type.o: psb_s_prec_type.o psb_d_prec_type.o psb_c_prec_type.o psb_z_prec_type.o psb_prec_mod.o: psb_s_prec_mod.o psb_d_prec_mod.o psb_c_prec_mod.o psb_z_prec_mod.o psb_s_bjacprec.o psb_s_diagprec.o psb_s_nullprec.o: psb_prec_mod.o psb_s_base_prec_mod.o diff --git a/util/Makefile b/util/Makefile index 55ff556c..de877412 100644 --- a/util/Makefile +++ b/util/Makefile @@ -24,12 +24,10 @@ LIBNAME=$(UTILLIBNAME) FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). -lib: $(LIBDIR)/$(LIBNAME) $(LIBDIR)/$(LIBMOD) +lib: $(LIBDIR)/$(LIBNAME) $(LIBDIR)/$(LIBNAME): $(HERE)/$(LIBNAME) /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) - -$(LIBDIR)/$(LIBMOD): $(LIBMOD) /bin/cp -p $(CPUPDFLAG) $(LIBMOD) $(LOCAL_MODS) $(LIBDIR) $(HERE)/$(LIBNAME): $(OBJS)