diff --git a/Make.inc.in b/Make.inc.in index 3638f486..9ac10ee7 100644 --- a/Make.inc.in +++ b/Make.inc.in @@ -75,7 +75,7 @@ CDEFINES=$(AMGCDEFINES) AMGFDEFINES=@AMGFDEFINES@ $(PSBFDEFINES) FDEFINES=$(AMGFDEFINES) -CXXDEFINES=@AMGCXXDEFINES@ +CXXDEFINES=@AMGCXXDEFINES@ $(PSBCXXDEFINES) @COMPILERULES@ diff --git a/amgprec/impl/aggregator/Makefile b/amgprec/impl/aggregator/Makefile index d857a3b0..39bb57e8 100644 --- a/amgprec/impl/aggregator/Makefile +++ b/amgprec/impl/aggregator/Makefile @@ -5,7 +5,7 @@ MODDIR=../../../modules HERE=../.. FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(MODDIR) $(FMFLAG)$(INCDIR) $(PSBLAS_INCLUDES) -CXXINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(INCDIR) $(FMFLAG)/. +CXXINCLUDES=$(FIFLAG)$(HERE) $(FIFLAG)$(INCDIR) $(FIFLAG)/. -I../../../../../ParallelRomaF-main/include -I$(PSBLAS_INCDIR) #CINCLUDES= -I${SUPERLU_INCDIR} -I${HSL_INCDIR} -I${SPRAL_INCDIR} -I/home/users/pasqua/Ambra/BootCMatch/include -lBCM -L/home/users/pasqua/Ambra/BootCMatch/lib -lm @@ -61,10 +61,11 @@ amg_s_parmatch_unsmth_bld.o \ amg_s_parmatch_smth_bld.o \ amg_s_parmatch_spmm_bld_inner.o -MPCOBJS=MatchBoxPC.o \ -algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.o +MPCXXOBJS=MatchBoxPC.o \ +algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.o \ +newmatch_interface.o -OBJS = $(FOBJS) $(MPCOBJS) +OBJS = $(FOBJS) $(MPCOBJS) $(MPCXXOBJS) LIBNAME=libamg_prec.a @@ -72,10 +73,6 @@ lib: $(OBJS) $(AR) $(HERE)/$(LIBNAME) $(OBJS) $(RANLIB) $(HERE)/$(LIBNAME) -mpobjs: - (make $(MPFOBJS) F90="$(MPF90)" F90COPT="$(F90COPT)") - (make $(MPCOBJS) CC="$(MPCC)" CCOPT="$(CCOPT)") - veryclean: clean /bin/rm -f $(LIBNAME)