From 1d22c933e7f97d71661435bb0c5bcacf4e8fa6e0 Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Fri, 17 Mar 2023 16:17:20 +0100
Subject: [PATCH] Juan & Quentin: 17/03/2023: bugfix PHYEX VER_USER was not
taken into account (master sources were recompiled) .h include files were
also not recompiled. Now there are recompiled in ver_user mode but developer
must put them in VER_USER/ and not in nested sub-folder
---
src/Makefile | 53 ++++++++++++++++++++++++++--------------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index c0384da8c..8daef858a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,14 +16,7 @@ dependance_flist = $(notdir $(shell find $(1) -follow -type f \
obj_flist = $(notdir $(shell find $(1) -follow -type f \
-name 'spll_*.f*' | sed -e 's/\(.*\)\(\.\).*/\1.o/g' ))
#
-##########################################################
-# #
-# COMPILER & ARCHITECTURE CONFIGURATION #
-# #
-##########################################################
-#
-include Rules.$(ARCH)$(F).mk
-#
+
##########################################################
##########################################################
##########################################################
@@ -67,6 +60,30 @@ include Rules.$(ARCH)$(F).mk
# #
##########################################################
+##########################################################
+# #
+# DEP_USER : Automatique --> #
+# Dependance file of MY source #
+# #
+##########################################################
+#
+ifdef VER_USER
+OBJDIR_USER=$(OBJDIR_ROOT)/$(VER_USER)
+#
+# init VPATH depending on compilation phase
+#
+ifdef DO_DEP_USER
+DEP_USER= $(call dependance_flist,$(DIR_USER))
+VPATH += $(shell find $(DIR_USER) -follow -type d )
+VPATH += $(OBJDIR_USER)
+endif
+#
+ifdef DO_COMP_USER
+VPATH += $(VER_USER) $(OBJDIR_USER) $(OBJDIR_USER)/MOD $(OBJDIR_MASTER) $(OBJDIR_MASTER)/MOD
+INC += -I$(B)$(VER_USER) -I$(B)$(OBJDIR_USER)/MOD -I$(B)$(OBJDIR_MASTER)/MOD
+endif
+#
+endif
##########################################################
# #
# DEP_MASTER : Automatique --> #
@@ -91,28 +108,12 @@ endif
#
##########################################################
# #
-# DEP_USER : Automatique --> #
-# Dependance file of MY source #
+# COMPILER & ARCHITECTURE CONFIGURATION #
# #
##########################################################
#
-ifdef VER_USER
-OBJDIR_USER=$(OBJDIR_ROOT)/$(VER_USER)
-#
-# init VPATH depending on compilation phase
-#
-ifdef DO_DEP_USER
-DEP_USER= $(call dependance_flist,$(DIR_USER))
-VPATH += $(shell find $(DIR_USER) -follow -type d )
-VPATH += $(OBJDIR_USER)
-endif
-#
-ifdef DO_COMP_USER
-VPATH += $(OBJDIR_USER) $(OBJDIR_USER)/MOD $(OBJDIR_MASTER) $(OBJDIR_MASTER)/MOD
-INC += -I$(B)$(OBJDIR_USER)/MOD -I$(B)$(OBJDIR_MASTER)/MOD
-endif
+include Rules.$(ARCH)$(F).mk
#
-endif
##########################################################
# #
# VPATH ADJUSTEMENT : #
--
GitLab