diff --git a/conf/modules/nav_bungee_takeoff.xml b/conf/modules/nav_bungee_takeoff.xml
index 5605184ba2..b701b262cc 100644
--- a/conf/modules/nav_bungee_takeoff.xml
+++ b/conf/modules/nav_bungee_takeoff.xml
@@ -20,7 +20,7 @@
   <header>
     <file name="nav_bungee_takeoff.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_bungee_takeoff.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_catapult.xml b/conf/modules/nav_catapult.xml
index e53b8ca529..b462a6bae8 100644
--- a/conf/modules/nav_catapult.xml
+++ b/conf/modules/nav_catapult.xml
@@ -21,10 +21,10 @@
   <header>
     <file name="nav_catapult.h"/>
   </header>
-  <init fun="nav_catapult_init()"/>
+  <init fun="nav_catapult_start()"/>
   <!-- Run High Rate Lauch Detector -->
   <periodic fun="nav_catapult_highrate_module()" autorun="TRUE"/>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_catapult.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_cube.xml b/conf/modules/nav_cube.xml
index 587aff3514..1b4b450745 100644
--- a/conf/modules/nav_cube.xml
+++ b/conf/modules/nav_cube.xml
@@ -9,7 +9,7 @@
   <header>
     <file name="nav_cube.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_cube.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_drop.xml b/conf/modules/nav_drop.xml
index 81f385135c..a103831139 100644
--- a/conf/modules/nav_drop.xml
+++ b/conf/modules/nav_drop.xml
@@ -11,7 +11,7 @@
   <header>
     <file name="nav_drop.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_drop.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_flower.xml b/conf/modules/nav_flower.xml
index 7702e0598f..da9def5d97 100644
--- a/conf/modules/nav_flower.xml
+++ b/conf/modules/nav_flower.xml
@@ -9,7 +9,7 @@
   <header>
     <file name="nav_flower.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_flower.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_gls.xml b/conf/modules/nav_gls.xml
index cc28bd4a03..ef3982dbd5 100644
--- a/conf/modules/nav_gls.xml
+++ b/conf/modules/nav_gls.xml
@@ -12,7 +12,7 @@
   <header>
     <file name="nav_gls.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_gls.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_line.xml b/conf/modules/nav_line.xml
index 4ce20d208c..12221f0a8f 100644
--- a/conf/modules/nav_line.xml
+++ b/conf/modules/nav_line.xml
@@ -14,7 +14,7 @@
   <header>
     <file name="nav_line.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_line.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_line_border.xml b/conf/modules/nav_line_border.xml
index e069c929a7..2306ed2a68 100644
--- a/conf/modules/nav_line_border.xml
+++ b/conf/modules/nav_line_border.xml
@@ -19,7 +19,7 @@
   <header>
     <file name="nav_line_border.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_line_border.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_line_osam.xml b/conf/modules/nav_line_osam.xml
index 5d950213a0..b64f7e3fb6 100644
--- a/conf/modules/nav_line_osam.xml
+++ b/conf/modules/nav_line_osam.xml
@@ -9,7 +9,7 @@
   <header>
     <file name="nav_line_osam.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_line_osam.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_smooth.xml b/conf/modules/nav_smooth.xml
index 87272a6d93..249496bca1 100644
--- a/conf/modules/nav_smooth.xml
+++ b/conf/modules/nav_smooth.xml
@@ -9,7 +9,7 @@
   <header>
     <file name="nav_smooth.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_smooth.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_spiral.xml b/conf/modules/nav_spiral.xml
index babde6d9f3..3f86791422 100644
--- a/conf/modules/nav_spiral.xml
+++ b/conf/modules/nav_spiral.xml
@@ -14,7 +14,7 @@
   <header>
     <file name="nav_spiral.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_spiral.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_survey_disc.xml b/conf/modules/nav_survey_disc.xml
index a9cf954289..a9a7bc0476 100644
--- a/conf/modules/nav_survey_disc.xml
+++ b/conf/modules/nav_survey_disc.xml
@@ -9,7 +9,7 @@
   <header>
     <file name="nav_survey_disc.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_survey_disc.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_survey_poly_osam.xml b/conf/modules/nav_survey_poly_osam.xml
index eaee59cdb4..f13bf7e5cf 100644
--- a/conf/modules/nav_survey_poly_osam.xml
+++ b/conf/modules/nav_survey_poly_osam.xml
@@ -9,7 +9,7 @@
   <header>
     <file name="nav_survey_poly_osam.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_survey_poly_osam.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_survey_polygon.xml b/conf/modules/nav_survey_polygon.xml
index 1b7b0c8a1d..a45c397cf9 100644
--- a/conf/modules/nav_survey_polygon.xml
+++ b/conf/modules/nav_survey_polygon.xml
@@ -29,7 +29,7 @@ Block example:
   <header>
     <file name="nav_survey_polygon.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_survey_polygon.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_survey_zamboni.xml b/conf/modules/nav_survey_zamboni.xml
index 8f295cb351..c957879d93 100644
--- a/conf/modules/nav_survey_zamboni.xml
+++ b/conf/modules/nav_survey_zamboni.xml
@@ -9,7 +9,7 @@
   <header>
     <file name="nav_survey_zamboni.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_survey_zamboni.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/nav_vertical_raster.xml b/conf/modules/nav_vertical_raster.xml
index aebbeab482..a31a8656e4 100644
--- a/conf/modules/nav_vertical_raster.xml
+++ b/conf/modules/nav_vertical_raster.xml
@@ -9,7 +9,7 @@
   <header>
     <file name="nav_vertical_raster.h"/>
   </header>
-  <makefile>
+  <makefile target="ap|sim|jsbsim|nps">
     <file name="nav_vertical_raster.c"/>
   </makefile>
 </module>