add dependencies for modules compilation and protection flags USE_MOD…

…ULES to avoid compilation issues (some people report problems but I don't know exactly what)
paparazzi · Apr 1, 2009 · 4b9b4f2 · 4b9b4f2
1 parent aa5c420
commit 4b9b4f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Makefile.ac b/Makefile.ac
@@ -109,7 +109,7 @@ $(MAKEFILE_AC) : $(CONF)/$(AIRFRAME_XML)
 	@echo BUILD $@
 	$(Q)$(TOOLS)/extract_makefile.out $< $(MODULES_DIR) > $@
 
-$(MODULES_H) : $(CONF)/$(AIRFRAME_XML) $(TOOLS)/gen_modules.out
+$(MODULES_H) : $(CONF)/$(AIRFRAME_XML) $(TOOLS)/gen_modules.out $(CONF)/modules/*.xml
 	@echo BUILD $@
 	$(Q)$(TOOLS)/gen_modules.out $(MODULES_DIR) $(MODULES_C) $< > $@
 	$(Q)chmod a+r $@

diff --git a/sw/tools/gen_modules.ml b/sw/tools/gen_modules.ml
@@ -247,6 +247,8 @@ let () =
   try
     let xml = start_and_begin xml_file h_name in
     begin_c_out xml_file "modules" out_c;
+    fprintf out_h "#ifdef USE_MODULES\n\n";
+    fprintf out_c "#ifdef USE_MODULES\n\n";
     fprintf out_h "#define MODULES_IDLE  0\n";
     fprintf out_h "#define MODULES_RUN   1\n";
     fprintf out_h "#define MODULES_START 2\n";
@@ -266,6 +268,8 @@ let () =
       parse_modules modules_list out_c;
     end
     else print_empty_functions ();
+    fprintf out_h "\n#endif // USE_MODULES\n";
+    fprintf out_c "\n#endif // USE_MODULES\n";
     finish h_name;
     close_out out_c;
   with