[nps] always define USE_MISSION_COMMANDS_IN_NPS if mission_rotorcraft module is loaded

conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile

@@ -58,6 +58,7 @@ nps.srcs += $(NPSDIR)/nps_main.c                 \
        $(NPSDIR)/nps_ivy_common.c                \
        $(NPSDIR)/nps_ivy_rotorcraft.c            \
        $(NPSDIR)/nps_flightgear.c                \
+       $(NPSDIR)/nps_ivy_mission_commands.c
 
 # for geo mag calculation
 nps.srcs += math/pprz_geodetic_wmm2010.c
@@ -67,9 +68,3 @@ nps.srcs += subsystems/datalink/ivy_transport.c
 nps.srcs += subsystems/datalink/downlink.c subsystems/datalink/telemetry.c
 nps.srcs += $(SRC_FIRMWARE)/rotorcraft_telemetry.c
 nps.srcs += $(SRC_FIRMWARE)/datalink.c
-
-USE_MISSION_COMMANDS_IN_NPS ?= 0
-ifeq ($(USE_MISSION_COMMANDS_IN_NPS), 1)
-nps.srcs += $(NPSDIR)/nps_ivy_mission_commands.c
-nps.CFLAGS += -DUSE_MISSION_COMMANDS_IN_NPS
-endif

conf/modules/mission_rotorcraft.xml

@@ -30,4 +30,7 @@
     <file name="mission_common.c"/>
     <file name="mission_rotorcraft_nav.c"/>
   </makefile>
+  <makefile target="nps">
+    <define name="USE_MISSION_COMMANDS_IN_NPS"/>
+  </makefile>
 </module>

sw/simulator/nps/nps_ivy_mission_commands.c

@@ -1,3 +1,5 @@
+#if USE_MISSION_COMMANDS_IN_NPS
+
 #include "nps_ivy.h"
 
 #include <stdlib.h>
@@ -245,3 +247,6 @@ static void on_DL_END_MISSION(IvyClientPtr app __attribute__ ((unused)),
 
   mission_parse_END_MISSION();
 }
+
+
+#endif /* USE_MISSION_COMMANDS_IN_NPS */