From dd47e4b119dd4a2c174242a725014aad2015f2c9 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 4 Jan 2012 14:37:52 +0000 Subject: [PATCH] Fix dependency issue. --- mlprec/Makefile | 65 +++---------------------------------------------- 1 file changed, 4 insertions(+), 61 deletions(-) diff --git a/mlprec/Makefile b/mlprec/Makefile index 48bd7ffd..e1c6ff0d 100644 --- a/mlprec/Makefile +++ b/mlprec/Makefile @@ -33,64 +33,7 @@ MODOBJS=mld_base_prec_type.o mld_prec_type.o mld_prec_mod.o \ $(SMODOBJS) $(DMODOBJS) $(CMODOBJS) $(ZMODOBJS) -DMPFOBJS=mld_daggrmat_nosmth_asb.o mld_daggrmat_smth_asb.o mld_daggrmat_minnrg_asb.o - -SMPFOBJS=mld_saggrmat_nosmth_asb.o mld_saggrmat_smth_asb.o mld_saggrmat_minnrg_asb.o - -ZMPFOBJS=mld_zaggrmat_nosmth_asb.o mld_zaggrmat_smth_asb.o mld_zaggrmat_minnrg_asb.o - -CMPFOBJS=mld_caggrmat_nosmth_asb.o mld_caggrmat_smth_asb.o mld_caggrmat_minnrg_asb.o - - -MPFOBJS=$(SMPFOBJS) $(DMPFOBJS) $(CMPFOBJS) $(ZMPFOBJS) - -MPCOBJS=mld_sslud_interface.o mld_dslud_interface.o mld_cslud_interface.o mld_zslud_interface.o - - -DINNEROBJS= mld_dcoarse_bld.o mld_dmlprec_bld.o \ - mld_dilu0_fact.o mld_diluk_fact.o mld_dilut_fact.o mld_daggrmap_bld.o \ - mld_d_dec_map_bld.o mld_dmlprec_aply.o mld_daggrmat_asb.o \ - $(DMPFOBJS) mld_d_base_solver_impl.o mld_d_base_smoother_impl.o mld_d_onelev_impl.o - -SINNEROBJS= mld_scoarse_bld.o mld_smlprec_bld.o \ - mld_silu0_fact.o mld_siluk_fact.o mld_silut_fact.o mld_saggrmap_bld.o \ - mld_s_dec_map_bld.o mld_smlprec_aply.o mld_saggrmat_asb.o \ - $(SMPFOBJS) mld_s_base_solver_impl.o mld_s_base_smoother_impl.o mld_s_onelev_impl.o - -ZINNEROBJS= mld_zcoarse_bld.o mld_zmlprec_bld.o \ - mld_zilu0_fact.o mld_ziluk_fact.o mld_zilut_fact.o mld_zaggrmap_bld.o \ - mld_z_dec_map_bld.o mld_zmlprec_aply.o mld_zaggrmat_asb.o \ - $(ZMPFOBJS) mld_z_base_solver_impl.o mld_z_base_smoother_impl.o mld_z_onelev_impl.o - -CINNEROBJS= mld_ccoarse_bld.o mld_cmlprec_bld.o \ - mld_cilu0_fact.o mld_ciluk_fact.o mld_cilut_fact.o mld_caggrmap_bld.o \ - mld_c_dec_map_bld.o mld_cmlprec_aply.o mld_caggrmat_asb.o \ - $(CMPFOBJS) mld_c_base_solver_impl.o mld_c_base_smoother_impl.o mld_c_onelev_impl.o - - -INNEROBJS= $(SINNEROBJS) $(DINNEROBJS) $(CINNEROBJS) $(ZINNEROBJS) - - -DOUTEROBJS=mld_dprecbld.o mld_dprecset.o mld_dprecinit.o mld_dprecaply.o - -SOUTEROBJS=mld_sprecbld.o mld_sprecset.o mld_sprecinit.o mld_sprecaply.o - -ZOUTEROBJS=mld_zprecbld.o mld_zprecset.o mld_zprecinit.o mld_zprecaply.o - -COUTEROBJS=mld_cprecbld.o mld_cprecset.o mld_cprecinit.o mld_cprecaply.o - - -OUTEROBJS=$(SOUTEROBJS) $(DOUTEROBJS) $(COUTEROBJS) $(ZOUTEROBJS) - -F90OBJS=$(OUTEROBJS) $(INNEROBJS) - -COBJS= mld_sslu_interface.o mld_sumf_interface.o \ - mld_dslu_interface.o mld_dumf_interface.o \ - mld_cslu_interface.o mld_cumf_interface.o \ - mld_zslu_interface.o mld_zumf_interface.o - OBJS=$(MODOBJS) -#OBJS=$(F90OBJS) $(MODOBJS) $(COBJS) $(MPCOBJS) LIBMOD=mld_prec_mod$(.mod) LOCAL_MODS=$(MODOBJS:.o=$(.mod)) @@ -160,7 +103,7 @@ mld_s_base_solver_mod.o mld_d_base_solver_mod.o mld_c_base_solver_mod.o mld_z_ba mld_d_id_solver.o mld_d_sludist_solver.o mld_d_slu_solver.o \ mld_d_umf_solver.o mld_d_diag_solver.o mld_d_ilu_solver.o: mld_d_base_solver_mod.o mld_d_prec_type.o -mld_d_ilu_fact_mod.o: mld_base_prec_type.o +mld_d_ilu_fact_mod.o: mld_base_prec_type.o mld_d_base_solver_mod.o mld_d_ilu_solver.o mld_d_iluk_fact.o: mld_d_ilu_fact_mod.o mld_d_as_smoother.o mld_d_jac_smoother.o: mld_d_base_smoother_mod.o mld_d_jac_smoother.o: mld_d_diag_solver.o @@ -170,7 +113,7 @@ mld_dprecinit.o mld_dprecset.o: mld_d_diag_solver.o mld_d_ilu_solver.o \ mld_s_id_solver.o mld_s_sludist_solver.o mld_s_slu_solver.o \ mld_s_diag_solver.o mld_s_ilu_solver.o: mld_s_base_solver_mod.o mld_s_prec_type.o -mld_s_ilu_fact_mod.o: mld_base_prec_type.o +mld_s_ilu_fact_mod.o: mld_base_prec_type.o mld_s_base_solver_mod.o mld_s_ilu_solver.o mld_s_iluk_fact.o: mld_s_ilu_fact_mod.o mld_s_as_smoother.o mld_s_jac_smoother.o: mld_s_base_smoother_mod.o mld_s_jac_smoother.o: mld_s_diag_solver.o @@ -180,7 +123,7 @@ mld_sprecinit.o mld_sprecset.o: mld_s_diag_solver.o mld_s_ilu_solver.o \ mld_z_id_solver.o mld_z_sludist_solver.o mld_z_slu_solver.o \ mld_z_umf_solver.o mld_z_diag_solver.o mld_z_ilu_solver.o: mld_z_base_solver_mod.o mld_z_prec_type.o -mld_z_ilu_fact_mod.o: mld_base_prec_type.o +mld_z_ilu_fact_mod.o: mld_base_prec_type.o mld_z_base_solver_mod.o mld_z_ilu_solver.o mld_z_iluk_fact.o: mld_z_ilu_fact_mod.o mld_z_as_smoother.o mld_z_jac_smoother.o: mld_z_base_smoother_mod.o mld_z_jac_smoother.o: mld_z_diag_solver.o @@ -190,7 +133,7 @@ mld_zprecinit.o mld_zprecset.o: mld_z_diag_solver.o mld_z_ilu_solver.o \ mld_c_id_solver.o mld_c_sludist_solver.o mld_c_slu_solver.o \ mld_c_diag_solver.o mld_c_ilu_solver.o: mld_c_base_solver_mod.o mld_c_prec_type.o -mld_c_ilu_fact_mod.o: mld_base_prec_type.o +mld_c_ilu_fact_mod.o: mld_base_prec_type.o mld_c_base_solver_mod.o mld_c_ilu_solver.o mld_c_iluk_fact.o: mld_c_ilu_fact_mod.o mld_c_as_smoother.o mld_c_jac_smoother.o: mld_c_base_smoother_mod.o mld_c_jac_smoother.o: mld_c_diag_solver.o