From 5a7567a65c7d23fdec459705f596c68afa422995 Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Fri, 9 Jul 2021 15:37:06 +0200
Subject: [PATCH] Quentin 09/07/2021 compilation was not possible with
MNH_ECRAD not defined and VER_ECRAD=140 (default option without MNH_ECRAD)
---
src/Makefile.MESONH.mk | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk
index 753951e3c..c5770feb3 100644
--- a/src/Makefile.MESONH.mk
+++ b/src/Makefile.MESONH.mk
@@ -140,7 +140,12 @@ CPPFLAGS_RAD = -DMNH_ECRAD -DVER_ECRAD=$(VER_ECRAD)
INC_RAD += -I$(B)LIB/RAD/ecrad-$(VERSION_ECRAD)/include
ifeq "$(VER_ECRAD)" "140"
INC_RAD += -I$(B)LIB/RAD/ecrad-$(VERSION_ECRAD)/drhook/include
+IGNORE_DEP_MASTER += yomhook.D
endif
+ifneq "$(VER_ECRAD)" "140"
+IGNORE_DEP_MASTER += read_albedo_data.D read_emiss_data.D
+endif
+
ARCH_XYZ := $(ARCH_XYZ)-ECRAD$(VER_ECRAD)
endif
#
@@ -153,13 +158,10 @@ INC += $(INC_RAD)
IGNORE_DEP_MASTER += olwu.D olwv.D rad1Driv_MACLATMOSPH_60LEVELS_ICRCCM3.D tstrad.D tstrad_chansubset.D tstrad_rttov7.D \
tstrad_sx6.D
-ifneq "$(VER_ECRAD)" "140"
+ifndef MNH_ECRAD
IGNORE_DEP_MASTER += read_albedo_data.D read_emiss_data.D
endif
-ifeq "$(VER_ECRAD)" "140"
-IGNORE_DEP_MASTER += yomhook.D
-endif
OBJS0 += spll_orrtm_kgb1.o spll_orrtm_kgb14.o spll_orrtm_kgb3_a.o spll_orrtm_kgb4_b.o \
spll_orrtm_kgb5_c.o spll_orrtm_kgb10.o spll_orrtm_kgb15.o spll_orrtm_kgb3_b.o \
--
GitLab