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

[barrelfish] / hake / RuleDefs.hs

diff --git a/hake/RuleDefs.hs b/hake/RuleDefs.hs
index 027469a..9313d23 100644 (file)
--- a/hake/RuleDefs.hs
+++ b/hake/RuleDefs.hs
@@ -123,8 +123,6 @@ kernelIncludes arch = [ NoDep BuildTree arch f | f <- [
                     "/kernel/include",
                     "/include",
                     "/include/arch" </> archFamily arch,
-                    "/lib/newlib/newlib/libc/include",
-                    "/include/c",
                     "/include/target" </> archFamily arch]]
                  ++ kernelOptIncludes arch
 
@@ -1107,7 +1105,9 @@ appGetOptionsForArch arch args =
     (options arch) { extraIncludes =
                          [ NoDep SrcTree "src" a | a <- Args.addIncludes args]
                          ++
-                         [ NoDep BuildTree arch a | a <- Args.addGeneratedIncludes args],
+                         [ NoDep BuildTree arch a | a <- Args.addGeneratedIncludes args]
+                         ++
+                         [ NoDep SrcTree "src" ("/include" </> l) | l <- Args.addLibraries args ],
                      optIncludes = (optIncludes $ options arch) \\
                          [ NoDep SrcTree "src" i | i <- Args.omitIncludes args ],
                      optFlags = (optFlags $ options arch) \\
@@ -1238,7 +1238,9 @@ libraryBuildFn tdb tf args =
 
 libGetOptionsForArch arch args =
     (options arch) { extraIncludes =
-                         [ NoDep SrcTree "src" a | a <- Args.addIncludes args],
+                         [ NoDep SrcTree "src" a | a <- Args.addIncludes args]
+                         ++
+                         [ NoDep SrcTree "src" ("/include" </> l) | l <- Args.addLibraries args ],
                      optIncludes = (optIncludes $ options arch) \\
                          [ NoDep SrcTree "src" i | i <- Args.omitIncludes args ],
                      optFlags = (optFlags $ options arch) \\
@@ -1292,10 +1294,6 @@ liblwip_deps          = LibDeps $ [ LibDep x | x <- deps ]
 libnetQmng_deps       = LibDeps $ [ LibDep x | x <- deps ]
     where deps = ["net_queue_manager"]
 libnfs_deps           = LibDeps $ [ LibDep "nfs", liblwip_deps]
-libssh_deps           = LibDeps [ libposixcompat_deps, libopenbsdcompat_deps,
-                                  LibDep "zlib", LibDep "crypto", LibDep "ssh" ]
-libopenbsdcompat_deps = LibDeps [ libposixcompat_deps, LibDep "crypto",
-                                  LibDep "openbsdcompat" ]
 
 -- we need to make vfs more modular to make this actually useful
 data VFSModules = VFS_RamFS | VFS_NFS | VFS_BlockdevFS | VFS_FAT
@@ -1329,17 +1327,13 @@ str2dep  str
     | str == "vfs_noblockdev"= libvfs_deps_noblockdev str
     | str == "lwip"          = liblwip_deps
     | str == "netQmng"       = libnetQmng_deps
-    | str == "ssh"           = libssh_deps
-    | str == "openbsdcompat" = libopenbsdcompat_deps
     | otherwise              = LibDep str
 
 -- get library depdencies
 --   we need a specific order for the .a, so we define a total order
 libDeps :: [String] -> [String]
 libDeps xs = [x | (LibDep x) <- (sortBy xcmp) . nub . flat $ map str2dep xs ]
-    where xord = [ "ssh"
-                  , "openbsdcompat"
-                  , "crypto"
+    where xord = [  "crypto"
                   , "zlib"
                   , "posixcompat"
                   , "term_server"