From d700e4c7e4febfd9a1898e4e623f3db7b53b8046 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@uniroma2.it>
Date: Fri, 24 Sep 2021 07:46:32 -0400
Subject: [PATCH] Fix compilation process for CXX sources.

---
 Make.inc.in                      |  2 +-
 amgprec/impl/aggregator/Makefile | 24 ++++--------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

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 49f76ed3..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
 
@@ -59,24 +59,13 @@ amg_s_parmatch_spmm_bld.o \
 amg_s_parmatch_spmm_bld_ov.o \
 amg_s_parmatch_unsmth_bld.o \
 amg_s_parmatch_smth_bld.o \
-amg_s_parmatch_spmm_bld_inner.o \
-amg_d_newmatch_aggregator_mat_asb.o \
-amg_d_newmatch_aggregator_inner_mat_asb.o \
-amg_d_newmatch_aggregator_mat_bld.o \
-amg_d_newmatch_aggregator_tprol.o \
-amg_d_newmatch_map_to_tprol.o \
-amg_d_newmatch_spmm_bld_inner.o \
-amg_d_newmatch_spmm_bld_ov.o
+amg_s_parmatch_spmm_bld_inner.o
 
-MPCOBJS=
-#MatchBoxPC.o \
-#algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.o
 MPCXXOBJS=MatchBoxPC.o \
 algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.o \
 newmatch_interface.o
-CXXDEFINES=$(PSBCXXDEFINES)
-CXXINCLUDES=-I../../../../ParallelRomaF-main/include -I$(PSBLAS_INCDIR)
-OBJS = $(FOBJS) $(MPCOBJS) $(MPCXXOBJS)
+
+OBJS = $(FOBJS) $(MPCOBJS) $(MPCXXOBJS) 
 
 LIBNAME=libamg_prec.a
 
@@ -84,11 +73,6 @@ lib:  $(OBJS)
 	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
 	$(RANLIB) $(HERE)/$(LIBNAME)
 
-mpobjs:
-	(make $(MPFOBJS) F90="$(MPF90)" F90COPT="$(F90COPT)")
-	(make $(MPCOBJS) CC="$(MPCC)" CCOPT="$(CCOPT)")
-	(make $(MPCXXOBJS) CXX="$(MPCXX)" CXXOPT="$(CCOPT) $(CXXOPT)")
-
 veryclean: clean
 	/bin/rm -f $(LIBNAME)