Skip to content
Snippets Groups Projects
Commit 1d22c933 authored by RODIER Quentin's avatar RODIER Quentin
Browse files

Juan & Quentin: 17/03/2023: bugfix PHYEX VER_USER was not taken into account...

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
parent a3912c20
No related branches found
No related tags found
No related merge requests found
......@@ -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 : #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment