[paparazzi-commits] [5456] target defines BEFORE the includes

[Christophe De Wagter]

Revision: 5456
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5456
Author:   dewagter
Date:     2010-08-18 13:11:32 +0000 (Wed, 18 Aug 2010)
Log Message:
-----------
target defines BEFORE the includes

Modified Paths:
--------------
    paparazzi3/trunk/sw/tools/gen_aircraft.ml

Modified: paparazzi3/trunk/sw/tools/gen_aircraft.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-18 13:07:52 UTC (rev 
5455)
+++ paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-18 13:11:32 UTC (rev 
5456)
@@ -158,15 +158,17 @@
     if ExtXml.tag_is tag "target" then begin
       begin try
         fprintf makefile_ac "\n# makefile target '%s' board '%s'\n" 
(Xml.attrib tag "name") (Xml.attrib tag "board");
-        fprintf makefile_ac "include 
$(PAPARAZZI_SRC)/conf/boards/%s.makefile\n" (Xml.attrib tag "board");
-        fprintf makefile_ac "include 
$(PAPARAZZI_SRC)/conf/autopilot/%s.makefile\n" (Xml.attrib tag "name");
-        fprintf makefile_ac "\n# Subsystems:'\n";
        let print_if_subsystem = (fun c ->
           if ExtXml.tag_is c "param" then begin
             fprintf makefile_ac "%s = %s\n"
             (String.uppercase(Xml.attrib c "name"))
             (Xml.attrib c "value")
-          end;
+          end) in
+       List.iter print_if_subsystem (Xml.children tag);
+        fprintf makefile_ac "include 
$(PAPARAZZI_SRC)/conf/boards/%s.makefile\n" (Xml.attrib tag "board");
+        fprintf makefile_ac "include 
$(PAPARAZZI_SRC)/conf/autopilot/%s.makefile\n" (Xml.attrib tag "name");
+        fprintf makefile_ac "\n# Subsystems:'\n";
+       let print_if_subsystem = (fun c ->
           if ExtXml.tag_is c "subsystem" then begin
             let has_subtype = ref false in
             begin try