fix syntax error in graphviz files. seems like more recent versions are more picky...

diff --git a/doc/010-spec/disp_states_simple.circo b/doc/010-spec/disp_states_simple.circo
index ba072de..719b0a0 100644 (file)
--- a/doc/010-spec/disp_states_simple.circo
+++ b/doc/010-spec/disp_states_simple.circo
@@ -17,4 +17,4 @@ digraph {
 
        idc -> running [label="resume()", style="dashed", fontname="Times-Italic"];
        idc -> notrunning [label="Preempt"];
-};
+}

diff --git a/doc/010-spec/disp_states_simple_save_area_analysis.dot b/doc/010-spec/disp_states_simple_save_area_analysis.dot
index cf085a8..4e58b4c 100644 (file)
--- a/doc/010-spec/disp_states_simple_save_area_analysis.dot
+++ b/doc/010-spec/disp_states_simple_save_area_analysis.dot
@@ -12,4 +12,4 @@ digraph {
        running_d -> notrunning_d [label="disabled_save_area"];
        notrunning_d -> running_d;
        notrunning_e -> running_d;
-};
+}

diff --git a/doc/013-capability-mgmt/cap_types.dot b/doc/013-capability-mgmt/cap_types.dot
index daac076..815f0d7 100644 (file)
--- a/doc/013-capability-mgmt/cap_types.dot
+++ b/doc/013-capability-mgmt/cap_types.dot
@@ -14,4 +14,4 @@ digraph {
 
        Dispatcher -> EndPoint [arrowhead=normal];
        Dispatcher -> Dispatcher [arrowhead=dot];
-};
+}

diff --git a/hake/RuleDefs.hs b/hake/RuleDefs.hs
index 82185ef..52dfb9f 100644 (file)
--- a/hake/RuleDefs.hs
+++ b/hake/RuleDefs.hs
@@ -930,6 +930,9 @@ appBuildArch af tf args arch =
         opts = appGetOptionsForArch arch args
         csrcs = Args.cFiles args
         cxxsrcs = Args.cxxFiles args
+        gencsrc = Args.generatedCFiles args
+        gencxxsrc = Args.generatedCxxFiles args
+        
         appname = Args.target args
         -- XXX: Not sure if this is correct. Currently assuming that if the app
         -- contains C++ files, we have to use the C++ linker.
@@ -941,6 +944,8 @@ appBuildArch af tf args arch =
               ++
               [ compileCFiles opts csrcs,
                 compileCxxFiles opts cxxsrcs,
+                compileGeneratedCFiles opts gencsrc,
+                compileGeneratedCxxFiles opts gencxxsrc,
                 assembleSFiles opts (Args.assemblyFiles args),
                 mylink opts (allObjectPaths opts args) (allLibraryPaths args) appname
               ]
@@ -984,6 +989,8 @@ arrakisAppBuildArch af tf args arch =
         opts = arrakisAppGetOptionsForArch arch args
         csrcs = Args.cFiles args
         cxxsrcs = Args.cxxFiles args
+        gencsrc = Args.generatedCFiles args
+        gencxxsrc = Args.generatedCxxFiles args
         appname = Args.target args
         -- XXX: Not sure if this is correct. Currently assuming that if the app
         -- contains C++ files, we have to use the C++ linker.
@@ -995,6 +1002,8 @@ arrakisAppBuildArch af tf args arch =
               ++
               [ compileCFiles opts csrcs,
                 compileCxxFiles opts cxxsrcs,
+                compileGeneratedCFiles opts gencsrc,
+                compileGeneratedCxxFiles opts gencxxsrc,
                 assembleSFiles opts (Args.assemblyFiles args),
                 mylink opts (allObjectPaths opts args) (allLibraryPaths args) appname
               ]
@@ -1032,6 +1041,8 @@ libBuildArch af tf args arch =
         opts = libGetOptionsForArch arch args
         csrcs = Args.cFiles args
         cxxsrcs = Args.cxxFiles args
+        gencsrc = Args.generatedCFiles args
+        gencxxsrc = Args.generatedCxxFiles args
     in
       Rules ( flounderRules opts args csrcs
               ++
@@ -1039,6 +1050,8 @@ libBuildArch af tf args arch =
               ++
               [ compileCFiles opts csrcs,
                 compileCxxFiles opts cxxsrcs,
+                compileGeneratedCFiles opts gencsrc,
+                compileGeneratedCxxFiles opts gencxxsrc,
                 assembleSFiles opts (Args.assemblyFiles args),
                 staticLibrary opts (Args.target args) (allObjectPaths opts args) (allLibraryPaths args)
               ]