From 43fcc53344cdb133c4b07f7bc9d6e15ef996d932 Mon Sep 17 00:00:00 2001
From: sfilippone <filippone.salvatore@gmail.com>
Date: Mon, 24 Nov 2025 17:00:39 +0100
Subject: [PATCH] Final (hopefully) version of Makefile dependencies

---
 Makefile              | 39 +++++++++++----------------------------
 base/modules/Makefile |  4 ++--
 cuda/Makefile         |  4 ++--
 linsolve/Makefile     |  2 +-
 openacc/Makefile      |  2 +-
 prec/Makefile         |  2 +-
 util/Makefile         |  2 +-
 7 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/Makefile b/Makefile
index 7cbd2175..fd18a38c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 include Make.inc
 
-all: dirs mods based precd linslvd utild cbindd extd  $(CUDAD) $(OACCD) libd
+all: dirs based precd linslvd utild cbindd extd  $(CUDAD) $(OACCD) libd
 	@echo "====================================="
 	@echo "PSBLAS libraries Compilation Successful."
 
@@ -9,30 +9,13 @@ dirs:
 	(if test ! -d include ; then mkdir include; fi; $(INSTALL_DATA) Make.inc  include/Make.inc.psblas)
 	(if test ! -d modules ; then mkdir modules; fi;)	
 
-mods: basemods utilmods extmods precmods linslvmods  $(CUDAMODS) $(OACCMODS)
-
-basemods:
-	$(MAKE) -C base mods
-precmods: basemods
-	$(MAKE) -C prec mods
-extmods:  basemods
-	$(MAKE) -C ext mods
-linslvmods: precmods
-	$(MAKE) -C linsolve mods
-utilmods: basemods
-	$(MAKE) -C util mods
-cudamods: extmods
-	$(MAKE) -C cuda mods
-oaccmods: extmods
-	$(MAKE) -C openacc mods
-
 precd: based
 utild: based	
-linslvd:  precd 
+linslvd: precd 
 extd:  based
 cudad:  extd
 oaccd:  extd	
-cbindd: basemods precmods linslvmods utilmods 
+cbindd: based precd linslvd utild 
 
 libd: based precd linslvd utild cbindd extd $(CUDALD) $(OACCLD)
 	$(MAKE) -C base lib
@@ -47,21 +30,21 @@ oaccld:  oaccd
 	$(MAKE) -C openacc lib
 
 
-based: mods
+based:
 	$(MAKE) -C base objs
-precd: based
+precd:
 	$(MAKE) -C prec objs
-linslvd: precd
+linslvd:
 	$(MAKE) -C linsolve objs
-utild: based
+utild:
 	$(MAKE) -C util objs 
-cbindd: basemods precmods linslvmods utilmods 
+cbindd:
 	$(MAKE) -C cbind objs 
-extd:   based
+extd:   
 	$(MAKE) -C ext objs
-cudad:   cudamods
+cudad:   
 	$(MAKE) -C cuda objs
-oaccd:   oaccmods
+oaccd:   
 	$(MAKE) -C openacc objs 
 
 
diff --git a/base/modules/Makefile b/base/modules/Makefile
index dd13cb2b..b582b8b7 100644
--- a/base/modules/Makefile
+++ b/base/modules/Makefile
@@ -123,8 +123,8 @@ FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). $(FIFLAG).
 
 
 objs:  $(MODULES) $(OBJS) $(MPFOBJS)
-	/bin/cp -p $(CPUPDFLAG) *$(.mod) $(MODDIR)
-	/bin/cp -p $(CPUPDFLAG) psb_config.h psb_types.h $(INCDIR)
+	$(INSTALL) -p $(CPUPDFLAG) *$(.mod) $(MODDIR)
+	$(INSTALL) -p $(CPUPDFLAG) psb_config.h psb_types.h $(INCDIR)
 
 lib: objs  $(LIBDIR)/$(LIBNAME) 
 
diff --git a/cuda/Makefile b/cuda/Makefile
index 2a8bb94f..258d9059 100755
--- a/cuda/Makefile
+++ b/cuda/Makefile
@@ -53,8 +53,8 @@ lib: mods objs ilib cudalib spgpulib
 
 
 mods: $(FOBJS)
-	/bin/cp -p *$(.mod) $(MODDIR)
-	/bin/cp -p *.h $(INCDIR)
+	$(INSTALL) -p *$(.mod) $(MODDIR)
+	$(INSTALL) -p *.h $(INCDIR)
 objs: mods $(OBJS) iobjs cudaobjs spgpuobjs
 
 $(OBJS) iobjs cudaobjs spgpuobjs: spgpuinc
diff --git a/linsolve/Makefile b/linsolve/Makefile
index f97222e6..fa64b1b7 100644
--- a/linsolve/Makefile
+++ b/linsolve/Makefile
@@ -21,7 +21,7 @@ FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR)
 objs: mods $(OBJS)  impld
 
 mods: $(MODOBJS)
-	/bin/cp -p $(CPUPDFLAG) *$(.mod) $(MODDIR)
+	$(INSTALL) -p $(CPUPDFLAG) *$(.mod) $(MODDIR)
 
 lib: objs
 	$(MAKE) -C impl lib
diff --git a/openacc/Makefile b/openacc/Makefile
index ed40e036..6976955b 100644
--- a/openacc/Makefile
+++ b/openacc/Makefile
@@ -41,7 +41,7 @@ lib: objs ilib
 objs: mods $(OBJS) iobjs
 
 mods: $(FOBJS)
-	/bin/cp -p *$(.mod) $(MODDIR)
+	$(INSTALL) -p *$(.mod) $(MODDIR)
 
 iobjs: $(OBJS)
 	$(MAKE) -C impl objs 
diff --git a/prec/Makefile b/prec/Makefile
index c934fe43..6121840d 100644
--- a/prec/Makefile
+++ b/prec/Makefile
@@ -31,7 +31,7 @@ OBJS=$(F90OBJS) $(COBJS) $(MPFOBJS) $(MODOBJS)
 objs:  mods $(OBJS) impld
 
 mods: $(MODOBJS)
-	/bin/cp -p $(CPUPDFLAG) *$(.mod) $(MODDIR)
+	$(INSTALL) -p $(CPUPDFLAG) *$(.mod) $(MODDIR)
 
 lib:  objs
 	$(MAKE) -C impl lib
diff --git a/util/Makefile b/util/Makefile
index 67dfd6e8..f1965089 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -32,7 +32,7 @@ CINCLUDES=-I. -I$(INCDIR)
 objs: mods $(OBJS)
 
 mods: $(MODOBJS)
-	/bin/cp -p $(CPUPDFLAG) *$(.mod) $(MODDIR)
+	$(INSTALL) -p $(CPUPDFLAG) *$(.mod) $(MODDIR)
 
 lib:  $(HERE)/$(LIBNAME) 
 	/bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR)