Merge remote-tracking branch 'upstream/master' into sockeye

Signed-off-by: Daniel Schwyn <schwyda@student.ethz.ch>

diff --cc hake/Args.hs
index 49ec534,dcaffdc..57d93ca
--- 1/hake/Args.hs
--- 2/hake/Args.hs
+++ b/hake/Args.hs
@@@ -40,10 -40,10 +40,11 @@@ data Args = Args 
        omitIncludes :: [String],
        addLinkFlags :: [String],
        addLibraries :: [String],
+       addModules :: [String],
        addGeneratedDependencies :: [String],
        architectures :: [String],
 -      sockeyeSchema :: [String],
 +      skateSchemaDefs :: [String],  -- just the Skate Schema headers
 +      skateSchemas :: [String],      -- Schema headers and functions
        installDirs :: InstallDirs
  }
  
@@@ -77,10 -77,10 +78,11 @@@ defaultArgs = Args 
        omitIncludes = [],
        addLinkFlags = [],
        addLibraries = [],
+       addModules = [],
        addGeneratedDependencies = [],
        architectures = allArchitectures,
 -      sockeyeSchema = [],
 +      skateSchemaDefs = [],
 +      skateSchemas = [],
        installDirs = InstallDirs {
              bindir = "/sbin",
              libdir = "/lib"
@@@ -123,8 -123,8 +125,9 @@@ showArgs prefix a 
      ++ "\n  omitIncludes:          " ++ (show $ omitIncludes a)
      ++ "\n  addLinkFlags:          " ++ (show $ addLinkFlags a)
      ++ "\n  addLibraries:          " ++ (show $ addLibraries a)
+     ++ "\n  addModules:            " ++ (show $ addModules a)
      ++ "\n  addDeps:               " ++ (show $ addGeneratedDependencies a)
      ++ "\n  architectures:         " ++ (show $ architectures a)
 -    ++ "\n  sockeyeSchema:         " ++ (show $ sockeyeSchema a)
 +    ++ "\n  skateSchemaDefs:       " ++ (show $ skateSchemaDefs a)
 +    ++ "\n  skateSchemas:          " ++ (show $ skateSchemas a)
      ++ "\n"

diff --cc hake/RuleDefs.hs
Simple merge

diff --cc usr/skb/Hakefile
Simple merge