From 9818c3f5d11b81707c872e824bb2db64b2a3eb17 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 22 Jun 2022 06:00:27 -0400 Subject: [PATCH] Fix makefiles for parallel build --- amgprec/Makefile | 4 ++-- cbind/Makefile | 3 +-- cbind/amgprec/Makefile | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/amgprec/Makefile b/amgprec/Makefile index a4996c92..64da5e8a 100644 --- a/amgprec/Makefile +++ b/amgprec/Makefile @@ -65,11 +65,11 @@ LIBNAME=libamg_prec.a all: objs impld objs: $(OBJS) + /bin/cp -p amg_const.h $(INCDIR) + /bin/cp -p *$(.mod) $(MODDIR) impld: objs cd impl && $(MAKE) - /bin/cp -p amg_const.h $(INCDIR) - /bin/cp -p *$(.mod) $(MODDIR) lib: $(OBJS) impld cd impl && $(MAKE) lib diff --git a/cbind/Makefile b/cbind/Makefile index 0843337d..1ae60ded 100644 --- a/cbind/Makefile +++ b/cbind/Makefile @@ -9,8 +9,7 @@ LIBNAME=$(CBINDLIBNAME) LIBNAME=libamg_cbind.a objs: amgprecd - /bin/cp -p $(CPUPDFLAG) *.h $(INCDIR) - /bin/cp -p $(CPUPDFLAG) *$(.mod) $(MODDIR) + lib: objs cd amgprec && $(MAKE) lib LIBNAME=$(LIBNAME) /bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR) diff --git a/cbind/amgprec/Makefile b/cbind/amgprec/Makefile index 2d57d97a..1be73280 100644 --- a/cbind/amgprec/Makefile +++ b/cbind/amgprec/Makefile @@ -6,7 +6,7 @@ MODDIR=$(TOP)/modules HERE=. DEST=../ -CINCLUDES=-I. -I$(LIBDIR) -I$(PSBLAS_INCDIR) +CINCLUDES=-I. -I$(INCDIR) -I$(PSBLAS_INCDIR) FINCLUDES=$(FMFLAG)$(HERE) $(FMFLAG)$(INCDIR) $(FMFLAG)$(MODDIR) $(PSBLAS_INCLUDES) @@ -19,12 +19,13 @@ LOCAL_MODS=$(LIBMOD) #LIBNAME=$(CPRECLIBNAME) objs: $(OBJS) + /bin/cp -p $(LIBMOD) $(MODDIR) + /bin/cp -p $(CMOD) $(INCDIR) lib: objs $(CMOD) $(AR) $(HERE)/$(LIBNAME) $(OBJS) $(RANLIB) $(HERE)/$(LIBNAME) /bin/cp -p $(HERE)/$(LIBNAME) $(DEST) - /bin/cp -p $(LIBMOD) $(CMOD) $(DEST) amg_prec_cbind_mod.o: amg_dprec_cbind_mod.o amg_zprec_cbind_mod.o #amg_prec_cbind_mod.o: psb_prec_cbind_mod.o